@asaleh37/ui-base 25.8.15 → 25.8.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.8.15",
+  "version": "25.8.23",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/App.tsx

@@ -89,17 +89,6 @@ const App: React.FC<AppInfo> = (props: AppInfo) => {
     },
   };
 
-  let commonStores = {};
-  if (props.enableAdministrationModule) {
-    commonStores = { ...ADMINISTRATION_STORES };
-  }
-  if (props.businessCommonStoresMetaData) {
-    commonStores = {
-      ...commonStores,
-      ...props.businessCommonStoresMetaData,
-    };
-  }
-  dispatch(setStoresMetaData(commonStores));
   const AppLayoutState = useSelector((state: any) => state.AppLayout);
   let themeOptions = { ...LightThemeOptions };
   if (AppLayoutState.themeMode === "dark") {
@@ -112,7 +101,18 @@ const App: React.FC<AppInfo> = (props: AppInfo) => {
   useEffect(() => {
     document.title = props.documentTitle;
     dispatch(AppInfoActions.setAppInfo(props));
-  }, []);
+    let commonStores = {};
+    if (props.enableAdministrationModule) {
+      commonStores = { ...ADMINISTRATION_STORES };
+    }
+    if (props.businessCommonStoresMetaData) {
+      commonStores = {
+        ...commonStores,
+        ...props.businessCommonStoresMetaData,
+      };
+    }
+    dispatch(setStoresMetaData(commonStores));
+  }, [props]);
   return (
     <ThemeProvider theme={theme}>
       <Layout />

package/src/components/BaseApp.tsx

@@ -18,36 +18,58 @@ import i18n from "../locales/i18n";
 import { initReactI18next } from "react-i18next";
 import { ENGLISH_TRANS } from "../locales/english";
 import { ARABIC_TRANS } from "../locales/arabic";
+import { useEffect, useState } from "react";
 
 library.add(fab);
 library.add(far);
 library.add(fas);
 
 export const BaseApp: React.FC<AppInfo> = (props) => {
-  const systemReducers = {
+  // let store = null;
+  const [systemReducers, setSystemReducers] = useState<any>({
     AppLayout: AppLayoutReducer,
     UserSession: UserSessionReducer,
     loadingMask: LoadingMaskReducer,
     commonStores: CommonStoreReducer,
     SideBar: SideBarReducer,
     AppInfo: AppInfoReducer,
-    ...props?.businessReduxReducers,
-  };
+  });
   const store = configureStore({
     reducer: systemReducers,
   });
-  const resources = {
-    en: { translation: { ...ENGLISH_TRANS, ...props?.businessLocals?.en } },
-    ar: { translation: { ...ARABIC_TRANS, ...props?.businessLocals?.ar } },
+  const [isAppInitialized, setIsAppInitialized] = useState<boolean>(false);
+  const initializeApp = () => {
+    const reducers = {
+      AppLayout: AppLayoutReducer,
+      UserSession: UserSessionReducer,
+      loadingMask: LoadingMaskReducer,
+      commonStores: CommonStoreReducer,
+      SideBar: SideBarReducer,
+      AppInfo: AppInfoReducer,
+      ...props?.businessReduxReducers,
+    };
+    setSystemReducers((state) => {
+      return { ...reducers };
+    });
+    const resources = {
+      en: { translation: { ...ENGLISH_TRANS, ...props?.businessLocals?.en } },
+      ar: { translation: { ...ARABIC_TRANS, ...props?.businessLocals?.ar } },
+    };
+    i18n.use(initReactI18next).init({
+      resources: resources, // Where we're gonna put translations' files
+      lng: localStorage.getItem("language") || "en", // Set the initial language of the App
+      fallbackLng: "en",
+    });
+    setIsAppInitialized(true);
   };
-  i18n.use(initReactI18next).init({
-    resources: resources, // Where we're gonna put translations' files
-    lng: localStorage.getItem("language") || "en", // Set the initial language of the App
-    fallbackLng: "en",
-  });
-  return (
+  useEffect(() => {
+    initializeApp();
+  }, [props]);
+  return isAppInitialized ? (
     <Provider store={store}>
       <App {...props} />
     </Provider>
+  ) : (
+    <></>
   );
 };

package/src/components/common/Login.tsx

@@ -124,15 +124,11 @@ const Login: React.FC = () => {
     }
   };
   useEffect(() => {
+    console.log("checking usersession on reload", userSession);
+    console.log("checking usersession app info", appInfo);
     checkUserSession();
-  }, [appInfo]);
+  }, [appInfo, userSession.isAuthenticated]);
 
