Remove auth and change what english chat is

island-is · Oct 16, 2024 · a68d353 · a68d353
1 parent 0ae3dac
commit a68d353
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 27 deletions.
diff --git a/apps/web/components/ChatPanel/WatsonChatPanel/WatsonChatPanel.tsx b/apps/web/components/ChatPanel/WatsonChatPanel/WatsonChatPanel.tsx
@@ -30,7 +30,6 @@ import { SUBMIT_WATSON_ASSISTANT_CHAT_FEEDBACK } from '@island.is/web/screens/qu
 import { ChatBubble } from '../ChatBubble'
 import { WatsonChatPanelProps } from '../types'
 import type { WatsonInstance, WatsonInstanceEvent } from './types'
-import { onAuthenticatedWatsonAssistantChatLoad } from './utils'
 import * as styles from './WatsonChatPanel.css'
 
 const chatLog: WatsonInstanceEvent[] = []
@@ -334,7 +333,8 @@ export const WatsonChatPanel = (props: WatsonChatPanelProps) => {
 
             if (
               // Útlendingastofnun
-              props.integrationID !== '89a03e83-5c73-4642-b5ba-cd3771ceca54'
+              props.integrationID !== '89a03e83-5c73-4642-b5ba-cd3771ceca54' &&
+              props.integrationID !== '9e320784-ad44-4da9-9eb3-f305057a196a'
             ) {
               // Keep the chat log in memory
               instance.on({
@@ -370,18 +370,6 @@ export const WatsonChatPanel = (props: WatsonChatPanelProps) => {
               })
             }
 
-            if (
-              // Askur - Útlendingastofnun
-              props.integrationID === '89a03e83-5c73-4642-b5ba-cd3771ceca54'
-            ) {
-              onAuthenticatedWatsonAssistantChatLoad(
-                instance,
-                namespace,
-                activeLocale,
-                'directorateOfImmigration',
-              )
-            }
-
             if (onLoad) {
               onLoad(instance)
             }

diff --git a/apps/web/components/ChatPanel/WatsonChatPanel/utils.ts b/apps/web/components/ChatPanel/WatsonChatPanel/utils.ts
@@ -1,7 +1,7 @@
-import { Locale } from '@island.is/shared/types'
 import { uuid } from 'uuidv4'
 import { ApolloClient, NormalizedCacheObject } from '@apollo/client'
 
+import { Locale } from '@island.is/shared/types'
 import { storageFactory } from '@island.is/shared/utils'
 import initApollo from '@island.is/web/graphql/client'
 import {

diff --git a/apps/web/components/ChatPanel/types.ts b/apps/web/components/ChatPanel/types.ts
@@ -49,6 +49,9 @@ export type WatsonIntegration =
   // Útlendingastofnun
   | '89a03e83-5c73-4642-b5ba-cd3771ceca54'
 
+  // Útlendingastofnun - english
+  | '9e320784-ad44-4da9-9eb3-f305057a196a'
+
   // Sjúkratryggingar
   | 'e625e707-c9ce-4048-802c-c12b905c28be'
 
@@ -78,4 +81,6 @@ export type WatsonIntegration =
 
 export type WatsonServiceInstance =
   // Askur
-  'bc3d8312-d862-4750-b8bf-529db282050a'
+  | 'bc3d8312-d862-4750-b8bf-529db282050a'
+  // Útlendingastofnun - english
+  | '2529638b-503c-4374-955c-0310139ec177'
diff --git a/apps/web/components/Organization/Wrapper/config.ts b/apps/web/components/Organization/Wrapper/config.ts
@@ -90,9 +90,9 @@ export const watsonConfig: Record<
     // Útlendingastofnun - Organization
     // https://app.contentful.com/spaces/8k0h54kbe6bj/entries/77rXck3sISbMsUv7BO1PG2
     '77rXck3sISbMsUv7BO1PG2': {
-      integrationID: '89a03e83-5c73-4642-b5ba-cd3771ceca54',
+      integrationID: '9e320784-ad44-4da9-9eb3-f305057a196a',
       region: 'eu-gb',
-      serviceInstanceID: 'bc3d8312-d862-4750-b8bf-529db282050a',
+      serviceInstanceID: '2529638b-503c-4374-955c-0310139ec177',
       showLauncher: false,
       carbonTheme: 'g10',
       namespaceKey: 'default',

diff --git a/apps/web/components/ServiceWeb/config.ts b/apps/web/components/ServiceWeb/config.ts
@@ -1,5 +1,4 @@
 import { Locale } from '@island.is/shared/types'
-
 import { WatsonChatPanelProps } from '@island.is/web/components'
 
 import { BackgroundVariations, Options } from './types'
@@ -135,9 +134,9 @@ export const watsonConfig: Record<
       namespaceKey: 'default',
     },
     [Organization.DIRECTORATE_OF_IMMIGRATION]: {
-      integrationID: '89a03e83-5c73-4642-b5ba-cd3771ceca54',
+      integrationID: '9e320784-ad44-4da9-9eb3-f305057a196a',
       region: 'eu-gb',
-      serviceInstanceID: 'bc3d8312-d862-4750-b8bf-529db282050a',
+      serviceInstanceID: '2529638b-503c-4374-955c-0310139ec177',
       showLauncher: false,
       carbonTheme: 'g10',
       namespaceKey: 'default',

diff --git a/apps/web/screens/Article/components/ArticleChatPanel/config.ts b/apps/web/screens/Article/components/ArticleChatPanel/config.ts
@@ -1,5 +1,4 @@
 import { Locale } from '@island.is/shared/types'
-
 import {
   LiveChatIncChatPanelProps,
   WatsonChatPanelProps,
@@ -219,9 +218,9 @@ export const watsonConfig: Record<
     // Útlendingastofnun - Organization
     // https://app.contentful.com/spaces/8k0h54kbe6bj/entries/77rXck3sISbMsUv7BO1PG2
     '77rXck3sISbMsUv7BO1PG2': {
-      integrationID: '89a03e83-5c73-4642-b5ba-cd3771ceca54',
+      integrationID: '9e320784-ad44-4da9-9eb3-f305057a196a',
       region: 'eu-gb',
-      serviceInstanceID: 'bc3d8312-d862-4750-b8bf-529db282050a',
+      serviceInstanceID: '2529638b-503c-4374-955c-0310139ec177',
       showLauncher: false,
       carbonTheme: 'g10',
       namespaceKey: 'default',

diff --git a/apps/web/screens/Project/components/ProjectChatPanel/config.ts b/apps/web/screens/Project/components/ProjectChatPanel/config.ts
@@ -1,5 +1,4 @@
 import { Locale } from '@island.is/shared/types'
-
 import {
   LiveChatIncChatPanelProps,
   WatsonChatPanelProps,
@@ -47,9 +46,9 @@ export const watsonConfig: Record<
     // Information for Ukrainian citizens
     // https://app.contentful.com/spaces/8k0h54kbe6bj/entries/7GtuCCd7MEZhZKe0oXcHdb
     '7GtuCCd7MEZhZKe0oXcHdb': {
-      integrationID: '89a03e83-5c73-4642-b5ba-cd3771ceca54',
+      integrationID: '9e320784-ad44-4da9-9eb3-f305057a196a',
       region: 'eu-gb',
-      serviceInstanceID: 'bc3d8312-d862-4750-b8bf-529db282050a',
+      serviceInstanceID: '2529638b-503c-4374-955c-0310139ec177',
       showLauncher: true,
       carbonTheme: 'g10',
       namespaceKey: 'ukrainian-citizens',