feat: sync DR

confd/production.tmpl

@@ -58,5 +58,11 @@ window._env_ = {
   },
   SERVED_ENTITY_TYPES: '{{ getv "/configuration/served/entity/types" "RECORD_ALL,RECORD_RASTER,RECORD_3D,RECORD_DEM" }}',
   PROJECT_VERSION: '{{getv "/configuration/project/version" ""}}',
-  WHATSNEW_URL: '{{getv "/configuration/whatsnew/url" "http://whatsnew-URL"}}'
+  WHATSNEW_URL: '{{getv "/configuration/whatsnew/url" "http://whatsnew-URL"}}',
+  SITES_CONFIG: {
+    masters:'{{getv "/configuration/sites/config/masters" "[{ dns: 'http://localhost:3000', isAlias: false }]"}}',
+    slaves:'{{getv "/configuration/sites/config/slaves" "[{ dns: 'http://localhost:8090', isAlias: false }]"}}',
+    generics:'{{getv "/configuration/sites/config/generics" "[{ dns: 'https://catalog.mapcolonies.net', isAlias: false }]"}}',
+  },
+  BFF_PATH: '{{getv "/configuration/bff/path" "/graphql"}}'
 };

confd/production.toml

@@ -44,4 +44,8 @@ keys = [
   "/configuration/admin/password",
   "/configuration/project/version",
   "/configuration/whatsnew/url",
+  "/configuration/sites/config/masters",
+  "/configuration/sites/config/slaves",
+  "/configuration/sites/config/generics",
+  "/configuration/bff/path"
 ]

helm/templates/configmap.yaml

@@ -57,4 +57,8 @@ data:
   CONFIGURATION_ACTIVE_LAYER_PROPERTIES_URL_PATTERN_PARAMS_STYLE: {{ quote .Values.ui.env.activeLayerPropeties.urlPattern.style }}
   CONFIGURATION_ACTIVE_LAYER_PROPERTIES_URL_PATTERN_PARAMS_PROJECTION: {{ quote .Values.ui.env.activeLayerPropeties.urlPattern.projection }}
   CONFIGURATION_WHATSNEW_URL: {{ quote .Values.ui.env.whatsnewUrl }}
+  CONFIGURATION_SITES_CONFIG_MASTERS: {{ quote .Values.ui.env.sitesConfig.masters }}
+  CONFIGURATION_SITES_CONFIG_SLAVES: {{ quote .Values.ui.env.sitesConfig.slaves }}
+  CONFIGURATION_SITES_CONFIG_GENERICS: {{ quote .Values.ui.env.sitesConfig.generics }}
+  CONFIGURATION_BFF_PATH: {{ quote .Values.ui.env.bffPath }}
 {{- end }}

helm/values.yaml

@@ -92,6 +92,11 @@ ui:
         matrixSet: ''
         style: ''
         projection: ''
+    sitesConfig:
+      masters: '[]'
+      slaves: '[]'
+      generics: '[]'
+    bffPath: ''
   resources:
     enabled: true
     limits:

src/App.css

@@ -120,6 +120,14 @@ button.cesium-infoBox-close:hover {
   text-align: center;
 }
 
+.appVersionContainer-master {
+  color: var(--mdc-theme-gc-site-master);
+}
+
+.appVersionContainer-slave {
+  color:  var(--mdc-theme-gc-site-slave);
+}
+
 title.rtl {
   direction: rtl;
 }

src/__mocks__/confEnvShim.js

@@ -61,7 +61,13 @@ if (!window._env_) {
         tokenValue: 'TOKEN'
       },
       SERVED_ENTITY_TYPES: 'RECORD_ALL,RECORD_RASTER,RECORD_3D,RECORD_DEM',
-      WHATSNEW_URL: 'http://whatsnew-URL'
+      WHATSNEW_URL: 'http://whatsnew-URL',
+      SITES_CONFIG: {
+        masters: [{ dns: 'http://localhost:3000', isAlias: false }],
+        slaves: [{ dns: 'http://localhost:8090', isAlias: false }],
+        generics: [{ dns: 'https://catalog.mapcolonies.net', isAlias: false }],
+      },
+      BFF_PATH: '/graphql'
     };
   })(void 0);
 }

src/common/components/error/error-presentor.css

@@ -21,3 +21,7 @@
 body[dir='rtl'] .errorContainer {
 flex-direction: row-reverse;
 }
+
+.error {
+  color: var(--mdc-theme-gc-error-high) !important;
+}

src/common/components/error/graphql.error-presentor.tsx

@@ -29,7 +29,7 @@ interface IServerErrorResponse {
   statusText?: string;
 }
 