-  useEffect(() => {
-    if (userSession.isAuthenticated === null) {
-      console.log("checking usersession on reload", userSession);
-      checkUserSession();
-    }
-  }, [userSession.isAuthenticated]);
   return (
     <ThemeProvider theme={loginTheme}>
       <Paper

package/src/components/templates/DataEntryTemplates/TemplateDataForm/FormFields/ComboBox.tsx

@@ -22,7 +22,7 @@ const ComboBox: React.FC<ComboBoxProps> = (props) => {
   const getValue = (v: string) => {
     for (let option of props.options) {
       if (option[props.valueField] == v) {
-        return option;
+        return option + "";
       }
     }
     return null;
@@ -41,7 +41,7 @@ const ComboBox: React.FC<ComboBoxProps> = (props) => {
         ) {
           if (newValue != null) {
             let v = newValue[props.valueField];
-            props.onChangeCallBack(v, newValue);
+            props.onChangeCallBack(v + "", newValue);
           } else {
             props.onChangeCallBack(null, null);
           }

package/src/locales/english/adminLocalsEn.json

@@ -14,8 +14,8 @@
   "ORGANIZATION_MEMBER_ORGANIZATION_RANK_ID": "Organization rank id",
   "ORGANIZATION_MEMBER_ORGANIZATION_UNIT_ID": "Organization unit id",
   "ORGANIZATION_MEMBER_PERSON_ID": "Person id",
-  "ORGANIZATION_MEMBER_ROLE_SINGULAR": "organizationmemberrole",
-  "ORGANIZATION_MEMBER_ROLE_PLURAL": "organizationmemberroles",
+  "ORGANIZATION_MEMBER_ROLE_SINGULAR": "Member Role",
+  "ORGANIZATION_MEMBER_ROLE_PLURAL": "Member Roles",
   "ORGANIZATION_MEMBER_ROLE_IS_ACTIVE": "Is active",
   "ORGANIZATION_MEMBER_ROLE_END_DATE": "End date",
   "ORGANIZATION_MEMBER_ROLE_ORGANIZATION_MEMBER_ID": "Organization member id",
@@ -81,13 +81,13 @@
   "SYSTEM_APPLICATION_ROLE_SYSTEM_APPLICATION_ID": "System application id",
   "SYSTEM_APPLICATION_ROLE_ROLE_DESCRIPTION": "Role description",
   "SYSTEM_APPLICATION_ROLE_ROLE_NAME": "Role name",
-  "SYSTEM_APPLICATION_ROLE_AUTHORITY_SINGULAR": "systemapplicationroleauthority",
-  "SYSTEM_APPLICATION_ROLE_AUTHORITY_PLURAL": "systemapplicationroleauthorities",
+  "SYSTEM_APPLICATION_ROLE_AUTHORITY_SINGULAR": "Application Authority",
+  "SYSTEM_APPLICATION_ROLE_AUTHORITY_PLURAL": "Application Authorities",
   "SYSTEM_APPLICATION_ROLE_AUTHORITY_IS_ACTIVE": "Is active",
   "SYSTEM_APPLICATION_ROLE_AUTHORITY_SYSTEM_APPLICATION_AUTHORITY_ID": "System application authority id",
   "SYSTEM_APPLICATION_ROLE_AUTHORITY_SYSTEM_APPLICATION_ROLE_ID": "System application role id",
-  "ORGANIZATION_APPLICATION_MODULE_SINGULAR": "organizationapplicationmodule",
-  "ORGANIZATION_APPLICATION_MODULE_PLURAL": "organizationapplicationmodules",
+  "ORGANIZATION_APPLICATION_MODULE_SINGULAR": "Application Module",
+  "ORGANIZATION_APPLICATION_MODULE_PLURAL": "Application Modules",
   "ORGANIZATION_APPLICATION_MODULE_EXPIRATION_DATE": "Expiration date",
   "ORGANIZATION_APPLICATION_MODULE_IS_ACTIVE": "Is active",
   "ORGANIZATION_APPLICATION_MODULE_ORGANIZATION_ID": "Organization id",

package/src/locales/english/devLocalsEn.json

@@ -38,8 +38,8 @@
   "DASHBOARD_ENABLED": "Enabled",
   "DASHBOARD_LOAD_WIDGETS_INDIVIDUALLY": "Load widgets individually",
   "DASHBOARD_NUMBER_OF_COLUMNS": "Number of columns",
-  "DASHBOARD_WIDGET_SINGULAR": "dashboardwidget",
-  "DASHBOARD_WIDGET_PLURAL": "dashboardwidgets",
+  "DASHBOARD_WIDGET_SINGULAR": "Dashboard Widget",
+  "DASHBOARD_WIDGET_PLURAL": "Dashboard Widgets",
   "DASHBOARD_WIDGET_DASHBOARD_ID": "Dashboard id",
   "DASHBOARD_WIDGET_ENABLED": "Enabled",
   "DASHBOARD_WIDGET_WIDGET_ID": "Widget id",
@@ -50,8 +50,8 @@
   "DATA_QUERY_QUERY_NAME": "Query name",
   "DATA_QUERY_QUERY_STR": "Query str",
   "DATA_QUERY_USE_SYS_CON": "Use sys con",
-  "DATA_QUERY_PARAMETER_SINGULAR": "dataqueryparameter",
-  "DATA_QUERY_PARAMETER_PLURAL": "dataqueryparameters",
+  "DATA_QUERY_PARAMETER_SINGULAR": "Query Parameter",
+  "DATA_QUERY_PARAMETER_PLURAL": "Query Parameters",
   "DATA_QUERY_PARAMETER_DATA_QUERY_ID": "Data query id",
   "DATA_QUERY_PARAMETER_DEFAULT_VALUE": "Default value",
   "DATA_QUERY_PARAMETER_ENABLED": "Enabled",
@@ -77,33 +77,33 @@
   "ENTITY_PARAMETER_PARAMETER_TYPE": "Parameter type",
   "ENTITY_PARAMETER_PARAMETER_VALUE_FIELD": "Parameter value field",
   "ENTITY_PARAMETER_PARAMETER_VALUE_FORMAT": "Parameter value format",
-  "EXCEL_UPLOADER_DETAIL_SINGULAR": "exceluploaderdetail",
-  "EXCEL_UPLOADER_DETAIL_PLURAL": "exceluploaderdetails",
+  "EXCEL_UPLOADER_DETAIL_SINGULAR": "Excel Uploader Detail",
+  "EXCEL_UPLOADER_DETAIL_PLURAL": "Excel Uploader Details",
   "EXCEL_UPLOADER_DETAIL_COLUMN_INDEX": "Column index",
   "EXCEL_UPLOADER_DETAIL_EXCEL_UPLOADER_HEADER_ID": "Excel uploader header id",
   "EXCEL_UPLOADER_DETAIL_LOOKUP_QUERY_ID": "Lookup query id",
   "EXCEL_UPLOADER_DETAIL_TABLE_FIELD": "Table field",
-  "EXCEL_UPLOADER_HEADER_SINGULAR": "exceluploaderheader",
-  "EXCEL_UPLOADER_HEADER_PLURAL": "exceluploaderheaders",
+  "EXCEL_UPLOADER_HEADER_SINGULAR": "Excel Uploader Header",
+  "EXCEL_UPLOADER_HEADER_PLURAL": "Excel Uploader Headers",
   "EXCEL_UPLOADER_HEADER_UPLOADER_CONNECTION_ID": "Uploader connection id",
   "EXCEL_UPLOADER_HEADER_UPLOADER_DATABASE_NAME": "Uploader database name",
   "EXCEL_UPLOADER_HEADER_UPLOADER_NAME": "Uploader name",
   "EXCEL_UPLOADER_HEADER_UPLOADER_TABLE_NAME": "Uploader table name",
-  "LOOKUP_SINGULAR": "lookup",
-  "LOOKUP_PLURAL": "lookups",
+  "LOOKUP_SINGULAR": "Lookup",
+  "LOOKUP_PLURAL": "Lookups",
   "LOOKUP_ENABLED": "Enabled",
   "LOOKUP_LOOKUP_AR_DISPLAY": "Lookup ar display",
   "LOOKUP_LOOKUP_EN_DISPLAY": "Lookup en display",
   "LOOKUP_LOOKUP_TYPE": "Lookup type",
   "LOOKUP_LOOKUP_VALUE": "Lookup value",
   "LOOKUP_ORG_CODE": "Org code",
-  "MAIL_ATTACHMENT_SINGULAR": "mailattachment",
-  "MAIL_ATTACHMENT_PLURAL": "mailattachments",
+  "MAIL_ATTACHMENT_SINGULAR": "Mail Attachment",
+  "MAIL_ATTACHMENT_PLURAL": "Mail Attachments",
   "MAIL_ATTACHMENT_ENABLED": "Enabled",
   "MAIL_ATTACHMENT_MAIL_TEMPLATE_ID": "Mail template id",
   "MAIL_ATTACHMENT_REPORT_ID": "Report id",
-  "MAIL_BODY_SINGULAR": "mailbody",
-  "MAIL_BODY_PLURAL": "mailbodies",
+  "MAIL_BODY_SINGULAR": "Mail Body",
+  "MAIL_BODY_PLURAL": "Mail Bodies",
   "MAIL_BODY_BODY_NAME": "Body Name",
   "MAIL_BODY_BODY_CONTENT": "Body content",
   "MAIL_BODY_BODY_CONTENT_DATA_QUERY_ID": "Body content data query id",
@@ -112,8 +112,8 @@
   "MAIL_BODY_IS_MAIN": "Is main",
   "MAIL_BODY_MAIL_TEMPLATE_ID": "Mail template id",
   "MAIL_BODY_PRINT_FOR_EACH_RECORD": "Print for each record",
-  "MAIL_NOTIFICATION_QUEUE_SINGULAR": "mailnotificationqueue",
-  "MAIL_NOTIFICATION_QUEUE_PLURAL": "mailnotificationqueues",
+  "MAIL_NOTIFICATION_QUEUE_SINGULAR": "Mail Notification Queue",
+  "MAIL_NOTIFICATION_QUEUE_PLURAL": "Mail Notification Queue",
   "MAIL_NOTIFICATION_QUEUE_CUSTOM_MAIL_ATTACHED_REPORT_ID": "Custom mail attached report id",
   "MAIL_NOTIFICATION_QUEUE_CUSTOM_MAIL_BODY": "Custom mail body",
   "MAIL_NOTIFICATION_QUEUE_CUSTOM_MAIL_SUBJECT": "Custom mail subject",
@@ -123,8 +123,8 @@
   "MAIL_NOTIFICATION_QUEUE_MAIL_TEMPLATE_ID": "Mail template id",
   "MAIL_NOTIFICATION_QUEUE_NOTIFICATION_MESSAGE": "Notification message",
   "MAIL_NOTIFICATION_QUEUE_NOTIFICATION_TIME": "Notification time",
-  "MAIL_RECIPIENT_SINGULAR": "mailrecipient",
-  "MAIL_RECIPIENT_PLURAL": "mailrecipients",
+  "MAIL_RECIPIENT_SINGULAR": "Mail Recipient",
+  "MAIL_RECIPIENT_PLURAL": "Mail Recipients",
   "MAIL_RECIPIENT_ENABLED": "Enabled",
   "MAIL_RECIPIENT_MAIL_TEMPLATE_ID": "Mail template id",
   "MAIL_RECIPIENT_RECIPIENT_MAIL": "Recipient mail",
@@ -142,8 +142,8 @@
   "MAIL_TEMPLATE_PERIODICAL": "Periodical",
   "MAIL_TEMPLATE_START_SENDING_AT": "Start sending at",
   "MAIL_TEMPLATE_SUBJECT_DATA_QUERY_ID": "Subject data query id",
-  "NOTIFICATION_SINGULAR": "notification",
-  "NOTIFICATION_PLURAL": "notifications",
+  "NOTIFICATION_SINGULAR": "Notification",
+  "NOTIFICATION_PLURAL": "Notifications",
   "NOTIFICATION_ENABLED": "Enabled",
   "NOTIFICATION_NOTIFICATION_ACTION_KEY": "Notification action key",
   "NOTIFICATION_NOTIFICATION_ACTION_PAYLOAD": "Notification action payload",
@@ -152,8 +152,8 @@
   "NOTIFICATION_NOTIFICATION_QUERY_ID": "Notification query id",
   "NOTIFICATION_NOTIFICATION_TEXT": "Notification text",
   "NOTIFICATION_USERS_TO_NOTIFY_QUERY_ID": "Users to notify query id",
-  "NOTIFICATION_QUEUE_SINGULAR": "notificationqueue",
-  "NOTIFICATION_QUEUE_PLURAL": "notificationqueues",
+  "NOTIFICATION_QUEUE_SINGULAR": "Notification Queue",
+  "NOTIFICATION_QUEUE_PLURAL": "Notification Queue",
   "NOTIFICATION_QUEUE_CUSTOM_NOTIFICATION_ACTION_KEY": "Custom notification action key",
   "NOTIFICATION_QUEUE_CUSTOM_NOTIFICATION_ACTION_PAYLOAD": "Custom notification action payload",
   "NOTIFICATION_QUEUE_CUSTOM_NOTIFICATION_ICON": "Custom notification icon",
@@ -178,8 +178,8 @@
   "REPORT_REPORT_NAME": "Report name",
   "REPORT_REPORT_TYPE": "Report type",
   "REPORT_USE_SYS_DATASOURCE": "Use sys datasource",
-  "REPORT_PARAMETER_SINGULAR": "reportparameter",
-  "REPORT_PARAMETER_PLURAL": "reportparameters",
+  "REPORT_PARAMETER_SINGULAR": "Report Parameter",
+  "REPORT_PARAMETER_PLURAL": "Report Parameters",
   "REPORT_PARAMETER_DEFAULT_VALUE": "Default value",
   "REPORT_PARAMETER_ENABLED": "Enabled",
   "REPORT_PARAMETER_ENTITY_PARAMETER_ID": "Entity parameter id",
@@ -187,8 +187,8 @@
   "REPORT_PARAMETER_MANDATORY": "Mandatory",
   "REPORT_PARAMETER_REPORT_ID": "Report id",
 
-  "USER_REQUEST_SINGULAR": "userrequest",
-  "USER_REQUEST_PLURAL": "userrequests",
+  "USER_REQUEST_SINGULAR": "User Request",
+  "USER_REQUEST_PLURAL": "User Requests",
   "USER_REQUEST_IS_NOTIFIED": "Is notified",
   "USER_REQUEST_MAILS_TO_NOTIFY": "Mails to notify",
   "USER_REQUEST_NOTIFICATION_MESSAGE": "Notification message",
@@ -233,8 +233,8 @@
   "WORKFLOW_DOCUMENT_MAIL_APPROVAL_ALLOWED": "Mail approval allowed",
   "WORKFLOW_DOCUMENT_ORG_CODE": "Org code",
   "WORKFLOW_DOCUMENT_USE_SYSTEM_CON": "Use system con",
-  "WORKFLOW_DOCUMENT_ACTION_SINGULAR": "workflowdocumentaction",
-  "WORKFLOW_DOCUMENT_ACTION_PLURAL": "workflowdocumentactions",
+  "WORKFLOW_DOCUMENT_ACTION_SINGULAR": "Workflow Document Action",
+  "WORKFLOW_DOCUMENT_ACTION_PLURAL": "Workflow Document Actions",
   "WORKFLOW_DOCUMENT_ACTION_DOCUMENT_ACTION_CODE": "Document action code",
   "WORKFLOW_DOCUMENT_ACTION_DOCUMENT_ACTION_NAME": "Document action name",
   "WORKFLOW_DOCUMENT_ACTION_NEXT_DOCUMENT_STATUS_ID": "Next document status id",
@@ -242,8 +242,8 @@
   "WORKFLOW_DOCUMENT_ACTION_PRE_ACTION_ENDPOINT": "Pre action endpoint",
   "WORKFLOW_DOCUMENT_ACTION_REQUIRE_COMMENT": "Require comment",
   "WORKFLOW_DOCUMENT_ACTION_WORKFLOW_DOCUMENT_ID": "Workflow document id",
-  "WORKFLOW_DOCUMENT_ACTION_HISTORY_SINGULAR": "workflowdocumentactionhistory",
-  "WORKFLOW_DOCUMENT_ACTION_HISTORY_PLURAL": "workflowdocumentactionhistories",
+  "WORKFLOW_DOCUMENT_ACTION_HISTORY_SINGULAR": "Workflow Document Action History",
+  "WORKFLOW_DOCUMENT_ACTION_HISTORY_PLURAL": "Workflow Document Action History",
   "WORKFLOW_DOCUMENT_ACTION_HISTORY_ACTION_BY": "Action by",
   "WORKFLOW_DOCUMENT_ACTION_HISTORY_ACTION_COMMENT": "Action comment",
   "WORKFLOW_DOCUMENT_ACTION_HISTORY_ACTION_METHOD": "Action method",
@@ -251,13 +251,13 @@
   "WORKFLOW_DOCUMENT_ACTION_HISTORY_DOCUMENT_ACTION_ID": "Document action id",
   "WORKFLOW_DOCUMENT_ACTION_HISTORY_DOCUMENT_REF_ID": "Document ref id",
   "WORKFLOW_DOCUMENT_ACTION_HISTORY_WORKFLOW_DOCUMENT_ID": "Workflow document id",
-  "WORKFLOW_DOCUMENT_ACTION_MAIL_SINGULAR": "workflowdocumentactionmail",
-  "WORKFLOW_DOCUMENT_ACTION_MAIL_PLURAL": "workflowdocumentactionmails",
+  "WORKFLOW_DOCUMENT_ACTION_MAIL_SINGULAR": "Workflow Document Action Mail",
+  "WORKFLOW_DOCUMENT_ACTION_MAIL_PLURAL": "Workflow Document Action Mails",
   "WORKFLOW_DOCUMENT_ACTION_MAIL_DOCUMENT_ACTION_ID": "Document action id",
   "WORKFLOW_DOCUMENT_ACTION_MAIL_ENABLED": "Enabled",
   "WORKFLOW_DOCUMENT_ACTION_MAIL_MAIL_TEMPLATE_ID": "Mail template id",
-  "WORKFLOW_DOCUMENT_MAIL_LOG_SINGULAR": "workflowdocumentmaillog",
-  "WORKFLOW_DOCUMENT_MAIL_LOG_PLURAL": "workflowdocumentmaillogs",
+  "WORKFLOW_DOCUMENT_MAIL_LOG_SINGULAR": "Workflow Document Mail Log",
+  "WORKFLOW_DOCUMENT_MAIL_LOG_PLURAL": "Workflow Document Mail Logs",
   "WORKFLOW_DOCUMENT_MAIL_LOG_GRAPH_API_MSG_ID": "Graph api msg id",
   "WORKFLOW_DOCUMENT_MAIL_LOG_IS_PROCESSED": "Is processed",
   "WORKFLOW_DOCUMENT_MAIL_LOG_MAIL_ACTION_CODE": "Mail action code",
@@ -268,8 +268,8 @@
   "WORKFLOW_DOCUMENT_MAIL_LOG_PROCESS_TIME": "Process time",
   "WORKFLOW_DOCUMENT_MAIL_LOG_REF_DOC_ID": "Ref doc id",
   "WORKFLOW_DOCUMENT_MAIL_LOG_WORKFLOW_DOCUMENT_ID": "Workflow document id",
-  "WORKFLOW_DOCUMENT_STATUS_SINGULAR": "workflowdocumentstatus",
-  "WORKFLOW_DOCUMENT_STATUS_PLURAL": "workflowdocumentstatuses",
+  "WORKFLOW_DOCUMENT_STATUS_SINGULAR": "Workflow Document Status",
+  "WORKFLOW_DOCUMENT_STATUS_PLURAL": "Workflow Document Statuses",
   "WORKFLOW_DOCUMENT_STATUS_DOCUMENT_STATUS_CODE": "Document status code",
   "WORKFLOW_DOCUMENT_STATUS_DOCUMENT_STATUS_NAME": "Document status name",
   "WORKFLOW_DOCUMENT_STATUS_DOCUMENT_STATUS_ORDER": "Document status order",
@@ -290,8 +290,8 @@
   "ATTACHMENT_CONFIG_STORAGE_TYPE": "Storage type",
   "ATTACHMENT_CONFIG_UPLOAD_AUTHORITY_KEY": "Upload authority key",
   "ATTACHMENT_CONFIG_UPLOAD_DIRECTORY": "Upload directory",
-  "NOTIFICATION_SINGULAR": "notification",
-	"NOTIFICATION_PLURAL": "notifications",
+  "NOTIFICATION_SINGULAR": "Notification",
+	"NOTIFICATION_PLURAL": "Notifications",
 	"NOTIFICATION_IS_ACTIVE": "Is active",
 	"NOTIFICATION_NOTIFICATION_ACTION_PAYLOAD": "Notification action payload",
 	"NOTIFICATION_NOTIFICATION_CODE": "Notification code",