@controleonline/ui-common 1.2.70 → 1.2.71

package/src/tests/react/utils/shopFranchises.test.js

@@ -5,9 +5,10 @@ jest.mock('@controleonline/ui-common/src/api', () => ({
 }));
 
 const {api} = require('@controleonline/ui-common/src/api');
-const {
-  fetchShopFranchiseDirectory,
-} = require('../../../react/utils/shopFranchises');
+const {
+  fetchAllShopFranchiseDirectory,
+  fetchShopFranchiseDirectory,
+} = require('../../../react/utils/shopFranchises');
 
 const {beforeEach, describe, expect, it} = global;
 
@@ -54,10 +55,10 @@ describe('shopFranchises', () => {
     ]);
   });
 
-  it('keeps authenticated management lookup scoped by company', async () => {
-    api.fetch.mockResolvedValueOnce({
-      member: [
-        {
+  it('keeps authenticated management lookup scoped by company', async () => {
+    api.fetch.mockResolvedValueOnce({
+      member: [
+        {
           id: 22,
           alias: 'Norte',
           address: [{id: 601, nickname: 'Loja Norte'}],
@@ -75,8 +76,74 @@ describe('shopFranchises', () => {
         page: 1,
       },
     });
-    expect(directory[0].shopAddresses).toEqual([
-      {id: 601, nickname: 'Loja Norte'},
-    ]);
-  });
-});
+    expect(directory[0].shopAddresses).toEqual([
+      {id: 601, nickname: 'Loja Norte'},
+    ]);
+  });
+
+  it('loads every page when building the full franchise directory', async () => {
+    api.fetch
+      .mockResolvedValueOnce({
+        member: [
+          {
+            id: 21,
+            alias: 'Centro',
+            shopAddresses: [{id: 501, nickname: 'Loja Centro'}],
+          },
+          {
+            id: 22,
+            alias: 'Norte',
+            shopAddresses: [{id: 601, nickname: 'Loja Norte'}],
+          },
+        ],
+      })
+      .mockResolvedValueOnce({
+        member: [
+          {
+            id: 23,
+            alias: 'Sul',
+            shopAddresses: [{id: 701, nickname: 'Loja Sul'}],
+          },
+        ],
+      });
+
+    const directory = await fetchAllShopFranchiseDirectory({
+      companyId: 10,
+      itemsPerPage: 2,
+    });
+
+    expect(api.fetch).toHaveBeenNthCalledWith(1, 'people', {
+      params: {
+        'link.company': '/people/10',
+        'link.linkType': 'franchisee',
+        itemsPerPage: 2,
+        page: 1,
+      },
+    });
+    expect(api.fetch).toHaveBeenNthCalledWith(2, 'people', {
+      params: {
+        'link.company': '/people/10',
+        'link.linkType': 'franchisee',
+        itemsPerPage: 2,
+        page: 2,
+      },
+    });
+    expect(directory).toEqual([
+      {
+        id: 21,
+        alias: 'Centro',
+        shopAddresses: [{id: 501, nickname: 'Loja Centro'}],
+      },
+      {
+        id: 22,
+        alias: 'Norte',
+        shopAddresses: [{id: 601, nickname: 'Loja Norte'}],
+      },
+      {
+        id: 23,
+        alias: 'Sul',
+        shopAddresses: [{id: 701, nickname: 'Loja Sul'}],
+      },
+    ]);
+  });
+});

package/src/tests/react/utils/translate.test.mjs

@@ -42,7 +42,7 @@ const normalizeId = value =>
     .replace(/\D+/g, '')
     .trim();
 
-const createPendingTranslateStore = ({getItems, save} = {}) => {
+const createPendingTranslateStore = ({getItems, save, resolveQueuedMessages} = {}) => {
   const store = {
     getters: {
       messages: {},
@@ -51,12 +51,17 @@ const createPendingTranslateStore = ({getItems, save} = {}) => {
     actions: {},
   };
 
-  const translateActions = {
-    getItems: getItems || (async () => []),
-    save: save || (async payload => payload),
-    setMessages: nextMessages => {
-      store.getters.messages = nextMessages;
-      return nextMessages;
+  const translateActions = {
+    getItems: getItems || (async () => []),
+    save: save || (async payload => payload),
+    ...(resolveQueuedMessages
+      ? {
+          resolveQueuedMessages,
+        }
+      : {}),
+    setMessages: nextMessages => {
+      store.getters.messages = nextMessages;
+      return nextMessages;
     },
     setPendingMessages: nextMessages => {
       store.getters.pendingMessages = nextMessages;
@@ -229,19 +234,14 @@ test('hydrates the cached translations into the translate store on startup', ()
   );
 });
 
-test('posts missing translations once and keeps the fallback until review', async () => {
-  installLocalStorage();
-
-  const discoveryCalls = [];
-  const saveCalls = [];
-  const translateStore = createPendingTranslateStore({
-    getItems: async params => {
-      discoveryCalls.push(params);
-      return [];
-    },
-    save: async payload => {
-      saveCalls.push(payload);
-      return payload;
+test('posts missing translations once and keeps the fallback until review', async () => {
+  installLocalStorage();
+
+  const saveCalls = [];
+  const translateStore = createPendingTranslateStore({
+    save: async payload => {
+      saveCalls.push(payload);
+      return payload;
     },
   });
   const translate = new Translate(
@@ -257,15 +257,12 @@ test('posts missing translations once and keeps the fallback until review', asyn
 
   assert.equal(firstValue, 'None registered title');
   assert.equal(secondValue, 'None registered title');
-
-  await flushAsync();
-
-  assert.deepEqual(discoveryCalls, [
-    {store: 'contract', 'language.language': 'pt-br', people: '/people/1', page: 1},
-  ]);
-  assert.deepEqual(saveCalls, [{
-    people: '/people/1',
-    language: 'pt-br',
+
+  await flushAsync();
+
+  assert.deepEqual(saveCalls, [{
+    people: '/people/1',
+    language: 'pt-br',
     store: 'contract',
     type: 'empty',
     key: 'none_registered_title',
@@ -275,12 +272,95 @@ test('posts missing translations once and keeps the fallback until review', asyn
   assert.equal(
     translateStore.messages['pt-br'].companies[1].contract.empty.none_registered_title,
     'None registered title',
-  );
-  assert.deepEqual(translateStore.pendingMessages, {});
-});
-
-test('persists missing translations with the normalized configured language', async () => {
-  installLocalStorage({language: 'en_US'});
+  );
+  assert.deepEqual(translateStore.pendingMessages, {});
+});
+
+test('queues missing translations in a single batch resolve request', async () => {
+  installLocalStorage();
+
+  const resolveCalls = [];
+  const translateStore = createPendingTranslateStore({
+    resolveQueuedMessages: async payload => {
+      resolveCalls.push(payload);
+
+      return [
+        {
+          people: '/people/1',
+          language: {
+            id: 1,
+            language: 'pt-br',
+          },
+          store: 'contract',
+          type: 'empty',
+          key: 'none_registered_title',
+          translate: 'Nenhum registro cadastrado',
+          revised: false,
+        },
+        {
+          people: '/people/1',
+          language: {
+            id: 1,
+            language: 'pt-br',
+          },
+          store: 'contract',
+          type: 'empty',
+          key: 'none_registered_subtitle',
+          translate: 'Nenhum subtítulo cadastrado',
+          revised: false,
+        },
+      ];
+    },
+  });
+  const translate = new Translate(
+    [{id: 1}],
+    {id: 1},
+    {id: 1},
+    ['contract'],
+    translateStore,
+  );
+
+  assert.equal(
+    translate.t('contract', 'empty', 'none_registered_title'),
+    'None registered title',
+  );
+  assert.equal(
+    translate.t('contract', 'empty', 'none_registered_subtitle'),
+    'None registered subtitle',
+  );
+  assert.equal(
+    translate.t('contract', 'empty', 'none_registered_title'),
+    'None registered title',
+  );
+
+  await flushAsync();
+
+  assert.deepEqual(resolveCalls, [
+    {
+      people: '/people/1',
+      language: 'pt-br',
+      requests: [
+        {
+          store: 'contract',
+          type: 'empty',
+          keys: ['none_registered_title', 'none_registered_subtitle'],
+        },
+      ],
+    },
+  ]);
+  assert.equal(
+    translateStore.messages['pt-br'].companies[1].contract.empty.none_registered_title,
+    'Nenhum registro cadastrado',
+  );
+  assert.equal(
+    translateStore.messages['pt-br'].companies[1].contract.empty.none_registered_subtitle,
+    'Nenhum subtítulo cadastrado',
+  );
+  assert.deepEqual(translateStore.pendingMessages, {});
+});
+
+test('persists missing translations with the normalized configured language', async () => {
+  installLocalStorage({language: 'en_US'});
 
   const saveCalls = [];
   const translateStore = createPendingTranslateStore({
@@ -312,10 +392,10 @@ test('persists missing translations with the normalized configured language', as
   );
 });
 
-test('loads each requested store only for the current and default companies', async () => {
-  installLocalStorage();
-
-  const calls = [];
+test('loads each requested store only for the current and default companies', async () => {
+  installLocalStorage();
+
+  const calls = [];
   const translate = new Translate(
     [{id: 1}, {id: 5}, {id: 9}],
     {id: 1},
@@ -331,66 +411,50 @@ test('loads each requested store only for the current and default companies', as
 
   await translate.discoveryAll();
 
-  assert.deepEqual(calls, [
-    {store: 'orders', 'language.language': 'pt-br', people: '/people/1', page: 1},
-    {store: 'crm', 'language.language': 'pt-br', people: '/people/1', page: 1},
-    {store: 'orders', 'language.language': 'pt-br', people: '/people/5', page: 1},
-    {store: 'crm', 'language.language': 'pt-br', people: '/people/5', page: 1},
-  ]);
-});
-
-test('removes stale pending entries once a discovered store returns the real translation', async () => {
-  installLocalStorage();
-
-  const translateStore = createPendingTranslateStore({
-    getItems: async params => {
-      if (params.page === 1) {
-        return [
-          {
-            store: 'menu',
-            type: 'menu',
-            key: 'orders',
-            translate: 'Pedidos',
-          },
-        ];
-      }
-
-      return [];
-    },
-  });
-
-  let refreshCalls = 0;
-  global.refreshTranslationsUI = () => {
-    refreshCalls += 1;
-  };
-
-  const translate = new Translate(
-    [{id: 1}],
-    {id: 1},
-    {id: 1},
-    ['orders'],
-    translateStore,
-  );
-
-  translateStore.actions.setPendingMessages({
-    'pt-br': {
-      companies: {
-        1: {
-          menu: {
-            menu: {
-              orders: 'Orders',
-            },
-          },
-        },
-      },
-    },
-  });
-
-  assert.equal(translate.t('menu', 'menu', 'orders'), 'Orders');
-
-  await flushAsync();
-
-  assert.deepEqual(translateStore.pendingMessages, {});
-  assert.equal(refreshCalls, 1);
-  assert.equal(translate.t('menu', 'menu', 'orders'), 'Pedidos');
-});
+  assert.deepEqual(calls, [
+    {store: 'orders', 'language.language': 'pt-br', people: '/people/1', page: 1},
+    {store: 'crm', 'language.language': 'pt-br', people: '/people/1', page: 1},
+    {store: 'orders', 'language.language': 'pt-br', people: '/people/5', page: 1},
+    {store: 'crm', 'language.language': 'pt-br', people: '/people/5', page: 1},
+  ]);
+});
+
+test('reuses cached store buckets without refetching after in-memory discovery is cleared', async () => {
+  installLocalStorage();
+  localStorage.setItem('translates', JSON.stringify({
+    'pt-br': {
+      companies: {
+        1: {
+          contract: {
+            empty: {
+              none_registered_title: 'None registered title',
+            },
+          },
+        },
+      },
+    },
+  }));
+
+  const calls = [];
+  const translateStore = createPendingTranslateStore({
+    getItems: async params => {
+      calls.push(params);
+      return [];
+    },
+  });
+  const translate = new Translate(
+    [{id: 1}],
+    {id: 1},
+    {id: 1},
+    ['contract'],
+    translateStore,
+  );
+
+  translate.discoveredStores.clear();
+
+  assert.equal(translate.t('contract', 'empty', 'none_registered_title'), 'None registered title');
+
+  await flushAsync();
+
+  assert.deepEqual(calls, []);
+});

package/src/utils/formatter.js

@@ -310,6 +310,24 @@ export default class Formatter {
     return `${Formatter.formatDecimal(value, locale, maximumFractionDigits)}%`;
   }
 
+  static formatCount(value, singular, plural = `${singular}s`) {
+    return `${value} ${value === 1 ? singular : plural}`;
+  }
+
+  static formatDateTime(value) {
+    if (!value) return 'sem data';
+
+    const date = new Date(value);
+
+    if (isNaN(date.getTime()))
+      return value;
+
+    return new Intl.DateTimeFormat('pt-BR', {
+      dateStyle: 'medium',
+      timeStyle: 'short',
+    }).format(date);
+  }
+
   static formatSignedInteger(value, locale = 'pt-BR') {
 
     const numericValue = Number(value || 0);

package/src/utils/integrationConfigs.js

@@ -1,79 +1,80 @@
-export const CIELO_CONFIG_KEY = 'CIELO';
-export const NEW_RELIC_CONFIG_KEY = 'NEW_RELIC';
-export const SPOTIFY_CONFIG_KEY = 'SPOTIFY';
-
-export const DEFAULT_CIELO_CONFIG = {
-  ACCESS_TOKEN: '',
-  CLIENT_ID: '',
-  EMAIL: '',
-};
-
-export const DEFAULT_NEW_RELIC_CONFIG = {
-  LICENSE_KEY: '',
-  APPLICATION_ID: '',
-  ACCOUNT_ID: '',
-  TRUST_KEY: '',
-  BEACON: 'bam.nr-data.net',
-  ERROR_BEACON: 'bam.nr-data.net',
-};
-
-export const DEFAULT_SPOTIFY_CONFIG = {
-  CLIENT_ID: '',
-  CLIENT_SECRET: '',
-};
-
-const isConfigMap = value =>
-  value && typeof value === 'object' && !Array.isArray(value);
-
-const parseJsonValue = (value, fallback) => {
-  if (value === null || value === undefined || value === '') {
-    return fallback;
-  }
-
-  if (typeof value === 'string') {
-    try {
-      return JSON.parse(value);
-    } catch {
-      return fallback;
-    }
-  }
-
-  return value;
-};
-
-const normalizeTextValue = value => String(value || '').trim();
-
-export const resolveIntegrationConfig = (configs, configKey, defaults) => {
-  if (!isConfigMap(defaults)) {
-    return {};
-  }
-
-  const rawConfig = isConfigMap(configs)
-    ? parseJsonValue(configs[configKey], {})
-    : {};
-  const source = isConfigMap(rawConfig) ? rawConfig : {};
-
-  return Object.keys(defaults).reduce((accumulator, fieldKey) => {
-    accumulator[fieldKey] = normalizeTextValue(
-      source[fieldKey] !== undefined ? source[fieldKey] : defaults[fieldKey],
-    );
-    return accumulator;
-  }, {});
-};
-
-export const resolveCieloConfig = configs =>
-  resolveIntegrationConfig(configs, CIELO_CONFIG_KEY, DEFAULT_CIELO_CONFIG);
-
-export const resolveNewRelicConfig = configs =>
-  resolveIntegrationConfig(
-    configs,
-    NEW_RELIC_CONFIG_KEY,
-    DEFAULT_NEW_RELIC_CONFIG,
-  );
-
-export const resolveSpotifyConfig = configs =>
-  resolveIntegrationConfig(
-    configs,
-    SPOTIFY_CONFIG_KEY,
-    DEFAULT_SPOTIFY_CONFIG,
-  );
+export const CIELO_CONFIG_KEY = 'CIELO';
+export const NEW_RELIC_CONFIG_KEY = 'NEW_RELIC';
+export const SPOTIFY_CONFIG_KEY = 'SPOTIFY';
+
+export const DEFAULT_CIELO_CONFIG = {
+  ACCESS_TOKEN: '',
+  CLIENT_ID: '',
+  EMAIL: '',
+  MERCHANT_CODE: '',
+};
+
+export const DEFAULT_NEW_RELIC_CONFIG = {
+  LICENSE_KEY: '',
+  APPLICATION_ID: '',
+  ACCOUNT_ID: '',
+  TRUST_KEY: '',
+  BEACON: 'bam.nr-data.net',
+  ERROR_BEACON: 'bam.nr-data.net',
+};
+
+export const DEFAULT_SPOTIFY_CONFIG = {
+  CLIENT_ID: '',
+  CLIENT_SECRET: '',
+};
+
+const isConfigMap = value =>
+  value && typeof value === 'object' && !Array.isArray(value);
+
+const parseJsonValue = (value, fallback) => {
+  if (value === null || value === undefined || value === '') {
+    return fallback;
+  }
+
+  if (typeof value === 'string') {
+    try {
+      return JSON.parse(value);
+    } catch {
+      return fallback;
+    }
+  }
+
+  return value;
+};
+
+const normalizeTextValue = value => String(value || '').trim();
+
+export const resolveIntegrationConfig = (configs, configKey, defaults) => {
+  if (!isConfigMap(defaults)) {
+    return {};
+  }
+
+  const rawConfig = isConfigMap(configs)
+    ? parseJsonValue(configs[configKey], {})
+    : {};
+  const source = isConfigMap(rawConfig) ? rawConfig : {};
+
+  return Object.keys(defaults).reduce((accumulator, fieldKey) => {
+    accumulator[fieldKey] = normalizeTextValue(
+      source[fieldKey] !== undefined ? source[fieldKey] : defaults[fieldKey],
+    );
+    return accumulator;
+  }, {});
+};
+
+export const resolveCieloConfig = configs =>
+  resolveIntegrationConfig(configs, CIELO_CONFIG_KEY, DEFAULT_CIELO_CONFIG);
+
+export const resolveNewRelicConfig = configs =>
+  resolveIntegrationConfig(
+    configs,
+    NEW_RELIC_CONFIG_KEY,
+    DEFAULT_NEW_RELIC_CONFIG,
+  );
+
+export const resolveSpotifyConfig = configs =>
+  resolveIntegrationConfig(
+    configs,
+    SPOTIFY_CONFIG_KEY,
+    DEFAULT_SPOTIFY_CONFIG,
+  );