ehr-alerts-ui 0.0.26 → 0.0.28

package/src/library/configureStore.ts

@@ -1,9 +1,11 @@
-import {applyMiddleware, createStore} from 'redux';
-import {createLogger} from 'redux-logger';
+import { applyMiddleware, createStore } from 'redux';
+import { createLogger } from 'redux-logger';
 import thunk from 'redux-thunk';
-import {RefreshMiddleware} from 'ehr-auth-react';
 
-import reducers, {AlertsUiState} from './reducers';
+// @ts-ignore
+import { RefreshMiddleware } from 'ehr-auth-react';
+
+import reducers, { AlertsUiState } from './reducers';
 
 const middleware = [RefreshMiddleware, thunk];
 
@@ -12,18 +14,14 @@ if (process.env.NODE_ENV !== 'production') {
   middleware.push(
     createLogger({
       predicate: (getState, action) =>
-        (action.type.toString() !== 'KEYCLOAK_REFRESH_SUCCEEDED' && action.type.toString() !== 'AXIOS_ACCESS_TOKEN')
-    })
-  )
+        action.type.toString() !== 'KEYCLOAK_REFRESH_SUCCEEDED' &&
+        action.type.toString() !== 'AXIOS_ACCESS_TOKEN',
+    }),
+  );
 }
 
-
 const store = (initialState?: AlertsUiState) => {
-  return createStore(
-    reducers,
-    initialState,
-    applyMiddleware(...middleware),
-  );
-}
+  return createStore(reducers, initialState, applyMiddleware(...middleware));
+};
 
 export default store;

package/src/library/helpers/appendZero.ts

@@ -4,4 +4,4 @@ export default function appendZero(value: string): string {
   }
 
   return value;
-}
+}

package/src/library/helpers/printDate.ts

@@ -20,4 +20,4 @@ export default function (date: Date | undefined, datepicker?: boolean): string {
   }
 
   return `${day}.${month}.${year}`;
-}
+}

package/src/library/index.ts

@@ -1,2 +1,2 @@
 import './assets/styles/main.scss';
-export {default} from './components/MainPage';
+export { default } from './components/MainPage';

package/src/library/reducers/alertReducer.ts

@@ -1,23 +1,25 @@
-import {AlertActions, AlertActionsType} from "../actions/AlertActions";
-import {Alert, Audience, MessageLevel} from "./tableReducer";
+import { AlertActions, AlertActionsType } from '../actions/AlertActions';
+import { Alert, Audience, MessageLevel } from './tableReducer';
 
 export interface AlertModalError {
-  title: string,
-  content: string,
+  title: string;
+  content: string;
 }
 
 export interface AlertState {
-  alert: Alert | undefined,
-  errors: AlertModalError[],
+  alert: Alert | undefined;
+  errors: AlertModalError[];
 }
 
 const initialState: AlertState = {
   alert: undefined,
   errors: [],
-}
-
-export function alertReducer(state = initialState, action: AlertActions): AlertState {
+};
 
+export function alertReducer(
+  state = initialState,
+  action: AlertActions,
+): AlertState {
   switch (action.type) {
     case AlertActionsType.CREATE_ALERT: {
       return {
@@ -34,37 +36,34 @@ export function alertReducer(state = initialState, action: AlertActions): AlertS
           level: MessageLevel.TEADE,
           title: '',
           audience: Audience.AUTHENTICATED,
-        }
-      }
+        },
+      };
     }
     case AlertActionsType.EDIT_ALERT: {
       return {
         ...state,
         alert: action.payload.alert,
-      }
+      };
     }
     case AlertActionsType.CLEAR_ALERT: {
       return {
         ...state,
         alert: undefined,
-      }
+      };
     }
     case AlertActionsType.ADD_ALERT_MODAL_ERROR: {
       return {
         ...state,
-        errors: [
-          ...state.errors,
-          action.payload.error,
-        ]
-      }
+        errors: [...state.errors, action.payload.error],
+      };
     }
     case AlertActionsType.CLEAR_ALERT_MODAL_ERRORS: {
       return {
         ...state,
         errors: [],
-      }
+      };
     }
   }
 
   return state;
-}
+}

package/src/library/reducers/index.ts

