chore: fix read value from ListVariable

chili-publish · Feb 10, 2025 · 061f1f8 · 061f1f8
1 parent bdc0efa
commit 061f1f8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 14 deletions.
diff --git a/src/tests/utils/connectors.test.ts b/src/tests/utils/connectors.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import EditorSDK, { ConnectorMappingDirection } from '@chili-publish/studio-sdk';
+import EditorSDK, { ConnectorMappingDirection, VariableType } from '@chili-publish/studio-sdk';
 import axios from 'axios';
 import { mock } from 'jest-mock-extended';
 import {
@@ -16,14 +16,15 @@ const GRAFX_ENV_API = 'http://env-1.com/';
 describe('utils connectors', () => {
     const mockSDK = mock<EditorSDK>();
     mockSDK.next.connector = {} as any;
+    mockSDK.next.variable = {} as any;
 
     mockSDK.next.connector.getById = jest.fn().mockResolvedValue({
         parsedData: {
             source: { url: 'http://deploy.com/media-connector' },
         },
     });
     mockSDK.mediaConnector.query = jest.fn();
-    mockSDK.variable.getById = jest.fn();
+    mockSDK.next.variable.getById = jest.fn();
     mockSDK.connector.getMappings = jest.fn();
 
     window.StudioUISDK = mockSDK;
@@ -83,15 +84,30 @@ describe('utils connectors', () => {
     });
 
     it('should "getConnectorConfigurationOptions" correctly', async () => {
-        (mockSDK.variable.getById as jest.Mock)
+        (mockSDK.next.variable.getById as jest.Mock)
             .mockResolvedValueOnce({
                 parsedData: {
                     value: 'text',
+                    type: VariableType.shortText,
                 },
             })
             .mockResolvedValueOnce({
                 parsedData: {
                     value: false,
+                    type: VariableType.boolean,
+                },
+            })
+            .mockResolvedValueOnce({
+                parsedData: {
+                    selected: {
+                        value: 'list-item-1',
+                    },
+                    type: VariableType.list,
+                },
+            })
+            .mockResolvedValueOnce({
+                parsedData: {
+                    type: VariableType.list,
                 },
             });
 
@@ -113,6 +129,14 @@ describe('utils connectors', () => {
                     name: 'option-4',
                     value: 'var.var2',
                 },
+                {
+                    name: 'option-5',
+                    value: 'var.var3',
+                },
+                {
+                    name: 'option-6',
+                    value: 'var.var4',
+                },
             ],
         });
 
@@ -127,6 +151,8 @@ describe('utils connectors', () => {
             'option-2': 'text',
             'option-3': true,
             'option-4': false,
+            'option-5': 'list-item-1',
+            'option-6': null,
         });
     });
 });
diff --git a/src/types/OutputGenerationTypes.ts b/src/types/OutputGenerationTypes.ts
@@ -1,6 +1,6 @@
 export type DataConnectorConfiguration = {
     dataConnectorId: string;
     dataConnectorParameters: {
-        context: Record<string, string | boolean> | null;
+        context: Record<string, string | boolean | null> | null;
     };
 };
diff --git a/src/utils/connectors.ts b/src/utils/connectors.ts
@@ -1,9 +1,4 @@
-import {
-    BooleanVariable,
-    ConnectorMappingDirection,
-    EngineToConnectorMapping,
-    ShortTextVariable,
-} from '@chili-publish/studio-sdk';
+import { ConnectorMappingDirection, EngineToConnectorMapping, Variable } from '@chili-publish/studio-sdk';
 import {
     ConnectorGrafxRegistration,
     ConnectorInstance,
@@ -12,6 +7,7 @@ import {
     ConnectorUrlRegistration,
 } from '@chili-publish/studio-sdk/lib/src/next';
 import axios from 'axios';
+import { isBooleanVariable, isListVariable, isTextVariable } from '../components/variablesComponents/Variable';
 import { RemoteConnector } from './ApiTypes';
 
 const isConnectorUrlRegistration = (
@@ -75,7 +71,15 @@ export function getEnvId(connector: ConnectorInstance) {
 
 export type TextEngineToConnectorMapping = Omit<EngineToConnectorMapping, 'value'> & { value: string };
 
-type LinkedVariable = ShortTextVariable | BooleanVariable;
+function readValueFromLinkedVariable(variable: Variable) {
+    if (isTextVariable(variable) || isBooleanVariable(variable)) {
+        return variable.value;
+    }
+    if (isListVariable(variable)) {
+        return variable.selected?.value ?? null;
+    }
+    throw new Error('Unsupported variable type for link the value');
+}
 
 export function isLinkToVariable(mapping: EngineToConnectorMapping): mapping is TextEngineToConnectorMapping {
     return typeof mapping.value === 'string' && mapping.value.startsWith('var.');
@@ -100,9 +104,9 @@ export async function getConnectorConfigurationOptions(connectorId: string) {
     const mappingValues = await Promise.all(
         parsedData.map((m) => {
             if (isLinkToVariable(m)) {
-                return window.StudioUISDK.variable.getById(fromLinkToVariableId(m.value)).then((v) => ({
+                return window.StudioUISDK.next.variable.getById(fromLinkToVariableId(m.value)).then((v) => ({
                     name: m.name,
-                    value: (v.parsedData as LinkedVariable).value,
+                    value: readValueFromLinkedVariable(v.parsedData as Variable),
                 }));
             }
             return m;
@@ -112,5 +116,5 @@ export async function getConnectorConfigurationOptions(connectorId: string) {
         // eslint-disable-next-line no-param-reassign
         config[mapping.name] = mapping.value;
         return config;
-    }, {} as Record<string, string | boolean>);
+    }, {} as Record<string, string | boolean | null>);
 }