Merge pull request #2681 from trycompai/tofik/cherrypick-gws-userfilter-fix

fix(gws): coerce target_org_units to array in check-user-filter

Author: tofikwest

packages/integration-platform/src/manifests/google-workspace/__tests__/check-user-filter.test.ts

@@ -36,6 +36,21 @@ describe('parseGoogleWorkspaceCheckUserFilter', () => {
     expect(config.userFilterMode).toBe('exclude');
     expect(config.includeSuspended).toBe(false);
   });
+
+  it('coerces a string target_org_units into an array', () => {
+    const config = parseGoogleWorkspaceCheckUserFilter({
+      target_org_units: '/Staff' as unknown as string[],
+      include_suspended: 'false',
+    });
+    expect(config.targetOrgUnits).toEqual(['/Staff']);
+  });
+
+  it('returns undefined for missing target_org_units', () => {
+    const config = parseGoogleWorkspaceCheckUserFilter({
+      include_suspended: 'false',
+    });
+    expect(config.targetOrgUnits).toBeUndefined();
+  });
 });
 
 describe('shouldIncludeGoogleWorkspaceUserForCheck', () => {

packages/integration-platform/src/manifests/google-workspace/check-user-filter.ts

@@ -21,7 +21,11 @@ export function parseGoogleWorkspaceCheckUserFilter(
   variables: CheckVariableValues,
 ): GoogleWorkspaceCheckUserFilterConfig {
   return {
-    targetOrgUnits: variables.target_org_units as string[] | undefined,
+    targetOrgUnits: Array.isArray(variables.target_org_units)
+      ? variables.target_org_units
+      : typeof variables.target_org_units === 'string'
+        ? [variables.target_org_units]
+        : undefined,
     excludedTerms: parseSyncFilterTerms(
       variables.sync_excluded_emails ?? variables.excluded_emails,
     ),