@controleonline/ui-common 1.2.79 → 1.2.81

package/src/react/utils/runtimeFooter.js

@@ -1,6 +1,10 @@
 import { getDeviceTypeLabel } from '@controleonline/ui-common/src/react/utils/printerDevices';
 
 const DEVICE_RUNTIME_FOOTER_TEXT_CONFIG_KEY = 'device-runtime-footer-text';
+const RUNTIME_FOOTER_HIDDEN_ROUTES = new Set(['PaylistPage']);
+
+const shouldShowRuntimeFooter = currentRouteName =>
+  !RUNTIME_FOOTER_HIDDEN_ROUTES.has(String(currentRouteName || '').trim());
 
 const safeTrim = value => String(value || '').trim();
 
@@ -489,5 +493,6 @@ module.exports = {
   getRuntimeFooterWebIdentifierCandidates,
   getRuntimeFooterText,
   getRuntimeFooterWebHost,
-  normalizeRuntimeFooterText,
+  normalizeRuntimeFooterText,
+  shouldShowRuntimeFooter,
 };

package/src/react/utils/shopFranchises.js

@@ -1,10 +1,10 @@
-import {api} from '@controleonline/ui-common/src/api';
-import {
-  extractCollectionItems,
-  toEntityIri,
-} from '@controleonline/ui-common/src/react/utils/commercialDocumentOrders';
+import {api} from '@controleonline/ui-common/src/api';
+import {
+  extractCollectionItems,
+  toEntityIri,
+} from '@controleonline/ui-common/src/react/utils/commercialDocumentOrders';
 import {normalizeShopEntityId} from '@controleonline/ui-common/src/react/utils/shopConfig';
-
+
 export const SHOP_FRANCHISE_LINK_TYPE = 'franchisee';
 export const SHOP_FRANCHISE_PAGE_SIZE = 50;
 
@@ -150,39 +150,113 @@ export const filterShopFranchiseDirectory = ({
     })
     .filter(Boolean);
 };
