fix: Fix Enable / Disable Locale matching logic. (#1318)

streetsidesoftware · Sep 18, 2021 · b745e39 · b745e39
1 parent b288758
commit b745e39
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 16 deletions.
diff --git a/packages/client/src/client/server/serverSettings.ts b/packages/client/src/client/server/serverSettings.ts
@@ -70,7 +70,7 @@ export function normalizeLocale(locale: string | string[] = ''): string {
 
 export function normalizeToLocales(locale: string = ''): string[] {
     return locale
-        .replace(/[|;]/g, ',')
+        .replace(/[|;\s]/g, ',')
         .replace(/[*]/g, '')
         .split(',')
         .map(normalizeCode)

diff --git a/packages/client/src/settings/settings.test.ts b/packages/client/src/settings/settings.test.ts
@@ -1,7 +1,28 @@
-import { hasWorkspaceLocation } from './settings';
+import { hasWorkspaceLocation, addLocaleToCurrentLocale, removeLocaleFromCurrentLocale } from './settings';
 
 describe('Validate settings.ts', () => {
     test('hasWorkspaceLocation', () => {
         expect(hasWorkspaceLocation()).toBe(false);
     });
+
+    test.each`
+        locale              | current | expected
+        ${'en'}             | ${'en'} | ${'en'}
+        ${'nl_nl'}          | ${'en'} | ${'en,nl-NL'}
+        ${'nl,nl_nl,nl-Nl'} | ${'en'} | ${'en,nl,nl-NL'}
+    `('addLocaleToCurrentLocale $locale + $current => $expected', ({ locale, current, expected }) => {
+        expect(addLocaleToCurrentLocale(locale, current)).toBe(expected);
+    });
+
+    test.each`
+        locale        | current       | expected
+        ${'en'}       | ${'en'}       | ${undefined}
+        ${'nl_nl'}    | ${'en'}       | ${'en'}
+        ${'nl_nl'}    | ${'en,nl-NL'} | ${'en'}
+        ${'nl,nl_nl'} | ${'en,nl'}    | ${'en'}
+        ${'en;nl_nl'} | ${'en,nl'}    | ${'nl'}
+        ${'en;nl_nl'} | ${'en, nl'}   | ${'nl'}
+    `('removeLocaleFromCurrentLocale $current - $locale => $expected', ({ locale, current, expected }) => {
+        expect(removeLocaleFromCurrentLocale(locale, current)).toBe(expected);
+    });
 });
diff --git a/packages/client/src/settings/settings.ts b/packages/client/src/settings/settings.ts
@@ -154,20 +154,8 @@ export function disableLocale(targets: ClientConfigTarget[], locale: string): Pr
 
 export function enableLocaleForTarget(locale: string, enable: boolean, targets: ClientConfigTarget[]): Promise<void> {
     const applyFn: (src: string | undefined) => string | undefined = enable
-        ? (currentLanguage) =>
-              unique(
-                  normalizeLocale(currentLanguage || 'en')
-                      .split(',')
-                      .concat(locale.split(','))
-              )
-                  .filter((a) => !!a)
-                  .join(',')
-        : (currentLanguage) => {
-              const value = unique(normalizeLocale(currentLanguage).split(','))
-                  .filter((lang) => lang !== locale)
-                  .join(',');
-              return value || undefined;
-          };
+        ? (currentLanguage) => addLocaleToCurrentLocale(locale, currentLanguage)
+        : (currentLanguage) => removeLocaleFromCurrentLocale(locale, currentLanguage);
     return setConfigFieldQuickPick(targets, 'language', applyFn);
 }
 
@@ -263,3 +251,27 @@ export async function createConfigFileRelativeToDocumentUri(referenceDocUri?: Ur
     await createConfigFile(configFile, overwrite);
     return configFile;
 }
+
+function normalize(locale: string) {
+    return normalizeLocale(locale)
+        .split(',')
+        .filter((a) => !!a);
+}
+
+export function addLocaleToCurrentLocale(locale: string, currentLocale: string | undefined): string | undefined {
+    const toAdd = normalize(locale);
+    const currentSet = new Set(normalize(currentLocale || ''));
+
+    toAdd.forEach((locale) => currentSet.add(locale));
+
+    return [...currentSet].join(',') || undefined;
+}
+
+export function removeLocaleFromCurrentLocale(locale: string, currentLocale: string | undefined): string | undefined {
+    const toRemove = normalize(locale);
+    const currentSet = new Set(normalize(currentLocale || ''));
+
+    toRemove.forEach((locale) => currentSet.delete(locale));
+
+    return [...currentSet].join(',') || undefined;
+}