@@ -1,13 +1,23 @@
-import {combineReducers} from 'redux';
-import {tableReducer, TableState} from "./tableReducer";
-import {alertReducer, AlertState} from "./alertReducer";
+import { combineReducers } from 'redux';
+
+// @ts-ignore
+import { KeycloakReducer, ProfileReducer, RulesReducer } from 'ehr-auth-react';
+
+import { tableReducer, TableState } from './tableReducer';
+import { alertReducer, AlertState } from './alertReducer';
 
 export type AlertsUiState = {
-  table: TableState,
-  alert: AlertState,
+  table: TableState;
+  alert: AlertState;
+  keycloak: any;
+  profile: any;
+  rules: any;
 };
 
 export default combineReducers<AlertsUiState>({
   table: tableReducer,
   alert: alertReducer,
-});
+  keycloak: KeycloakReducer,
+  profile: ProfileReducer,
+  rules: RulesReducer,
+});

package/src/library/reducers/tableReducer.ts

@@ -1,42 +1,41 @@
-import {TableActions, TableActionsType} from "../actions/TableActions";
+import { TableActions, TableActionsType } from '../actions/TableActions';
 
 export enum Audience {
-  AUTHENTICATED = "Autenditud kasutaja",
-  NOT_AUTHENTICATED = "Autentimata kasutaja",
+  AUTHENTICATED = 'Autenditud kasutaja',
+  NOT_AUTHENTICATED = 'Autentimata kasutaja',
 }
 
 export enum MessageLevel {
-  "TEADE" = "TEADE",
-  "HOIATUS" = "HOIATUS",
-  "VEATEADE" = "VEATEADE",
+  'TEADE' = 'TEADE',
+  'HOIATUS' = 'HOIATUS',
+  'VEATEADE' = 'VEATEADE',
 }
 
 export interface Alert {
-  id: number,
-  title: string,
-  audience: Audience,
-  level: MessageLevel,
-  begin: string | undefined,
-  beginHour: number | undefined,
-  beginMinute: number | undefined,
-  end: string | undefined,
-  endHour: number | undefined,
-  endMinute: number | undefined,
-  deleted?: Date,
-  content: string,
-  isDeleteOpen?: boolean,
+  id: number;
+  title: string;
+  audience: Audience;
+  level: MessageLevel;
+  begin: string | undefined;
+  beginHour: number | undefined;
+  beginMinute: number | undefined;
+  end: string | undefined;
+  endHour: number | undefined;
+  endMinute: number | undefined;
+  deleted?: Date;
+  content: string;
+  isDeleteOpen?: boolean;
 }
 
 export interface TableState {
-  alerts: Alert[],
+  alerts: Alert[];
 }
 
 const initialState: TableState = {
   alerts: [],
-}
+};
 
 export function tableReducer(state = initialState, action: TableActions) {
-
   switch (action.type) {
     case TableActionsType.ADD_ALERT: {
       return {
@@ -44,16 +43,16 @@ export function tableReducer(state = initialState, action: TableActions) {
         alerts: [
           ...state.alerts,
           {
-            ...action.payload.alert
+            ...action.payload.alert,
           },
-        ]
-      }
+        ],
+      };
     }
     case TableActionsType.CLEAR_TABLE: {
       return {
         ...state,
         alerts: [],
-      }
+      };
     }
     case TableActionsType.SET_DELETE_OPEN: {
       return {
@@ -64,12 +63,12 @@ export function tableReducer(state = initialState, action: TableActions) {
             return {
               ...alert,
               isDeleteOpen: true,
-            }
+            };
           }
 
           return alert;
-        })
-      }
+        }),
+      };
     }
     case TableActionsType.CLEAR_DELETES: {
       return {
@@ -79,11 +78,11 @@ export function tableReducer(state = initialState, action: TableActions) {
           return {
             ...alert,
             isDeleteOpen: false,
-          }
-        })
-      }
+          };
+        }),
+      };
     }
   }
 
   return state;
-}
+}

package/src/react-app-env.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="react-scripts" />
-declare module 'ehr-components';
+declare module 'ehr-components';

package/src/setupProxy.js

@@ -1,14 +1,16 @@
 const { createProxyMiddleware } = require('http-proxy-middleware');
 
 module.exports = function (app) {
-  app.use('/api', createProxyMiddleware(
-    {
+  app.use(
+    '/api',
+    createProxyMiddleware({
       target: 'https://devkluster.ehr.ee',
       secure: false,
       changeOrigin: true,
       headers: {
-        "Referer": "https://devkluster.ehr.ee/ui/ehr/v1/",
-        "Origin": "https://devkluster.ehr.ee/"
-      }
-    }));
-}
+        Referer: 'https://devkluster.ehr.ee/ui/ehr/v1/',
+        Origin: 'https://devkluster.ehr.ee/',
+      },
+    }),
+  );
+};