-
-export const resolveFranchiseCompanyLabel = company =>
-  String(company?.alias || company?.name || '').trim() ||
-  `Franquia #${normalizeShopEntityId(company) || ''}`.trim();
-
-export const fetchShopFranchiseCompanies = async ({
+
+export const resolveFranchiseCompanyLabel = company =>
+  String(company?.alias || company?.name || '').trim() ||
+  `Franquia #${normalizeShopEntityId(company) || ''}`.trim();
+
+/**
+ * Resolve the franchise company entity from a people_link relative to the
+ * viewed franchisor/company id. DB rows may store the viewed company as
+ * `company` or as `people` (inverted association).
+ */
+export const extractFranchiseCompanyFromLink = (link, viewerCompanyId) => {
+  const viewerId = normalizeShopEntityId(viewerCompanyId);
+  const companySide = link?.company;
+  const peopleSide = link?.people;
+  const companyId = normalizeShopEntityId(companySide);
+  const peopleId = normalizeShopEntityId(peopleSide);
+
+  if (viewerId && companyId === viewerId) {
+    return peopleSide;
+  }
+  if (viewerId && peopleId === viewerId) {
+    return companySide;
+  }
+  // Fallback: franchisee is typically the `people` side of linkType=franchisee.
+  return peopleSide || companySide || null;
+};
+
+const fetchFranchiseLinksPage = async ({
   companyId,
-  search = '',
+  side,
   page = 1,
   itemsPerPage = SHOP_FRANCHISE_PAGE_SIZE,
-  publicDirectory = false,
-} = {}) => {
+  search = '',
+}) => {
+  const id = normalizeShopEntityId(companyId);
+  if (!id) {
+    return [];
+  }
+
   const params = {
     page: Math.max(1, Number(page) || 1),
     itemsPerPage: normalizeItemsPerPage(itemsPerPage),
+    linkType: SHOP_FRANCHISE_LINK_TYPE,
+    [side]: toEntityIri(id, 'people'),
   };
 
   if (String(search || '').trim()) {
     params.search = String(search).trim();
   }
 
-  const response = publicDirectory
-    ? await api.fetch('/shop/franchises', {params})
-    : await api.fetch('people', {
-        params: {
-          ...params,
-          'link.company': toEntityIri(companyId, 'people'),
-          'link.linkType': SHOP_FRANCHISE_LINK_TYPE,
-        },
+  const response = await api.fetch('people_links', {params});
+  return extractCollectionItems(response);
+};
+
+/**
+ * Authenticated franchise directory via people_links (both sides).
+ * GET /people?link.company=… does not reliably return franchisee PJs.
+ */
+const fetchFranchiseCompaniesFromLinks = async ({
+  companyId,
+  search = '',
+  itemsPerPage = SHOP_FRANCHISE_PAGE_SIZE,
+} = {}) => {
+  const viewerId = normalizeShopEntityId(companyId);
+  if (!viewerId) {
+    return [];
+  }
+
+  const pageSize = normalizeItemsPerPage(itemsPerPage);
+  const byId = new Map();
+
+  for (const side of ['company', 'people']) {
+    let page = 1;
+    while (true) {
+      const links = await fetchFranchiseLinksPage({
+        companyId: viewerId,
+        side,
+        page,
+        itemsPerPage: pageSize,
+        search,
+      });
+      const pageLinks = Array.isArray(links) ? links : [];
+
+      pageLinks.forEach(link => {
+        const franchise = extractFranchiseCompanyFromLink(link, viewerId);
+        const franchiseId = normalizeShopEntityId(franchise);
+        if (!franchiseId || franchiseId === viewerId) {
+          return;
+        }
+        if (!byId.has(franchiseId)) {
+          byId.set(
+            franchiseId,
+            typeof franchise === 'object' && franchise
+              ? franchise
+              : {id: franchiseId},
+          );
+        }
       });
-  const items = extractCollectionItems(response);
 
-  return items
+      if (pageLinks.length < pageSize) {
+        break;
+      }
+      page += 1;
+    }
+  }
+
+  return Array.from(byId.values())
     .map(normalizeFranchiseDirectoryItem)
     .sort((left, right) =>
       sortByLabel(
@@ -192,67 +266,113 @@ export const fetchShopFranchiseCompanies = async ({
     );
 };
 
-export const fetchAllShopFranchiseDirectory = async ({
+export const fetchShopFranchiseCompanies = async ({
   companyId,
-  publicDirectory = false,
   search = '',
+  page = 1,
   itemsPerPage = SHOP_FRANCHISE_PAGE_SIZE,
+  publicDirectory = false,
 } = {}) => {
-  const normalizedItemsPerPage = normalizeItemsPerPage(itemsPerPage);
-  const items = [];
-  let page = 1;
-
-  while (true) {
-    const pageItems = await fetchShopFranchiseCompanies({
-      companyId,
-      publicDirectory,
-      search,
-      page,
-      itemsPerPage: normalizedItemsPerPage,
-    });
-    const normalizedPageItems = Array.isArray(pageItems) ? pageItems : [];
+  const params = {
+    page: Math.max(1, Number(page) || 1),
+    itemsPerPage: normalizeItemsPerPage(itemsPerPage),
+  };
 
-    items.push(...normalizedPageItems);
+  if (String(search || '').trim()) {
+    params.search = String(search).trim();
+  }
+
+  if (publicDirectory) {
+    const response = await api.fetch('/shop/franchises', {params});
+    const items = extractCollectionItems(response);
+    return items
+      .map(normalizeFranchiseDirectoryItem)
+      .sort((left, right) =>
+        sortByLabel(
+          resolveFranchiseCompanyLabel(left),
+          resolveFranchiseCompanyLabel(right),
+        ),
+      );
+  }
+
+  // Management path: people_links dual-side (company + people).
+  // Page param is ignored for dual aggregation; callers that need full list
+  // should use fetchAllShopFranchiseDirectory.
+  const all = await fetchFranchiseCompaniesFromLinks({
+    companyId,
+    search,
+    itemsPerPage,
+  });
+  const start = (Math.max(1, Number(page) || 1) - 1) * normalizeItemsPerPage(itemsPerPage);
+  return all.slice(start, start + normalizeItemsPerPage(itemsPerPage));
+};
 
-    if (normalizedPageItems.length < normalizedItemsPerPage) {
-      break;
+export const fetchAllShopFranchiseDirectory = async ({
+  companyId,
+  publicDirectory = false,
+  search = '',
+  itemsPerPage = SHOP_FRANCHISE_PAGE_SIZE,
+} = {}) => {
+  if (publicDirectory) {
+    const normalizedItemsPerPage = normalizeItemsPerPage(itemsPerPage);
+    const items = [];
+    let page = 1;
+
+    while (true) {
+      const pageItems = await fetchShopFranchiseCompanies({
+        companyId,
+        publicDirectory: true,
+        search,
+        page,
+        itemsPerPage: normalizedItemsPerPage,
+      });
+      const normalizedPageItems = Array.isArray(pageItems) ? pageItems : [];
+      items.push(...normalizedPageItems);
+      if (normalizedPageItems.length < normalizedItemsPerPage) {
+        break;
+      }
+      page += 1;
     }
 
-    page += 1;
+    return items
+      .map(normalizeFranchiseDirectoryItem)
+      .sort((left, right) =>
+        sortByLabel(
+          resolveFranchiseCompanyLabel(left),
+          resolveFranchiseCompanyLabel(right),
+        ),
+      );
   }
 
-  return items
-    .map(normalizeFranchiseDirectoryItem)
-    .sort((left, right) =>
-      sortByLabel(
-        resolveFranchiseCompanyLabel(left),
-        resolveFranchiseCompanyLabel(right),
-      ),
-    );
+  return fetchFranchiseCompaniesFromLinks({
+    companyId,
+    search,
+    itemsPerPage,
+  });
 };
 
 export const fetchShopFranchiseAddresses = async ({
   peopleId,
   search = '',
 } = {}) => {
-  if (!peopleId) {
-    return [];
-  }
-
+  if (!peopleId) {
+    return [];
+  }
+
   const params = {
     people: toEntityIri(peopleId, 'people'),
     itemsPerPage: SHOP_FRANCHISE_PAGE_SIZE,
     page: 1,
   };
-
-  if (String(search || '').trim()) {
-    params.search = String(search).trim();
-  }
-
-  const response = await api.fetch('addresses', {params});
-  return extractCollectionItems(response);
-};
-
+
+  if (String(search || '').trim()) {
+    params.search = String(search).trim();
+  }
+
+  const response = await api.fetch('addresses', {params});
+  return extractCollectionItems(response);
+};
+
 export const fetchShopFranchiseDirectory = async ({
   companyId,
   publicDirectory = false,
@@ -270,4 +390,5 @@ export const fetchShopFranchiseDirectory = async ({
 
   return companies.map(normalizeFranchiseDirectoryItem);
 };
+
 // TODO(store-first): quando este arquivo for mexido, mover a leitura para stores, remover api.fetch e evitar repassar dados em objetos quando o store ja resolver isso.

package/src/react/utils/systemErrorMessage.js

@@ -1,67 +1,71 @@
-const normalizeText = value => String(value || '').trim()
-
-const resolveMessageList = items =>
-  (Array.isArray(items) ? items : [])
-    .map(item =>
-      normalizeText(
-        item?.['hydra:description'] ||
-          item?.['hydra:title'] ||
-          item?.message ||
-          item?.title ||
-          item?.detail ||
-          item?.description ||
-          item,
-      ),
-    )
-    .filter(Boolean)
-    .join('\n')
-    .trim()
-
-export const resolveSystemErrorMessage = error => {
-  if (error === undefined || error === null) {
-    return ''
-  }
-
-  if (typeof error === 'string') {
-    return error.trim()
-  }
-
-  if (Array.isArray(error)) {
-    return resolveMessageList(error)
-  }
-
-  if (Array.isArray(error?.message)) {
-    return resolveMessageList(error.message)
-  }
-
-  if (Array.isArray(error?.violations)) {
-    return resolveMessageList(error.violations)
-  }
-
-  if (error?.response?.data) {
-    const responseMessage = resolveSystemErrorMessage(error.response.data)
-    if (responseMessage) {
-      return responseMessage
-    }
-  }
-
-  if (error?.body) {
-    const bodyMessage = resolveSystemErrorMessage(error.body)
-    if (bodyMessage) {
-      return bodyMessage
-    }
-  }
-
-  return normalizeText(
-    error?.['hydra:description'] ||
-      error?.['hydra:title'] ||
-      error?.detail ||
-      error?.description ||
-      error?.errmsg ||
-      error?.error ||
-      error?.message ||
-      error?.title,
-  )
-}
-
-export default resolveSystemErrorMessage
+import { mapPasswordErrorMessage } from './passwordPolicy'
+
+const normalizeText = value => String(value || '').trim()
+
+const resolveMessageList = items =>
+  (Array.isArray(items) ? items : [])
+    .map(item =>
+      normalizeText(
+        item?.['hydra:description'] ||
+          item?.['hydra:title'] ||
+          item?.message ||
+          item?.title ||
+          item?.detail ||
+          item?.description ||
+          item,
+      ),
+    )
+    .filter(Boolean)
+    .join('\n')
+    .trim()
+
+export const resolveSystemErrorMessage = error => {
+  if (error === undefined || error === null) {
+    return ''
+  }
+
+  if (typeof error === 'string') {
+    return mapPasswordErrorMessage(error.trim())
+  }
+
+  if (Array.isArray(error)) {
+    return mapPasswordErrorMessage(resolveMessageList(error))
+  }
+
+  if (Array.isArray(error?.message)) {
+    return mapPasswordErrorMessage(resolveMessageList(error.message))
+  }
+
+  if (Array.isArray(error?.violations)) {
+    return mapPasswordErrorMessage(resolveMessageList(error.violations))
+  }
+
+  if (error?.response?.data) {
+    const responseMessage = resolveSystemErrorMessage(error.response.data)
+    if (responseMessage) {
+      return responseMessage
+    }
+  }
+
+  if (error?.body) {
+    const bodyMessage = resolveSystemErrorMessage(error.body)
+    if (bodyMessage) {
+      return bodyMessage
+    }
+  }
+
+  return mapPasswordErrorMessage(
+    normalizeText(
+      error?.['hydra:description'] ||
+        error?.['hydra:title'] ||
+        error?.detail ||
+        error?.description ||
+        error?.errmsg ||
+        error?.error ||
+        error?.message ||
+        error?.title,
+    ),
+  )
+}
+
+export default resolveSystemErrorMessage

package/src/store/device_config/customActions.js

@@ -2,6 +2,9 @@ import {api} from '@controleonline/ui-common/src/api';
 import * as types from '@controleonline/ui-default/src/store/default/mutation_types';
 import {isWebRuntimeDevice} from '@controleonline/ui-common/src/react/utils/deviceRuntime';
 
+/** Max age for company device_configs cache used by print routing (ms). */
+export const COMPANY_DEVICE_CONFIGS_CACHE_TTL_MS = 30 * 1000;
+
 const normalizePeopleKey = value =>
   String(value || '')
     .replace(/\D+/g, '')
@@ -34,16 +37,84 @@ const getStoredDevice = () => {
   return {};
 };
 
+const resolveConfigId = config => {
+  if (!config) {
+    return '';
+  }
+  if (config.id != null && String(config.id).trim() !== '') {
+    return String(config.id).trim();
+  }
+  const iri = String(config['@id'] || '').trim();
+  if (!iri) {
+    return '';
+  }
+  const parts = iri.split('/');
+  return String(parts[parts.length - 1] || '').trim();
+};
+
+/**
+ * Merge a saved device_config into the company list and clear loadedKey so the
+ * next ensureCompanyDeviceConfigsLoaded can refresh (print routing picks up
+ * manager/destination changes without app rebuild).
+ */
+const mergeSavedConfigIntoCompanyItems = (commit, getters, saved) => {
+  if (!saved) {
+    return;
+  }
+
+  const currentItems = Array.isArray(getters.items) ? getters.items : [];
+  const savedId = resolveConfigId(saved);
+  const savedDeviceId = String(
+    saved?.device?.device || saved?.device?.id || saved?.device || '',
+  ).trim();
+  const savedType = String(saved?.type || '').trim().toUpperCase();
+
+  let replaced = false;
+  const nextItems = currentItems.map(item => {
+    const itemId = resolveConfigId(item);
+    if (savedId && itemId && savedId === itemId) {
+      replaced = true;
+      return {...item, ...saved};
+    }
+
+    const itemDeviceId = String(
+      item?.device?.device || item?.device?.id || item?.device || '',
+    ).trim();
+    const itemType = String(item?.type || '').trim().toUpperCase();
+    if (
+      savedDeviceId &&
+      itemDeviceId &&
+      savedDeviceId === itemDeviceId &&
+      savedType &&
+      itemType === savedType
+    ) {
+      replaced = true;
+      return {...item, ...saved};
+    }
+
+    return item;
+  });
+
+  if (!replaced && savedId) {
+    nextItems.push(saved);
+  }
+
+  commit(types.SET_ITEMS, nextItems);
+  // Force next ensure to re-fetch when TTL allows (other runtimes still refresh via TTL).
+  commit(types.SET_LOADED_KEY, '');
+  commit(types.SET_LOADED_AT, 0);
+};
+
 export const addDeviceConfigs = ({commit, getters}, params) => {
   let configsObj = {};
   if (params.configs) {
     if (typeof params.configs === 'string') {
       try {
         configsObj = JSON.parse(params.configs);
-      } catch (e) {
-        configsObj = {};
-      }
-    } else if (typeof params.configs === 'object') {
+      } catch (e) {
+        configsObj = {};
+      }
+    } else if (typeof params.configs === 'object') {
       configsObj = params.configs;
     }
   }
@@ -82,30 +153,31 @@ export const addDeviceConfigs = ({commit, getters}, params) => {
   if (isRuntimeWebDevice) {
     commit(types.SET_ITEM, nextItem);
     if (!canPersistRuntimeWebDevice) {
+      mergeSavedConfigIntoCompanyItems(commit, getters, nextItem);
       return Promise.resolve(nextItem);
     }
   }
 
   let options = {
     method: 'POST',
-    body: updatedParams,
-  };
-  commit(types.SET_ISSAVING, true);
-
-  return api
+    body: updatedParams,
+  };
+  commit(types.SET_ISSAVING, true);
+
+  return api
     .fetch(getters.resourceEndpoint + '/add-configs', options)
     .then(data => {
       let parsedConfigs = {};
-      if (data?.configs) {
-        if (typeof data.configs === 'string') {
-          try {
-            parsedConfigs = JSON.parse(data.configs);
-          } catch (e) {
-            parsedConfigs = {};
-          }
-        } else if (typeof data.configs === 'object') {
-          parsedConfigs = data.configs;
-        }
+      if (data?.configs) {
+        if (typeof data.configs === 'string') {
+          try {
+            parsedConfigs = JSON.parse(data.configs);
+          } catch (e) {
+            parsedConfigs = {};
+          }
+        } else if (typeof data.configs === 'object') {
+          parsedConfigs = data.configs;
+        }
       }
       const hasParsedConfigs =
         parsedConfigs && Object.keys(parsedConfigs).length > 0;
@@ -118,15 +190,22 @@ export const addDeviceConfigs = ({commit, getters}, params) => {
           : nextItem.configs || getters.item?.configs || {},
       };
       commit(types.SET_ITEM, d);
+      mergeSavedConfigIntoCompanyItems(commit, getters, d);
       return d;
     })
-    .catch(e => {
-      console.error('addDeviceConfigs API error:', e);
-      commit(types.SET_ERROR, e.message);
-      throw e;
-    })
-    .finally(() => {
-      commit(types.SET_ISSAVING, false);
+    .catch(e => {
+      const status = Number(e?.status || e?.code || e?.response?.status || 0);
+      // 403 is expected for non-tenant-admin users during runtime bootstrap.
+      if (status === 403) {
+        console.debug('addDeviceConfigs skipped (no tenant admin authority):', e?.message || e);
+      } else {
+        console.error('addDeviceConfigs API error:', e);
+      }
+      commit(types.SET_ERROR, e.message);
+      throw e;
+    })
+    .finally(() => {
+      commit(types.SET_ISSAVING, false);
     });
 };
 
@@ -174,10 +253,16 @@ export const ensureCompanyDeviceConfigsLoaded = (context, params = {}) => {
     return Promise.resolve([]);
   }
 
-  if (
+  const force = params?.force === true;
+  const loadedAt = Number(context.getters.loadedAt) || 0;
+  const cacheAgeMs = loadedAt > 0 ? Date.now() - loadedAt : Number.POSITIVE_INFINITY;
+  const cacheFresh =
+    !force &&
     context.getters.loadedKey === peopleKey &&
-    Array.isArray(context.getters.items)
-  ) {
+    Array.isArray(context.getters.items) &&
+    cacheAgeMs < COMPANY_DEVICE_CONFIGS_CACHE_TTL_MS;
+
+  if (cacheFresh) {
     return Promise.resolve(context.getters.items);
   }
 
@@ -187,4 +272,8 @@ export const ensureCompanyDeviceConfigsLoaded = (context, params = {}) => {
 
   return getCompanyDeviceConfigs(context, params);
 };
-
+
+export const invalidateCompanyDeviceConfigsCache = ({commit}) => {
+  commit(types.SET_LOADED_KEY, '');
+  commit(types.SET_LOADED_AT, 0);
+};