Commit ed99a543 by Peter Holmberg

moving things

parent 3e0a34ce
import { AppNotification } from 'app/types';
import { AppNotification } from 'app/types/';
export enum ActionTypes {
AddAppNotification = 'ADD_APP_NOTIFICATION',
......
......@@ -10,7 +10,7 @@ import AppNotificationList from './components/AppNotifications/AppNotificationLi
export function registerAngularDirectives() {
react2AngularDirective('passwordStrength', PasswordStrength, ['password']);
react2AngularDirective('sidemenu', SideMenu, []);
react2AngularDirective('pageAlertList', AppNotificationList, []);
react2AngularDirective('appNotificationsList', AppNotificationList, []);
react2AngularDirective('pageHeader', PageHeader, ['model', 'noTabs']);
react2AngularDirective('emptyListCta', EmptyListCTA, ['model']);
react2AngularDirective('searchResult', SearchResult, []);
......
import React, { PureComponent } from 'react';
import appEvents from 'app/core/app_events';
import { addAppNotification, clearAppNotification } from './state/actions';
import { addAppNotification, clearAppNotification } from '../../actions/appNotification';
import { connectWithStore } from 'app/core/utils/connectWithReduxStore';
import { AppNotification, AppNotificationSeverity, StoreState } from 'app/types';
......
import { appNotificationsReducer } from './reducers';
import { ActionTypes } from './actions';
import { AppNotificationSeverity } from 'app/types';
import { appNotificationsReducer } from './appNotification';
import { ActionTypes } from '../actions/appNotification';
import { AppNotificationSeverity } from 'app/types/index';
describe('clear alert', () => {
it('should filter alert', () => {
......
import { AppNotification, AppNotificationsState } from 'app/types';
import { Action, ActionTypes } from './actions';
import { AppNotification, AppNotificationsState } from 'app/types/index';
import { Action, ActionTypes } from '../actions/appNotification';
export const initialState: AppNotificationsState = {
appNotifications: [] as AppNotification[],
......
......@@ -10,7 +10,7 @@ import dashboardReducers from 'app/features/dashboard/state/reducers';
import pluginReducers from 'app/features/plugins/state/reducers';
import dataSourcesReducers from 'app/features/datasources/state/reducers';
import usersReducers from 'app/features/users/state/reducers';
import appNotificationReducers from 'app/core/components/AppNotifications/state/reducers';
import appNotificationReducers from 'app/core/reducers/appNotification';
const rootReducers = {
...sharedReducers,
......
......@@ -200,7 +200,7 @@
<grafana-app class="grafana-app" ng-cloak>
<sidemenu class="sidemenu"></sidemenu>
<page-alert-list class="page-alert-list"></page-alert-list>
<app-notifications-list class="page-alert-list"></app-notifications-list>
<div class="main-view">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment