@controleonline/ui-common 1.2.87 → 1.2.88

package/src/react/utils/storeColumns.js

@@ -1,117 +1,117 @@
-import { getAllStores } from '@store';
-import { formatHumanLabel } from '@controleonline/ui-common/src/react/utils/entityDisplay';
-
-const normalizeText = value => String(value || '').trim();
-
-const singularizeResourceName = resourceName => {
-  const normalized = normalizeText(resourceName).replace(/^\/+|\/+$/g, '');
-  if (!normalized) {
-    return '';
-  }
-
-  if (normalized.endsWith('ies')) {
-    return `${normalized.slice(0, -3)}y`;
-  }
-
-  if (normalized.endsWith('sses') || normalized.endsWith('ses')) {
-    return normalized.slice(0, -2);
-  }
-
-  if (normalized.endsWith('s') && !normalized.endsWith('ss')) {
-    return normalized.slice(0, -1);
-  }
-
-  return normalized;
-};
-
-const normalizeKey = value =>
-  normalizeText(value)
-    .replace(/[^a-zA-Z0-9]/g, '')
-    .toLowerCase();
-
-const extractEntityResource = entityIri => {
-  const normalizedIri = normalizeText(entityIri);
-  if (!normalizedIri) {
-    return '';
-  }
-
-  const segments = normalizedIri.split('/').filter(Boolean);
-  if (segments.length < 2) {
-    return '';
-  }
-
-  return normalizeText(segments[segments.length - 2]);
-};
-
-const getStoreColumns = store => {
-  const columns = store?.getters?.columns || store?.columns;
-  return Array.isArray(columns) ? columns.filter(Boolean) : [];
-};
-
-const getStoreEndpoint = store =>
-  normalizeText(store?.getters?.resourceEndpoint || store?.resourceEndpoint).replace(
-    /^\/+|\/+$/g,
-    '',
-  );
-
-const normalizeComparableValue = value => {
-  if (value === null || value === undefined || value === '') {
-    return '';
-  }
-
-  if (typeof value === 'object' && !Array.isArray(value)) {
-    return normalizeComparableValue(
-      value?.value ?? value?.['@id'] ?? value?.id ?? value?.label ?? '',
-    );
-  }
-
-  return normalizeText(value);
-};
-
-const buildRowContext = (row, fieldName, value) => {
-  if (!fieldName) {
-    return row || {};
-  }
-
-  if (!row || typeof row !== 'object' || Array.isArray(row)) {
-    return {[fieldName]: value};
-  }
-
-  return {
-    ...row,
-    [fieldName]: value,
-  };
-};
-
-const resolveListValue = ({column, value, row}) => {
-  if (!Array.isArray(column?.list) || !column.list.length) {
-    return value;
-  }
-
-  const comparableValue = normalizeComparableValue(value);
-  const matchedItem = column.list.find(item => {
-    const currentValue =
-      item?.value ?? item?.['@id'] ?? item?.id ?? item?.label ?? item;
-
-    return normalizeComparableValue(currentValue) === comparableValue;
-  });
-
-  if (!matchedItem) {
-    return value;
-  }
-
-  if (typeof column.formatList === 'function') {
-    const formattedItem = column.formatList(matchedItem, column, row);
-    if (formattedItem && typeof formattedItem === 'object' && !Array.isArray(formattedItem)) {
-      return formattedItem?.label ?? formattedItem?.value ?? matchedItem?.label ?? value;
-    }
-
-    return formattedItem;
-  }
-
-  return matchedItem?.label ?? value;
-};
-
+import { getAllStores } from '@store';
+import { formatHumanLabel } from '@controleonline/ui-common/src/react/utils/entityDisplay';
+
+const normalizeText = value => String(value || '').trim();
+
+const singularizeResourceName = resourceName => {
+  const normalized = normalizeText(resourceName).replace(/^\/+|\/+$/g, '');
+  if (!normalized) {
+    return '';
+  }
+
+  if (normalized.endsWith('ies')) {
+    return `${normalized.slice(0, -3)}y`;
+  }
+
+  if (normalized.endsWith('sses') || normalized.endsWith('ses')) {
+    return normalized.slice(0, -2);
+  }
+
+  if (normalized.endsWith('s') && !normalized.endsWith('ss')) {
+    return normalized.slice(0, -1);
+  }
+
+  return normalized;
+};
+
+const normalizeKey = value =>
+  normalizeText(value)
+    .replace(/[^a-zA-Z0-9]/g, '')
+    .toLowerCase();
+
+const extractEntityResource = entityIri => {
+  const normalizedIri = normalizeText(entityIri);
+  if (!normalizedIri) {
+    return '';
+  }
+
+  const segments = normalizedIri.split('/').filter(Boolean);
+  if (segments.length < 2) {
+    return '';
+  }
+
+  return normalizeText(segments[segments.length - 2]);
+};
+
+const getStoreColumns = store => {
+  const columns = store?.getters?.columns || store?.columns;
+  return Array.isArray(columns) ? columns.filter(Boolean) : [];
+};
+
+const getStoreEndpoint = store =>
+  normalizeText(store?.getters?.resourceEndpoint || store?.resourceEndpoint).replace(
+    /^\/+|\/+$/g,
+    '',
+  );
+
+const normalizeComparableValue = value => {
+  if (value === null || value === undefined || value === '') {
+    return '';
+  }
+
+  if (typeof value === 'object' && !Array.isArray(value)) {
+    return normalizeComparableValue(
+      value?.value ?? value?.['@id'] ?? value?.id ?? value?.label ?? '',
+    );
+  }
+
+  return normalizeText(value);
+};
+
+const buildRowContext = (row, fieldName, value) => {
+  if (!fieldName) {
+    return row || {};
+  }
+
+  if (!row || typeof row !== 'object' || Array.isArray(row)) {
+    return {[fieldName]: value};
+  }
+
+  return {
+    ...row,
+    [fieldName]: value,
+  };
+};
+
+const resolveListValue = ({column, value, row}) => {
+  if (!Array.isArray(column?.list) || !column.list.length) {
+    return value;
+  }
+
+  const comparableValue = normalizeComparableValue(value);
+  const matchedItem = column.list.find(item => {
+    const currentValue =
+      item?.value ?? item?.['@id'] ?? item?.id ?? item?.label ?? item;
+
+    return normalizeComparableValue(currentValue) === comparableValue;
+  });
+
+  if (!matchedItem) {
+    return value;
+  }
+
+  if (typeof column.formatList === 'function') {
+    const formattedItem = column.formatList(matchedItem, column, row);
+    if (formattedItem && typeof formattedItem === 'object' && !Array.isArray(formattedItem)) {
+      return formattedItem?.label ?? formattedItem?.value ?? matchedItem?.label ?? value;
+    }
+
+    return formattedItem;
+  }
+
+  return matchedItem?.label ?? value;
+};
+
 const normalizeFormattedValue = value => {
   if (value === null || value === undefined) {
     return value;
@@ -130,6 +130,9 @@ const normalizeFormattedValue = value => {
       value?.value ??
       value?.name ??
       value?.alias ??
+      value?.status ??
+      value?.realStatus ??
+      value?.real_status ??
       value?.icon ??
       value?.fileName ??
       value?.filename ??
@@ -176,17 +179,32 @@ const shouldTranslateColumnValue = ({column, storeName, value}) => {
   return candidates.some(candidate => DEFAULT_TRANSLATABLE_FIELDS.has(candidate));
 };
 
+const STATUS_DISPLAY_PT = {
+  paid: 'Pago',
+};
+
 const translateColumnValue = ({column, storeName, value}) => {
+  const statusFallback = STATUS_DISPLAY_PT[normalizeText(value).toLowerCase()];
+
   if (!shouldTranslateColumnValue({column, storeName, value})) {
-    return value;
+    return statusFallback || value;
   }
 
   const translateFn =
-    typeof globalThis !== 'undefined' && typeof globalThis?.t?.t === 'function'
-      ? globalThis.t.t.bind(globalThis.t)
-      : null;
+    typeof globalThis !== 'undefined' && typeof globalThis?.t?.t === 'function'
+      ? globalThis.t.t.bind(globalThis.t)
+      : null;
+
+  const translated = translateFn ? translateFn(storeName, 'span', value) : value;
+  if (
+    statusFallback &&
+    (!normalizeText(translated) ||
+      normalizeText(translated).toLowerCase() === normalizeText(value).toLowerCase())
+  ) {
+    return statusFallback;
+  }
 
-  return translateFn ? translateFn(storeName, 'span', value) : value;
+  return translated;
 };
 
 const translateColumnLabel = ({column, fieldName, storeName, fallbackLabel = ''}) => {
@@ -308,30 +326,30 @@ export const resolveStoreConfigByEntity = ({entity = null, entityIri = ''} = {})
       storeName: '',
     };
   }
-
-  const normalizedResourceName = singularizeResourceName(resourceName);
-  const stores = getAllStores();
-
-  const candidates = Object.entries(stores || {})
-    .map(([storeName, store]) => {
-      const resourceEndpoint = getStoreEndpoint(store);
-      const normalizedEndpoint = singularizeResourceName(resourceEndpoint);
-      const columns = getStoreColumns(store);
-
-      if (
-        !resourceEndpoint ||
-        (resourceEndpoint !== resourceName && normalizedEndpoint !== normalizedResourceName)
-      ) {
-        return null;
-      }
-
-      let score = 0;
-      if (resourceEndpoint === resourceName) score += 4;
-      if (storeName === resourceName) score += 3;
-      if (storeName === normalizedResourceName) score += 2;
-      if (resourceEndpoint === storeName) score += 1;
-      if (columns.length) score += 1;
-
+
+  const normalizedResourceName = singularizeResourceName(resourceName);
+  const stores = getAllStores();
+
+  const candidates = Object.entries(stores || {})
+    .map(([storeName, store]) => {
+      const resourceEndpoint = getStoreEndpoint(store);
+      const normalizedEndpoint = singularizeResourceName(resourceEndpoint);
+      const columns = getStoreColumns(store);
+
+      if (
+        !resourceEndpoint ||
+        (resourceEndpoint !== resourceName && normalizedEndpoint !== normalizedResourceName)
+      ) {
+        return null;
+      }
+
+      let score = 0;
+      if (resourceEndpoint === resourceName) score += 4;
+      if (storeName === resourceName) score += 3;
+      if (storeName === normalizedResourceName) score += 2;
+      if (resourceEndpoint === storeName) score += 1;
+      if (columns.length) score += 1;
+
       return {
         columns,
         resourceEndpoint,
@@ -340,16 +358,16 @@ export const resolveStoreConfigByEntity = ({entity = null, entityIri = ''} = {})
         store,
         storeName,
       };
-    })
-    .filter(Boolean)
-    .sort((left, right) => {
-      if (right.score !== left.score) {
-        return right.score - left.score;
-      }
-
-      return right.columns.length - left.columns.length;
-    });
-
+    })
+    .filter(Boolean)
+    .sort((left, right) => {
+      if (right.score !== left.score) {
+        return right.score - left.score;
+      }
+
+      return right.columns.length - left.columns.length;
+    });
+
   return candidates[0] || {
     columns: [],
     resourceEndpoint: '',
@@ -358,38 +376,38 @@ export const resolveStoreConfigByEntity = ({entity = null, entityIri = ''} = {})
     storeName: '',
   };
 };
-
-export const resolveStoreColumn = (columns = [], fieldName = '') => {
-  const normalizedFieldName = normalizeKey(fieldName);
-  if (!normalizedFieldName) {
-    return null;
-  }
-
-  return columns.find(column => {
-    const candidateNames = [
-      column?.key,
-      column?.name,
-      column?.label,
-    ]
-      .map(normalizeKey)
-      .filter(Boolean);
-
-    return candidateNames.includes(normalizedFieldName);
-  }) || null;
-};
-
+
+export const resolveStoreColumn = (columns = [], fieldName = '') => {
+  const normalizedFieldName = normalizeKey(fieldName);
+  if (!normalizedFieldName) {
+    return null;
+  }
+
+  return columns.find(column => {
+    const candidateNames = [
+      column?.key,
+      column?.name,
+      column?.label,
+    ]
+      .map(normalizeKey)
+      .filter(Boolean);
+
+    return candidateNames.includes(normalizedFieldName);
+  }) || null;
+};
+
 export const formatStoreColumnLabel = ({
   columns = [],
   fieldName = '',
   fallbackLabel = '',
   storeName = '',
-} = {}) => {
-  const column = resolveStoreColumn(columns, fieldName);
-  if (!column?.label) {
-    return fallbackLabel;
-  }
-
-  const normalizedLabel = normalizeText(column.label);
+} = {}) => {
+  const column = resolveStoreColumn(columns, fieldName);
+  if (!column?.label) {
+    return fallbackLabel;
+  }
+
+  const normalizedLabel = normalizeText(column.label);
   if (!normalizedLabel) {
     return fallbackLabel;
   }
@@ -407,40 +425,40 @@ export const formatStoreColumnLabel = ({
   const resolvedLabel = translateColumnValue({
     column,
     storeName,
-    value: normalizedLabel,
-  });
-
-  return formatHumanLabel(resolvedLabel) || resolvedLabel;
-};
-
-// Replica a logica central de columns do store para usos fora das listagens padrao.
-export const formatStoreColumnValue = ({
-  columns = [],
-  fieldName = '',
-  row = null,
-  storeName = '',
-  value,
-} = {}) => {
-  const column = resolveStoreColumn(columns, fieldName);
-  if (!column) {
-    return undefined;
-  }
-
-  const rowContext = buildRowContext(row, fieldName, value);
-  const resolvedValue = resolveListValue({
-    column,
-    row: rowContext,
-    value,
-  });
-
-  let formattedValue = resolvedValue;
-  if (typeof column.format === 'function') {
-    formattedValue = column.format(resolvedValue, column, rowContext, false);
-  }
-
-  return translateColumnValue({
-    column,
-    storeName,
-    value: normalizeFormattedValue(formattedValue),
-  });
-};
+    value: normalizedLabel,
+  });
+
+  return formatHumanLabel(resolvedLabel) || resolvedLabel;
+};
+
+// Replica a logica central de columns do store para usos fora das listagens padrao.
+export const formatStoreColumnValue = ({
+  columns = [],
+  fieldName = '',
+  row = null,
+  storeName = '',
+  value,
+} = {}) => {
+  const column = resolveStoreColumn(columns, fieldName);
+  if (!column) {
+    return undefined;
+  }
+
+  const rowContext = buildRowContext(row, fieldName, value);
+  const resolvedValue = resolveListValue({
+    column,
+    row: rowContext,
+    value,
+  });
+
+  let formattedValue = resolvedValue;
+  if (typeof column.format === 'function') {
+    formattedValue = column.format(resolvedValue, column, rowContext, false);
+  }
+
+  return translateColumnValue({
+    column,
+    storeName,
+    value: normalizeFormattedValue(formattedValue),
+  });
+};