-export const GraphQLError: React.FC<IGpaphQLError> = (props) => {
+export const GraphQLError: React.FC<IGpaphQLError> = ({ error }) => {
 
   const intl = useIntl();
 
@@ -49,20 +49,20 @@ export const GraphQLError: React.FC<IGpaphQLError> = (props) => {
   return (
     <>
       {
-        !isEmpty(props.error?.response) &&
+        !isEmpty(error?.response) &&
         <AutoDirectionBox className="errorContainer">
           <IconButton className="errorIcon mc-icon-Status-Warnings" />
           <ul className="errorsList">
             {
-              props.error.response.errors?.map((error: IServerError, index: number) => {
+              error.response.errors?.map((error: IServerError, index: number) => {
                 return (
                   <li dir="auto" key={index} dangerouslySetInnerHTML={{__html: formatMessage(error)}}></li>
                 );
               })
             }
             {
-              props.error.response.status >= SERVER_ERROR_RESPONSE_CODE &&
-              <li dir="auto" key={props.error.response.status as number}><FormattedMessage id="general.server.error"/></li>
+              error.response.status >= SERVER_ERROR_RESPONSE_CODE &&
+              <li dir="auto" key={error.response.status as number}><FormattedMessage id="general.server.error"/></li>
             }
           </ul>
         </AutoDirectionBox>

src/common/config/index.ts

@@ -28,6 +28,8 @@ const ACCESS_TOKEN = (window as any)._env_.ACCESS_TOKEN;
 const SERVED_ENTITY_TYPES = (window as any)._env_.SERVED_ENTITY_TYPES;
 const PROJECT_VERSION = (window as any)._env_.PROJECT_VERSION;
 const WHATSNEW_URL = (window as any)._env_.WHATSNEW_URL;
+const SITES_CONFIG = (window as any)._env_.SITES_CONFIG;
+const BFF_PATH = (window as any)._env_.BFF_PATH;
 
 const enrichBaseMaps = (baseMaps: IBaseMaps): IBaseMaps => {
   return {
@@ -186,7 +188,13 @@ const APP_CONFIG = {
       }
     }
   },
-  WHATSNEW_URL: WHATSNEW_URL
+  WHATSNEW_URL: WHATSNEW_URL,
+  SITES_CONFIG: {
+    masters: SITES_CONFIG.masters,
+    slaves: SITES_CONFIG.slaves,
+    generics: SITES_CONFIG.generics,
+  },
+  BFF_PATH: BFF_PATH
 };
 
 export default APP_CONFIG;

src/common/helpers/siteUrl.ts

@@ -0,0 +1,22 @@
+import { GraphQLClient } from 'mst-gql/node_modules/graphql-request';
+import { createHttpClient } from 'mst-gql';
+import { site, siteName } from '../../discrete-layer/models/userStore';
+import CONFIG from '../config';
+
+export const currentBffUrl = `${CONFIG.SERVICE_PROTOCOL as string}${CONFIG.SERVICE_NAME as string}`;
+
+export const currentClientUrl = window.location.origin;
+
+export const currentSite = (): siteName => {
+  return CONFIG.SITES_CONFIG.slaves.map((slave: site) => slave.dns).includes(currentClientUrl)
+    ? 'slave'
+    : CONFIG.SITES_CONFIG.masters.map((master: site) => master.dns).includes(currentClientUrl)
+    ? 'master'
+    : CONFIG.SITES_CONFIG.generics.map((generic: site) => generic.dns).includes(currentClientUrl)
+    ? 'generic'
+    : 'undefined';
+};
+
+export const syncSlavesDns: GraphQLClient[] = CONFIG.SITES_CONFIG.slaves?.filter((slave: site) => !slave.isAlias)
+  .map((slave: site) => createHttpClient(slave.dns + CONFIG.BFF_PATH)
+);

src/common/helpers/storage.ts

@@ -6,6 +6,11 @@ export interface IStorage {
   remove: (key: string) => void;
   clear: () => void;
   key: (index: number) => string | null;
+  watchMethods: ( methods: string[], 
+                  callbackBefore?: (method: string, key: string, ...args: any[]) => void,
+                  callbackAfter?: (method: string, key: string, ...args: any[]) => void
+                ) => void,
+  unWatchMethods: () => void,
   length: number;
 }
 
@@ -87,6 +92,36 @@ function storageFactory(storage: Storage, prefix = ''): IStorage {
     }
   }
 
+  let originalMethods: Record<string, () => void> = {};
+
+  function watchMethods (
+    methods: string[] = [],
+    callbackBefore: (method: string, key: string, ...args: any[]) => void = function () {},
+    callbackAfter: (method: string, key: string, ...args: any[]) => void = function () {},
+  ) {
+    for (let method of methods) {
+      const original = storage[method].bind(storage);
+      originalMethods[method] = original;
+      const newMethod = function (...args: any[]) {
+        // @ts-ignore
+        callbackBefore(method, ...args);
+        const result = original.apply(null, args);
+        // @ts-ignore
+        callbackAfter(method, ...args);
+        return result;
+      };
+      storage[method] = newMethod.bind(storage);
+    }
+  }
+
+  function unWatchMethods () {
+    Object.keys(originalMethods).forEach(method => {
+      storage[method] = originalMethods[method];
+    });
+    originalMethods={};
+  }
+
+
   return {
     get,
     set,
@@ -95,6 +130,8 @@ function storageFactory(storage: Storage, prefix = ''): IStorage {
     remove,
     clear,
     key,
+    watchMethods,
+    unWatchMethods,
     length,
   };
 }

src/common/i18n/en.json

@@ -164,6 +164,8 @@
 
   "tab-views.search-results": "Search results",
   "tab-views.catalog": "Catalog",
+  "tab-views.catalog.site.master": "Main",
+  "tab-views.catalog.site.slave": "Secondary",
   "tab-views.create-best": "BEST edit",
   "tab-views.export-layer": "Export Layer",
 
@@ -206,8 +208,15 @@
 
   "field-names.ingestion.directory": "Directory",
   "field-names.ingestion.fileNames": "File names",
+  "ingestion.warning.title": "Warning:",
+  "ingestion.warning.invalid-secondary-file": "{title} file validation failed on secondary site",
+  "ingestion.error.invalid-source-file": "Selected file error: {value}",
+  "ingestion.error.source-file-exception": "Cannot run validation api: {value}",
+  "ingestion.error.directory-comparison": "Warning: directory content is not the same between current and secondary sites",
   "ingestion.error.invalid-metadata": "Metadata file format is not valid",
+  "ingestion.error.not-available": "is not available",
   "ingestion.button.import-metadata": "Import Metadata",
+  "ingestion.checkbox.label": "Operation failed on secondary site, please check to continue with operation on main site only",
 
   "field-names.raster.id": "ID",
   "field-names.raster.productId": "Ext. ID",

src/common/i18n/he.json

@@ -166,6 +166,8 @@
 
   "tab-views.search-results": "תוצאות חיפוש",
   "tab-views.catalog": "קטלוג",
+  "tab-views.catalog.site.master": "ראשי",
+  "tab-views.catalog.site.slave": "משני",
   "tab-views.create-best": "עריכת טיוטת BEST",
   "tab-views.export-layer": "ייצוא שכבה",
 
@@ -210,8 +212,15 @@
 
   "field-names.ingestion.directory": "נתיב מלא",
   "field-names.ingestion.fileNames": "שמות הקבצים",
+  "ingestion.warning.title": "אזהרה:",
+  "ingestion.warning.invalid-secondary-file": "{title} אירעה שגיאה בוולידציה של הקובץ באתר המשני",
+  "ingestion.error.invalid-source-file": "שגיאה בקובץ הנבחר: {value}",
+  "ingestion.error.source-file-exception": "שירות ולידציה אינו תקין: {value}",
+  "ingestion.error.directory-comparison": "אזהרה: תוכן הסיפרייה אינו זהה בין האתר הראשי והאתר המשני",
   "ingestion.error.invalid-metadata": "קובץ מטא-דאטה בפורמט לא תקין",
+  "ingestion.error.not-available": "לא זמין",
   "ingestion.button.import-metadata": "בחר מטא-דאטה",
+  "ingestion.checkbox.label": "לא ניתן לבצע את הפעולה באתר המשני, יש לסמן כדי להמשיך ולבצע את הפעולה באתר הראשי בלבד",
 
   "field-names.raster.id": "מזהה",
   "field-names.raster.productId": "מזהה חיצוני",

src/discrete-layer/components/export-layer/export-layer.component.css

@@ -276,7 +276,6 @@ body[dir='rtl'] .exportOptionsSelect .mdc-select__dropdown-icon {
 
 .exportFieldLabelContainer .requiredAsterisk {
   color: var(--mdc-theme-gc-error-high);
-
 }
 
 .exportActionMenu {

src/discrete-layer/components/layer-details/entity.dialog.tsx

@@ -12,8 +12,10 @@ import { DialogContent } from '@material-ui/core';
 import { Dialog, DialogTitle, IconButton } from '@map-colonies/react-core';
 import { Box } from '@map-colonies/react-components';
 import { emphasizeByHTML } from '../../../common/helpers/formatters';
+import { sessionStore } from '../../../common/helpers/storage';
 import { getStatusColoredBackground } from '../../../common/helpers/style';
 import { Mode } from '../../../common/models/mode.enum';
+import { SYNC_QUERY, syncQueries } from '../../../syncHttpClientGql';
 import {
   BestRecordModelType,
   EntityDescriptorModelType,
@@ -462,6 +464,7 @@ export const EntityDialog: React.FC<EntityDialogProps> = observer(
     const closeDialog = useCallback(() => {
       onSetOpen(false);
       store.discreteLayersStore.resetUpdateMode();
+      syncQueries.map((query: SYNC_QUERY) => query.queryName).forEach((key: string) => sessionStore.remove(key));
     }, [onSetOpen, store.discreteLayersStore]);
 
     useEffect(() => {

src/discrete-layer/components/layer-details/ingestion-fields.css

@@ -105,4 +105,11 @@ body[dir='rtl'] .moreTooltip {
   width: 60ch;
   overflow: hidden;
   text-overflow: ellipsis;
-}
+  display: flex;
+  flex-direction: row-reverse;
+  direction: rtl;
+}
+
+body[dir='rtl'] .filesPathContainer {
+  direction: ltr;
+}