@controleonline/ui-common 1.2.98 → 1.2.100

package/src/react/pages/Devices/deviceTypes/DeviceGroupCard.js

@@ -24,7 +24,7 @@ import {
   parseConfigsObject,
   tt,
 } from './deviceListHelpers';
-import styles from '../../Devices.styles';
+import legacyStyles from '../../Devices.styles';
 
 /**
  * Normalize DefaultTable card `item` into a device group shape.
@@ -65,6 +65,7 @@ const normalizeDeviceGroup = item => {
 export default function DeviceGroupCard({
   item,
   brandColors,
+  themedStyles = null,
   creatingPdv,
   goToDetail,
   handleCreateCurrentPdv,
@@ -74,6 +75,7 @@ export default function DeviceGroupCard({
   runtimeDeviceType,
   showCurrentPdvSetup,
 }) {
+        const styles = themedStyles || legacyStyles;
         const deviceGroup = normalizeDeviceGroup(item);
         if (!deviceGroup) {
           return null;
@@ -116,7 +118,7 @@ export default function DeviceGroupCard({
             deviceGroup.device?.id ||
             deviceGroup.key,
         );
-        const accent = getDeviceTypeAccent(normalizedType);
+        const accent = brandColors.deviceAccent || getDeviceTypeAccent(normalizedType);
         const metaChips = [];
 
         if (isPdv && primaryConfig) {
@@ -196,7 +198,7 @@ export default function DeviceGroupCard({
                 <View style={styles.deviceConfigRow}>
                   {deviceConfigs.map(deviceConfig => {
                     const configType = getDeviceConfigType(deviceConfig);
-                    const configAccent = getDeviceTypeAccent(configType);
+                    const configAccent = brandColors.deviceAccent || getDeviceTypeAccent(configType);
                     const isSessionConfig =
                       isCurrentDevice &&
                       runtimeDeviceType &&
@@ -297,5 +299,5 @@ export default function DeviceGroupCard({
             </View>
           </View>
         );
-      
+
 }

package/src/react/pages/Devices/deviceTypes/shared.js

@@ -36,7 +36,7 @@ import {
   prioritizeCurrentDeviceGroups,
   readStoredRuntimeDevice,
 } from '../currentDevice';
-import styles from '../../Devices.styles';
+import legacyStyles, {createStyles} from '../../Devices.styles';
 import DeviceGroupCard from './DeviceGroupCard';
 import {useDeviceNetworkConnectivity} from './useDeviceNetworkConnectivity';
 import {
@@ -89,7 +89,7 @@ export const createDeviceTypeTab = ({
   clientFilter = null,
   offerCurrentPdvSetup = false,
 }) => {
-  const DeviceTypeTab = () => {
+  const DeviceTypeTab = ({themePalette = null} = {}) => {
     const navigation = useNavigation();
     const peopleStore = useStore('people');
     const deviceStore = useStore('device');
@@ -101,13 +101,15 @@ export const createDeviceTypeTab = ({
 
     const brandColors = useMemo(
       () =>
-        resolveThemePalette(
+        themePalette || resolveThemePalette(
           {...themeColors, ...(currentCompany?.theme?.colors || {})},
           colors,
         ),
-      [themeColors, currentCompany?.id],
+      [themePalette, themeColors, currentCompany?.id],
     );
 
+    const styles = useMemo(() => themePalette ? createStyles(brandColors) : legacyStyles, [themePalette, brandColors]);
+
     const [deviceConfigs, setDeviceConfigs] = useState([]);
     const [loading, setLoading] = useState(false);
     const [refreshing, setRefreshing] = useState(false);
@@ -372,6 +374,7 @@ export const createDeviceTypeTab = ({
         <DeviceGroupCard
           {...cardProps}
           brandColors={brandColors}
+          themedStyles={themePalette ? styles : null}
           creatingPdv={creatingPdv}
           goToDetail={goToDetail}
           handleCreateCurrentPdv={handleCreateCurrentPdv}
@@ -384,6 +387,8 @@ export const createDeviceTypeTab = ({
       ),
       [
         brandColors,
+        styles,
+        themePalette,
         creatingPdv,
         goToDetail,
         handleCreateCurrentPdv,

package/src/react/pages/Devices.js

@@ -1,183 +1,184 @@
-import React, {useEffect, useMemo, useState} from 'react';
-import {Text, TouchableOpacity, View} from 'react-native';
-import {SafeAreaView} from 'react-native-safe-area-context';
-import {useNavigation} from '@react-navigation/native';
-import {useStore} from '@store';
-import {resolveThemePalette} from '@controleonline/../../src/styles/branding';
-import {colors} from '@controleonline/../../src/styles/colors';
-import CompactFilterSelector from '@controleonline/ui-default/src/react/components/filters/CompactFilterSelector';
-import {PDV_DEVICE_TYPE} from '@controleonline/ui-common/src/react/utils/printerDevices';
-import Icon from 'react-native-vector-icons/Feather';
-import {
-  ALL_DEVICE_FILTER,
-  getDeviceCreationAction,
-  getDeviceFilterAccent,
-  getDeviceFilterDefinition,
-  getDeviceFilterIcon,
-  getDeviceFilterOptions,
-  getPdvSubfilterOptions,
-  hasRegisteredDeviceFilter,
-  isPdvSubfilter,
-} from './Devices/deviceTypes';
-import { createStyles } from './Devices.styles';
-
-const tt = (type, key) => global.t?.t('configs', type, key);
-
-const Devices = () => {
-  const navigation = useNavigation();
-  const peopleStore = useStore('people');
-  const themeStore = useStore('theme');
-
-  const {currentCompany} = peopleStore.getters;
-  const {colors: themeColors} = themeStore.getters;
-
-  const [activeFilter, setActiveFilter] = useState(ALL_DEVICE_FILTER);
-
-  const brandColors = useMemo(
-    () =>
-      resolveThemePalette(
-        {...themeColors, ...(currentCompany?.theme?.colors || {})},
-        colors,
-      ),
-    [themeColors, currentCompany?.id],
-  );
-  const styles = useMemo(() => createStyles(brandColors), [brandColors]);
-  const accentPalette = useMemo(
-    () => ({
-      primary: brandColors.info,
-      success: brandColors.success,
-      danger: brandColors.error,
-      warning: brandColors.warning,
-    }),
-    [brandColors.error, brandColors.info, brandColors.success, brandColors.warning],
-  );
-
-  const filterOptions = useMemo(() => getDeviceFilterOptions(), []);
-  const pdvSubfilterOptions = useMemo(() => getPdvSubfilterOptions(), []);
-  const activeFilterDefinition = useMemo(
-    () => getDeviceFilterDefinition(activeFilter),
-    [activeFilter],
-  );
-  const topLevelActiveFilter = useMemo(
-    () => (isPdvSubfilter(activeFilter) ? PDV_DEVICE_TYPE : activeFilter),
-    [activeFilter],
-  );
-  const activeFilterAction = useMemo(
-    () => getDeviceCreationAction(topLevelActiveFilter),
-    [topLevelActiveFilter],
-  );
-  const deviceTypeSelectorOptions = useMemo(
-    () => filterOptions.map(option => ({
-      key: option.key,
-      label: option.label,
-    })),
-    [filterOptions],
-  );
-  const pdvGatewaySelectorOptions = useMemo(
-    () => [
-      {key: PDV_DEVICE_TYPE, label: tt('device_filter', 'all') || 'Todos'},
-      ...pdvSubfilterOptions.map(option => ({
-        key: option.key,
-        label: option.label,
-      })),
-    ],
-    [pdvSubfilterOptions],
-  );
-  const selectedDeviceTypeLabel = useMemo(
-    () =>
-      deviceTypeSelectorOptions.find(option => option.key === topLevelActiveFilter)?.label ||
-      tt('device_filter', 'allTypes') ||
-      'Todos os tipos',
-    [deviceTypeSelectorOptions, topLevelActiveFilter],
-  );
-  const selectedPdvGatewayLabel = useMemo(
-    () =>
-      pdvGatewaySelectorOptions.find(option => option.key === activeFilter)?.label ||
-      tt('device_filter', 'all') ||
-      'Todos',
-    [activeFilter, pdvGatewaySelectorOptions],
-  );
-  const ActiveTabComponent = activeFilterDefinition.TabComponent;
-
-  useEffect(() => {
-    if (!hasRegisteredDeviceFilter(activeFilter)) {
-      setActiveFilter(ALL_DEVICE_FILTER);
-    }
-  }, [activeFilter]);
-
-  return (
-    <SafeAreaView
-      style={[styles.container, {backgroundColor: brandColors.background}]}>
-      <View style={styles.filtersBlock}>
-        <Text style={styles.filtersLabel}>{tt('device_filter', 'filterByType') || 'Filtrar por tipo'}</Text>
-        <CompactFilterSelector
-          icon={getDeviceFilterIcon(topLevelActiveFilter)}
-          label={selectedDeviceTypeLabel}
-          title={tt('device_filter', 'filterByType') || 'Filtrar por tipo'}
-          accentColor={getDeviceFilterAccent(topLevelActiveFilter, {
-            brandColors,
-            hex: accentPalette,
-          })}
-          active={topLevelActiveFilter !== ALL_DEVICE_FILTER}
-          options={deviceTypeSelectorOptions}
-          selectedKey={topLevelActiveFilter}
-          onSelect={optionKey => {
-            setActiveFilter(optionKey);
-            return true;
-          }}
-        />
-      </View>
-
-      {topLevelActiveFilter === PDV_DEVICE_TYPE && pdvSubfilterOptions.length > 0 ? (
-        <View style={styles.filtersBlock}>
-          <Text style={styles.filtersLabel}>{tt('device_filter', 'pdvGateway') || 'Gateway do PDV'}</Text>
-          <CompactFilterSelector
-            icon={getDeviceFilterIcon(activeFilter)}
-            label={selectedPdvGatewayLabel}
-            title={tt('device_filter', 'pdvGateway') || 'Gateway do PDV'}
-            accentColor={getDeviceFilterAccent(activeFilter, {
-              brandColors,
-              hex: accentPalette,
-            })}
-            active={activeFilter !== PDV_DEVICE_TYPE}
-            options={pdvGatewaySelectorOptions}
-            selectedKey={activeFilter}
-            onSelect={optionKey => {
-              setActiveFilter(optionKey);
-              return true;
-            }}
-          />
-        </View>
-      ) : null}
-
-      {activeFilterAction ? (
-        <View style={styles.printerActionBlock}>
-          <TouchableOpacity
-            style={[
-              styles.createPrinterBtn,
-              {backgroundColor: brandColors.primary},
-            ]}
-            activeOpacity={0.86}
-            onPress={() => navigation.navigate(activeFilterAction.routeName)}>
-            <Icon name="plus-circle" size={16} color={brandColors.white} />
-            <Text style={styles.createPrinterBtnText}>
-              {activeFilterAction.label}
-            </Text>
-          </TouchableOpacity>
-
-          <Text style={styles.helperText}>
-            {activeFilterAction.helperText}
-          </Text>
-        </View>
-      ) : null}
-
-      {ActiveTabComponent ? (
-        <ActiveTabComponent
-          key={`${activeFilter}-${currentCompany?.id || 'company'}`}
-        />
-      ) : null}
-    </SafeAreaView>
-  );
-};
-
-export default Devices;
+import React, {useEffect, useMemo, useState} from 'react';
+import {Text, TouchableOpacity, View} from 'react-native';
+import {SafeAreaView} from 'react-native-safe-area-context';
+import {useNavigation} from '@react-navigation/native';
+import {useStore} from '@store';
+import {resolveThemePalette} from '@controleonline/../../src/styles/branding';
+import {colors} from '@controleonline/../../src/styles/colors';
+import CompactFilterSelector from '@controleonline/ui-default/src/react/components/filters/CompactFilterSelector';
+import {PDV_DEVICE_TYPE} from '@controleonline/ui-common/src/react/utils/printerDevices';
+import Icon from 'react-native-vector-icons/Feather';
+import {
+  ALL_DEVICE_FILTER,
+  getDeviceCreationAction,
+  getDeviceFilterAccent,
+  getDeviceFilterDefinition,
+  getDeviceFilterIcon,
+  getDeviceFilterOptions,
+  getPdvSubfilterOptions,
+  hasRegisteredDeviceFilter,
+  isPdvSubfilter,
+} from './Devices/deviceTypes';
+import { createStyles } from './Devices.styles';
+
+const tt = (type, key) => global.t?.t('configs', type, key);
+
+const Devices = ({themePalette = null} = {}) => {
+  const navigation = useNavigation();
+  const peopleStore = useStore('people');
+  const themeStore = useStore('theme');
+
+  const {currentCompany} = peopleStore.getters;
+  const {colors: themeColors} = themeStore.getters;
+
+  const [activeFilter, setActiveFilter] = useState(ALL_DEVICE_FILTER);
+
+  const brandColors = useMemo(
+    () =>
+      themePalette || resolveThemePalette(
+        {...themeColors, ...(currentCompany?.theme?.colors || {})},
+        colors,
+      ),
+    [themePalette, themeColors, currentCompany?.id],
+  );
+  const styles = useMemo(() => createStyles(brandColors), [brandColors]);
+  const accentPalette = useMemo(
+    () => ({
+      primary: brandColors.info,
+      success: brandColors.success,
+      danger: brandColors.error,
+      warning: brandColors.warning,
+    }),
+    [brandColors.error, brandColors.info, brandColors.success, brandColors.warning],
+  );
+
+  const filterOptions = useMemo(() => getDeviceFilterOptions(), []);
+  const pdvSubfilterOptions = useMemo(() => getPdvSubfilterOptions(), []);
+  const activeFilterDefinition = useMemo(
+    () => getDeviceFilterDefinition(activeFilter),
+    [activeFilter],
+  );
+  const topLevelActiveFilter = useMemo(
+    () => (isPdvSubfilter(activeFilter) ? PDV_DEVICE_TYPE : activeFilter),
+    [activeFilter],
+  );
+  const activeFilterAction = useMemo(
+    () => getDeviceCreationAction(topLevelActiveFilter),
+    [topLevelActiveFilter],
+  );
+  const deviceTypeSelectorOptions = useMemo(
+    () => filterOptions.map(option => ({
+      key: option.key,
+      label: option.label,
+    })),
+    [filterOptions],
+  );
+  const pdvGatewaySelectorOptions = useMemo(
+    () => [
+      {key: PDV_DEVICE_TYPE, label: tt('device_filter', 'all') || 'Todos'},
+      ...pdvSubfilterOptions.map(option => ({
+        key: option.key,
+        label: option.label,
+      })),
+    ],
+    [pdvSubfilterOptions],
+  );
+  const selectedDeviceTypeLabel = useMemo(
+    () =>
+      deviceTypeSelectorOptions.find(option => option.key === topLevelActiveFilter)?.label ||
+      tt('device_filter', 'allTypes') ||
+      'Todos os tipos',
+    [deviceTypeSelectorOptions, topLevelActiveFilter],
+  );
+  const selectedPdvGatewayLabel = useMemo(
+    () =>
+      pdvGatewaySelectorOptions.find(option => option.key === activeFilter)?.label ||
+      tt('device_filter', 'all') ||
+      'Todos',
+    [activeFilter, pdvGatewaySelectorOptions],
+  );
+  const ActiveTabComponent = activeFilterDefinition.TabComponent;
+
+  useEffect(() => {
+    if (!hasRegisteredDeviceFilter(activeFilter)) {
+      setActiveFilter(ALL_DEVICE_FILTER);
+    }
+  }, [activeFilter]);
+
+  return (
+    <SafeAreaView
+      style={[styles.container, {backgroundColor: brandColors.background}]}>
+      <View style={styles.filtersBlock}>
+        <Text style={styles.filtersLabel}>{tt('device_filter', 'filterByType') || 'Filtrar por tipo'}</Text>
+        <CompactFilterSelector
+          icon={getDeviceFilterIcon(topLevelActiveFilter)}
+          label={selectedDeviceTypeLabel}
+          title={tt('device_filter', 'filterByType') || 'Filtrar por tipo'}
+          accentColor={getDeviceFilterAccent(topLevelActiveFilter, {
+            brandColors,
+            hex: accentPalette,
+          })}
+          active={topLevelActiveFilter !== ALL_DEVICE_FILTER}
+          options={deviceTypeSelectorOptions}
+          selectedKey={topLevelActiveFilter}
+          onSelect={optionKey => {
+            setActiveFilter(optionKey);
+            return true;
+          }}
+        />
+      </View>
+
+      {topLevelActiveFilter === PDV_DEVICE_TYPE && pdvSubfilterOptions.length > 0 ? (
+        <View style={styles.filtersBlock}>
+          <Text style={styles.filtersLabel}>{tt('device_filter', 'pdvGateway') || 'Gateway do PDV'}</Text>
+          <CompactFilterSelector
+            icon={getDeviceFilterIcon(activeFilter)}
+            label={selectedPdvGatewayLabel}
+            title={tt('device_filter', 'pdvGateway') || 'Gateway do PDV'}
+            accentColor={getDeviceFilterAccent(activeFilter, {
+              brandColors,
+              hex: accentPalette,
+            })}
+            active={activeFilter !== PDV_DEVICE_TYPE}
+            options={pdvGatewaySelectorOptions}
+            selectedKey={activeFilter}
+            onSelect={optionKey => {
+              setActiveFilter(optionKey);
+              return true;
+            }}
+          />
+        </View>
+      ) : null}
+
+      {activeFilterAction ? (
+        <View style={styles.printerActionBlock}>
+          <TouchableOpacity
+            style={[
+              styles.createPrinterBtn,
+              {backgroundColor: brandColors.primary},
+            ]}
+            activeOpacity={0.86}
+            onPress={() => navigation.navigate(activeFilterAction.routeName)}>
+            <Icon name="plus-circle" size={16} color={brandColors.white} />
+            <Text style={styles.createPrinterBtnText}>
+              {activeFilterAction.label}
+            </Text>
+          </TouchableOpacity>
+
+          <Text style={styles.helperText}>
+            {activeFilterAction.helperText}
+          </Text>
+        </View>
+      ) : null}
+
+      {ActiveTabComponent ? (
+        <ActiveTabComponent
+          themePalette={themePalette}
+          key={`${activeFilter}-${currentCompany?.id || 'company'}`}
+        />
+      ) : null}
+    </SafeAreaView>
+  );
+};
+
+export default Devices;

package/src/react/pages/IntegrationConfigPage.js

@@ -14,6 +14,7 @@ import { fetchPeopleConfigs } from './fetchPeopleConfigs';
 import IntegrationConfigFields from './IntegrationConfigFields';
 import {
   ROUTE_PROVIDER_MAP,
+  expandBundledConfig,
   extractAuthorizationUrl,
   formatApiError,
   formatUberOAuthError,
@@ -112,6 +113,8 @@ export default function IntegrationConfigPage({ route, embedded = false, fiscalT
   const allFieldKeysSig = useMemo(() => allFieldKeys.join('|'), [allFieldKeys]);
   // Pure config providers (e.g. receita-federal) do not use marketplace/integrations.
   const needsMarketplaceIntegration = Boolean(providerConfig?.oauthConnect);
+  const bundleKey = normalizeTextValue(providerConfig?.bundleKey);
+  const configVisibility = normalizeTextValue(providerConfig?.visibility) || 'public';
 
   useEffect(() => {
     setConfigValues({});
@@ -135,14 +138,28 @@ export default function IntegrationConfigPage({ route, embedded = false, fiscalT
     }
     if (showLoading) setLoading(true);
     try {
-      const keys = allFieldKeys.length
-        ? allFieldKeys
-        : visibleFields.map(field => field.key).filter(Boolean);
-
-      if (keys.length) {
-        const configItems = await fetchPeopleConfigs({ peopleIri: providerIri, configKeys: keys });
+      if (bundleKey) {
+        const configItems = await fetchPeopleConfigs({
+          peopleIri: providerIri,
+          configKeys: [bundleKey],
+        });
+        const bundled = configItems.find(
+          item => String(item?.configKey || '').trim() === bundleKey,
+        );
         const mergeFields = allConfigFields.length ? allConfigFields : visibleFields;
-        setConfigValues(current => mergeTabValues(mergeFields, configItems, current));
+        setConfigValues(current =>
+          expandBundledConfig(mergeFields, bundled?.configValue, current),
+        );
+      } else {
+        const keys = allFieldKeys.length
+          ? allFieldKeys
+          : visibleFields.map(field => field.key).filter(Boolean);
+
+        if (keys.length) {
+          const configItems = await fetchPeopleConfigs({ peopleIri: providerIri, configKeys: keys });
+          const mergeFields = allConfigFields.length ? allConfigFields : visibleFields;
+          setConfigValues(current => mergeTabValues(mergeFields, configItems, current));
+        }
       }
 
       if (needsMarketplaceIntegration) {
@@ -170,6 +187,7 @@ export default function IntegrationConfigPage({ route, embedded = false, fiscalT
     allConfigFields,
     allFieldKeys,
     allFieldKeysSig,
+    bundleKey,
     needsMarketplaceIntegration,
     providerConfig,
     providerIri,
@@ -246,16 +264,44 @@ export default function IntegrationConfigPage({ route, embedded = false, fiscalT
       showError('Nao foi possivel identificar a integracao selecionada.');
       return;
     }
-    const configs = visibleFields.map(field => ({
-      configKey: field.key,
-      configValue: toConfigRequestValue(normalizeTextValue(configValues[field.key])),
-    }));
+
+    let configs;
+    if (bundleKey) {
+      const payloadObject = {};
+      (visibleFields || []).forEach(field => {
+        payloadObject[field.key] = normalizeTextValue(configValues[field.key]);
+      });
+      configs = [
+        {
+          configKey: bundleKey,
+          configValue: toConfigRequestValue(payloadObject),
+        },
+      ];
+    } else {
+      configs = visibleFields.map(field => ({
+        configKey: field.key,
+        configValue: toConfigRequestValue(normalizeTextValue(configValues[field.key])),
+      }));
+    }
+
     try {
-      await persistConfigs({ configs, people: providerIri, module: 4, visibility: 'public' });
+      await persistConfigs({ configs, people: providerIri, module: 4, visibility: configVisibility });
       showSuccess(`${activeTabDef?.label || providerConfig.label} salvo com sucesso.`);
       await loadPageData({ showLoading: false });
     } catch (error) { showError(error?.message || 'Nao foi possivel salvar a integracao.'); }
-  }, [activeTabDef, configValues, loadPageData, persistConfigs, providerConfig, providerIri, showError, showSuccess, visibleFields]);
+  }, [
+    activeTabDef,
+    bundleKey,
+    configValues,
+    configVisibility,
+    loadPageData,
+    persistConfigs,
+    providerConfig,
+    providerIri,
+    showError,
+    showSuccess,
+    visibleFields,
+  ]);
 
   if (!providerConfig) return <CenterState icon="alert-triangle" iconColor="#e67e22" title="Integracao indisponivel" text="A tela solicitada nao possui configuracao cadastrada." />;
   if (!providerId) return <CenterState icon="building" iconColor="#94A3B8" title="Empresa nao identificada" text="Abra a ficha da empresa para gravar as configuracoes fiscais nela." />;

package/src/react/pages/IntegrationConfigPage.utils.js

@@ -5,6 +5,7 @@ export const ROUTE_PROVIDER_MAP = {
   AsaasIntegrationPage: 'asaas',
   ClickSignIntegrationPage: 'clicksign',
   ReceitaFederalIntegrationPage: 'receita-federal',
+  SemPararIntegrationPage: 'sem-parar',
 };
 
 export const routeNameToPath = routeName =>
@@ -53,6 +54,22 @@ export const mergeTabValues = (fields, source, current = {}) => {
   return next;
 };
 
+/** Expand a single JSON config (bundleKey) into flat field values. */
+export const expandBundledConfig = (fields, rawValue, current = {}) => {
+  let parsed = rawValue;
+  if (typeof rawValue === 'string') {
+    try {
+      parsed = JSON.parse(rawValue);
+    } catch {
+      parsed = {};
+    }
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    parsed = {};
+  }
+  return mergeTabValues(fields, parsed, current);
+};
+
 export const buildFieldValues = (providerConfig, source) =>
   mergeTabValues(getConfigFields(providerConfig), source, {});