package/src/react/utils/systemErrorMessage.js

@@ -19,7 +19,7 @@ const resolveMessageList = items =>
     .join('\n')
     .trim()
 
-export const resolveSystemErrorMessage = error => {
+const resolveSystemErrorMessage = error => {
   if (error === undefined || error === null) {
     return ''
   }
@@ -68,4 +68,5 @@ export const resolveSystemErrorMessage = error => {
   )
 }
 
+export { resolveSystemErrorMessage }
 export default resolveSystemErrorMessage

package/src/store/integration/index.js

@@ -0,0 +1,43 @@
+import * as actions from '@controleonline/ui-default/src/store/default/actions';
+import * as getters from '@controleonline/ui-default/src/store/default/getters';
+import mutations from '@controleonline/ui-default/src/store/default/mutations';
+
+export default {
+  namespaced: true,
+  state: {
+    item: null,
+    items: [],
+    resourceEndpoint: 'integrations',
+    isLoading: false,
+    error: '',
+    totalItems: 0,
+    summary: {},
+    filters: {},
+    reload: false,
+    add: false,
+    columns: [
+      {name: 'id', label: 'ID', isIdentity: true, editable: false, externalFilter: true},
+      {name: 'queueName', label: 'Fila', editable: false, externalFilter: false},
+      {
+        name: 'status',
+        label: 'Status',
+        editable: false,
+        externalFilter: true,
+        list: 'status/getItems',
+        listRequestParams: {context: 'integration'},
+        searchParam: 'status',
+        format: value => (value?.status || value?.realStatus || '-'),
+        formatList: value => (value && value['@id'] ? {value: value['@id'].split('/').pop(), label: value.status || value.realStatus || value['@id']} : value),
+        saveFormat: value => (value ? `/statuses/${value.value || value}` : null),
+      },
+      {name: 'retry', label: 'Tentativas', type: 'number', editable: false, externalFilter: true},
+      {name: 'body', label: 'Payload', editable: false, externalFilter: false},
+    ],
+    configs: {
+      showRowActions: true,
+    },
+  },
+  actions,
+  getters,
+  mutations,
+};

package/src/tests/browser/manager/device-detail-apply-config-defined.spec.js

@@ -0,0 +1,31 @@
+/**
+ * Static smoke: DeviceDetail loader declares applyCurrentDeviceConfig + useFocusEffect.
+ * fluxo: device-configuracao
+ * Refs: app-community#706
+ */
+const fs = require('fs');
+const path = require('path');
+const {expect, test} = require('playwright/test');
+
+const FLOW_ID = 'device-configuracao';
+const loaderPath = path.resolve(
+  __dirname,
+  '../../../react/pages/Devices/detail/useDeviceDetailLoaders.js',
+);
+const stateAPath = path.resolve(
+  __dirname,
+  '../../../react/pages/Devices/detail/useDeviceDetailStateA.js',
+);
+
+test('device-configuracao #706 loader refs are declared', async () => {
+  const loader = fs.readFileSync(loaderPath, 'utf8');
+  const stateA = fs.readFileSync(stateAPath, 'utf8');
+  expect(loader).toContain('useFocusEffect');
+  expect(loader).toContain('const applyCurrentDeviceConfig = useCallback');
+  expect(loader).toContain('currentCompany');
+  expect(loader).toContain('displayStore');
+  expect(loader).toContain('printerStore');
+  expect(stateA).toMatch(/displayStore,/);
+  expect(stateA).toMatch(/printerStore,/);
+  expect(FLOW_ID).toBe('device-configuracao');
+});