Merged PR 35607: prepare azure chat configuration

prepare azure chat configuration Related work items: #129933
Amsterdam · Nov 5, 2024 · 1196eab · 1196eab
2 parents 9376728 + eb63932
commit 1196eab
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 12 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -36,6 +36,7 @@ module.exports = {
     {
       files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
       rules: {
+        'no-process-env': 'error',
         'depend/ban-dependencies': 'warn',
         '@typescript-eslint/no-empty-function': 'warn',
         'react-hooks/exhaustive-deps': [

diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -53,6 +53,7 @@ const config: StorybookConfig = {
         __DEV__: false,
         // process.env is causing a conflict with immer (dependency of redux) and Vite requires us to fix it like so
         'process.env': {
+          // eslint-disable-next-line no-process-env
           NODE_ENV: JSON.stringify(process.env.NODE_ENV),
         },
       },

diff --git a/babel.config.js b/babel.config.js
@@ -23,6 +23,18 @@ module.exports = {
           'APPLICATION_INSIGHTS_INSTRUMENTATION_KEY_TEST',
           'APPLICATION_INSIGHTS_INSTRUMENTATION_KEY_ACC',
           'APPLICATION_INSIGHTS_INSTRUMENTATION_KEY_PROD',
+          'CHAT_DEVELOPER_NAME_DEV',
+          'CHAT_ORGANIZATION_ID_DEV',
+          'CHAT_URL_DEV',
+          'CHAT_DEVELOPER_NAME_TEST',
+          'CHAT_ORGANIZATION_ID_TEST',
+          'CHAT_URL_TEST',
+          'CHAT_DEVELOPER_NAME_ACC',
+          'CHAT_ORGANIZATION_ID_ACC',
+          'CHAT_URL_ACC',
+          'CHAT_DEVELOPER_NAME_PROD',
+          'CHAT_ORGANIZATION_ID_PROD',
+          'CHAT_URL_PROD',
         ],
       },
     ],

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,5 +1,6 @@
 import {Config} from 'jest'
 
+// eslint-disable-next-line no-process-env
 process.env.TZ = 'UTC+1'
 
 const config: Config = {

diff --git a/pipelines/templates/app-build.yml b/pipelines/templates/app-build.yml
@@ -72,10 +72,16 @@ steps:
       FILTER_API_KEY_PROD: $(API_KEY_PROD)
       CHAT_DEVELOPER_NAME_DEV: $(CHAT_DEVELOPER_NAME_DEV)
       CHAT_DEVELOPER_NAME_TEST: $(CHAT_DEVELOPER_NAME_TEST)
+      CHAT_DEVELOPER_NAME_ACC: $(CHAT_DEVELOPER_NAME_ACC)
+      CHAT_DEVELOPER_NAME_PROD: $(CHAT_DEVELOPER_NAME_PROD)
       CHAT_ORGANIZATION_ID_DEV: $(CHAT_ORGANIZATION_ID_DEV)
       CHAT_ORGANIZATION_ID_TEST: $(CHAT_ORGANIZATION_ID_TEST)
+      CHAT_ORGANIZATION_ID_ACC: $(CHAT_ORGANIZATION_ID_ACC)
+      CHAT_ORGANIZATION_ID_PROD: $(CHAT_ORGANIZATION_ID_PROD)
       CHAT_URL_DEV: $(CHAT_URL_DEV)
       CHAT_URL_TEST: $(CHAT_URL_TEST)
+      CHAT_URL_ACC: $(CHAT_URL_ACC)
+      CHAT_URL_PROD: $(CHAT_URL_PROD)
 
   # Handle artifacts
   - template: ./copy-generic-artifacts.yml

diff --git a/src/custom.d.ts b/src/custom.d.ts
@@ -36,4 +36,16 @@ declare module '@env' {
   export const APPLICATION_INSIGHTS_INSTRUMENTATION_KEY_TEST: string | undefined
   export const APPLICATION_INSIGHTS_INSTRUMENTATION_KEY_ACC: string | undefined
   export const APPLICATION_INSIGHTS_INSTRUMENTATION_KEY_PROD: string | undefined
+  export const CHAT_DEVELOPER_NAME_DEV: string | undefined
+  export const CHAT_ORGANIZATION_ID_DEV: string | undefined
+  export const CHAT_URL_DEV: string | undefined
+  export const CHAT_DEVELOPER_NAME_TEST: string | undefined
+  export const CHAT_ORGANIZATION_ID_TEST: string | undefined
+  export const CHAT_URL_TEST: string | undefined
+  export const CHAT_DEVELOPER_NAME_ACC: string | undefined
+  export const CHAT_ORGANIZATION_ID_ACC: string | undefined
+  export const CHAT_URL_ACC: string | undefined
+  export const CHAT_DEVELOPER_NAME_PROD: string | undefined
+  export const CHAT_ORGANIZATION_ID_PROD: string | undefined
+  export const CHAT_URL_PROD: string | undefined
 }
diff --git a/src/modules/chat/hooks/useCoreConfig.ts b/src/modules/chat/hooks/useCoreConfig.ts
@@ -1,3 +1,17 @@
+import {
+  CHAT_DEVELOPER_NAME_DEV,
+  CHAT_ORGANIZATION_ID_DEV,
+  CHAT_URL_DEV,
+  CHAT_DEVELOPER_NAME_TEST,
+  CHAT_ORGANIZATION_ID_TEST,
+  CHAT_URL_TEST,
+  CHAT_DEVELOPER_NAME_ACC,
+  CHAT_ORGANIZATION_ID_ACC,
+  CHAT_URL_ACC,
+  CHAT_DEVELOPER_NAME_PROD,
+  CHAT_ORGANIZATION_ID_PROD,
+  CHAT_URL_PROD,
+} from '@env'
 import {CoreConfig} from 'react-native-salesforce-messaging-in-app/src/types'
 import {Environment} from '@/environment'
 import {useSelector} from '@/hooks/redux/useSelector'
@@ -10,24 +24,24 @@ export const useCoreConfig = () => {
   switch (environment) {
     case Environment.development:
     case Environment.custom:
-      config.developerName = process.env.CHAT_DEVELOPER_NAME_DEV ?? ''
-      config.organizationId = process.env.CHAT_ORGANIZATION_ID_DEV ?? ''
-      config.url = process.env.CHAT_URL_DEV ?? ''
+      config.developerName = CHAT_DEVELOPER_NAME_DEV ?? ''
+      config.organizationId = CHAT_ORGANIZATION_ID_DEV ?? ''
+      config.url = CHAT_URL_DEV ?? ''
       break
     case Environment.test:
-      config.developerName = process.env.CHAT_DEVELOPER_NAME_TEST ?? ''
-      config.organizationId = process.env.CHAT_ORGANIZATION_ID_TEST ?? ''
-      config.url = process.env.CHAT_URL_TEST ?? ''
+      config.developerName = CHAT_DEVELOPER_NAME_TEST ?? ''
+      config.organizationId = CHAT_ORGANIZATION_ID_TEST ?? ''
+      config.url = CHAT_URL_TEST ?? ''
       break
     case Environment.acceptance:
-      config.developerName = process.env.CHAT_DEVELOPER_NAME_ACC ?? ''
-      config.organizationId = process.env.CHAT_ORGANIZATION_ID_ACC ?? ''
-      config.url = process.env.CHAT_URL_ACC ?? ''
+      config.developerName = CHAT_DEVELOPER_NAME_ACC ?? ''
+      config.organizationId = CHAT_ORGANIZATION_ID_ACC ?? ''
+      config.url = CHAT_URL_ACC ?? ''
       break
     case Environment.production:
-      config.developerName = process.env.CHAT_DEVELOPER_NAME_PROD ?? ''
-      config.organizationId = process.env.CHAT_ORGANIZATION_ID_PROD ?? ''
-      config.url = process.env.CHAT_URL_PROD ?? ''
+      config.developerName = CHAT_DEVELOPER_NAME_PROD ?? ''
+      config.organizationId = CHAT_ORGANIZATION_ID_PROD ?? ''
+      config.url = CHAT_URL_PROD ?? ''
       break
   }