datastake-daf 0.6.789 → 0.6.791

package/dist/components/index.js

@@ -9558,24 +9558,29 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
+const renderFieldData = function (type, value, user, config) {
+  let getApiBaseUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
+  let getAppHeader = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : () => {};
+  let app = arguments.length > 6 ? arguments[6] : undefined;
+  let allValues = arguments.length > 7 ? arguments[7] : undefined;
+  let formValues = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {};
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
+        const language = user !== null && user !== void 0 && user.language && (user === null || user === void 0 ? void 0 : user.language) === 'sp' ? 'es' : user === null || user === void 0 ? void 0 : user.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9590,7 +9595,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
+      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9604,7 +9609,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues?.map(item => item?.name).join(', ');
+        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
         return documentName;
       }
     default:
@@ -9732,18 +9737,19 @@ const resolveDynamicLabel = (labelConfig, item, defaultLabel) => {
   return labelConfig || defaultLabel;
 };
 
-const handleSectionChildren = ({
-  config,
-  allData,
-  level,
-  t,
-  rootForm,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
+const handleSectionChildren = _ref => {
+  let {
+    config,
+    allData,
+    level,
+    t,
+    rootForm,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
   if (!(level === 0 && config && typeof config === 'object')) {
     return null;
   }
@@ -9757,14 +9763,14 @@ const handleSectionChildren = ({
     let fieldValue;
 
     // Determine field value based on type
-    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData?.[fieldKey])) {
+    if (fieldConfig.type === 'dataLinkGroup' && Array.isArray(allData === null || allData === void 0 ? void 0 : allData[fieldKey])) {
       fieldValue = allData[fieldKey];
-    } else if (fieldConfig.type === 'dataLinkGroup' && allData?.[fieldKey]) {
+    } else if (fieldConfig.type === 'dataLinkGroup' && allData !== null && allData !== void 0 && allData[fieldKey]) {
       fieldValue = allData[fieldKey];
     } else if (fieldConfig.type === 'group') {
       fieldValue = {};
     } else {
-      fieldValue = allData?.[fieldKey];
+      fieldValue = allData === null || allData === void 0 ? void 0 : allData[fieldKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: fieldKey,
@@ -9969,44 +9975,44 @@ function useAjaxModal$2({
 }
 
 const mergeObject = obj => {
-  return Object.entries(obj || {}).reduce((acc, _ref) => {
-    let [key, value] = _ref;
+  return Object.entries(obj || {}).reduce((acc, [key, value]) => {
     if (typeof value === "object" && !Array.isArray(value) && value !== null) {
-      return _objectSpread2(_objectSpread2({}, acc), value);
+      return {
+        ...acc,
+        ...value
+      };
     }
-    return _objectSpread2(_objectSpread2({}, acc), {}, {
+    return {
+      ...acc,
       [key]: value
-    });
+    };
   }, {});
 };
-const handleDataLinkGroupWithTableKeys = _ref2 => {
-  var _inputConfig$meta, _config$meta2, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
-  let {
-    config,
-    inputConfig,
-    inputKey,
-    value,
-    level,
-    t,
-    rootForm,
-    allData,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref2;
+const handleDataLinkGroupWithTableKeys = ({
+  config,
+  inputConfig,
+  inputKey,
+  value,
+  level,
+  t,
+  rootForm,
+  allData,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
   if (!(config.type === 'dataLinkGroup' || config.type === 'dataLink')) {
     return null;
   }
-  if ((inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type) !== 'dataLink' || !(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta = inputConfig.meta) !== null && _inputConfig$meta !== void 0 && _inputConfig$meta.tableKeys)) {
+  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
     const parentInputKeys = Object.keys(config.inputs || {});
     const isHandledBySiblingDataLink = parentInputKeys.some(otherInputKey => {
       const otherConfig = config.inputs[otherInputKey];
-      if ((otherConfig === null || otherConfig === void 0 ? void 0 : otherConfig.type) === 'dataLink') {
-        var _otherConfig$meta, _config$meta;
-        const siblingTableKeys = (otherConfig === null || otherConfig === void 0 || (_otherConfig$meta = otherConfig.meta) === null || _otherConfig$meta === void 0 ? void 0 : _otherConfig$meta.tableKeys) || [];
-        const additionalTableKeys = ((_config$meta = config.meta) === null || _config$meta === void 0 ? void 0 : _config$meta.additionalTableKeys) || [];
+      if (otherConfig?.type === 'dataLink') {
+        const siblingTableKeys = otherConfig?.meta?.tableKeys || [];
+        const additionalTableKeys = config.meta?.additionalTableKeys || [];
         const allSiblingKeys = [...siblingTableKeys, ...additionalTableKeys];
         return allSiblingKeys.includes(inputKey) && otherInputKey !== inputKey;
       }
@@ -10020,26 +10026,23 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const additionalTableKeys = ((_config$meta2 = config.meta) === null || _config$meta2 === void 0 ? void 0 : _config$meta2.additionalTableKeys) || [];
+  const additionalTableKeys = config.meta?.additionalTableKeys || [];
   const parentInputKeys = Object.keys(config.inputs || {});
   const siblingInputsMatchingTableKeys = parentInputKeys.filter(siblingKey => siblingKey !== inputKey).filter(siblingKey => tableKeys.includes(siblingKey) || additionalTableKeys.includes(siblingKey));
   [...new Set([...tableKeys, ...siblingInputsMatchingTableKeys])];
-  const isAjaxModal = React.useMemo(() => {
-    var _inputConfig$meta2;
-    return !!(inputConfig !== null && inputConfig !== void 0 && (_inputConfig$meta2 = inputConfig.meta) !== null && _inputConfig$meta2 !== void 0 && _inputConfig$meta2.namespace);
-  }, [inputConfig]);
+  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
   const ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta3 = inputConfig.meta) === null || _inputConfig$meta3 === void 0 ? void 0 : _inputConfig$meta3.namespace,
-    skipFetch: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta4 = inputConfig.meta) === null || _inputConfig$meta4 === void 0 ? void 0 : _inputConfig$meta4.skipFetch,
+    namespace: inputConfig?.meta?.namespace,
+    skipFetch: inputConfig?.meta?.skipFetch,
     isAjaxModal,
-    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
+    formScope: inputConfig?.meta?.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
+  const dataLinkForm = ajaxModalValues?.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10051,12 +10054,12 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
       'videos': 'Video'
     };
     tableKeys.filter(tableKey => tableKey !== 'datastakeId').forEach(tableKey => {
-      var _dataLinkForm$identif;
-      const formInputConfig = (dataLinkForm === null || dataLinkForm === void 0 ? void 0 : dataLinkForm[tableKey]) || (dataLinkForm === null || dataLinkForm === void 0 || (_dataLinkForm$identif = dataLinkForm['identification']) === null || _dataLinkForm$identif === void 0 ? void 0 : _dataLinkForm$identif[tableKey]);
+      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[tableKey];
       if (formInputConfig) {
-        inputs[tableKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[tableKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : formInputConfig.label || formInputConfig.tableLabel || tableKey
-        });
+        };
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10064,7 +10067,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
+              if (item?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10072,37 +10075,37 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item === null || item === void 0 ? void 0 : item[tableKey];
+        values[tableKey] = item?.[tableKey];
       } else {
-        var _item$linking;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
+          type: inputConfig?.type
         };
-        values[tableKey] = (item === null || item === void 0 || (_item$linking = item.linking) === null || _item$linking === void 0 || (_item$linking = _item$linking.SCL) === null || _item$linking === void 0 || (_item$linking = _item$linking[item === null || item === void 0 ? void 0 : item[tableKey]]) === null || _item$linking === void 0 ? void 0 : _item$linking.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
+        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
       }
     });
     siblingInputsMatchingTableKeys.forEach(siblingKey => {
       const siblingConfig = config.inputs[siblingKey];
       if (siblingConfig) {
-        inputs[siblingKey] = _objectSpread2(_objectSpread2({}, siblingConfig), {}, {
+        inputs[siblingKey] = {
+          ...siblingConfig,
           label: siblingConfig.label || siblingKey
-        });
-        values[siblingKey] = item === null || item === void 0 ? void 0 : item[siblingKey];
+        };
+        values[siblingKey] = item?.[siblingKey];
       }
     });
-    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => fieldKey !== 'datastakeId' && !tableKeys.includes(fieldKey)).filter(fieldKey => {
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
-        var _item$linking2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
+        inputs[fieldKey] = {
+          ...formInputConfig,
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        });
-        if (formInputConfig !== null && formInputConfig !== void 0 && formInputConfig.label && typeof (formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label) === 'object') {
-          const dynamicLabelKeys = Object.keys(formInputConfig === null || formInputConfig === void 0 ? void 0 : formInputConfig.label);
+        };
+        if (formInputConfig?.label && typeof formInputConfig?.label === 'object') {
+          const dynamicLabelKeys = Object.keys(formInputConfig?.label);
           let resolvedLabel = null;
           for (const labelKey of dynamicLabelKeys) {
             const parts = labelKey.split(' is ');
@@ -10111,7 +10114,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
               const flattenedItem = Object.assign({}, item.location, {
                 address: item.address
               });
-              if ((flattenedItem === null || flattenedItem === void 0 ? void 0 : flattenedItem[conditionKey]) === conditionValue) {
+              if (flattenedItem?.[conditionKey] === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10119,7 +10122,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = (item === null || item === void 0 || (_item$linking2 = item.linking) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2.SCL) === null || _item$linking2 === void 0 || (_item$linking2 = _item$linking2[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
+        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[fieldKey];
       });
     }
     return {
@@ -10129,17 +10132,16 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      var _merged$inputKey;
       const merged = mergeObject(item);
-      const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey = merged[inputKey]) === null || _merged$inputKey === void 0 ? void 0 : _merged$inputKey.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
+      const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
       const {
         inputs,
         values
       } = createInputsAndValues(merged);
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
         config: {
-          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
+          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
           type: 'custom-datalink-group',
           inputs: inputs
         },
@@ -10153,12 +10155,11 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, "".concat(inputKey, "-").concat(itemIndex));
+      }, `${inputKey}-${itemIndex}`);
     });
   } else {
-    var _merged$inputKey2;
     const merged = mergeObject(value);
-    const datastakeIdValue = (merged === null || merged === void 0 || (_merged$inputKey2 = merged[inputKey]) === null || _merged$inputKey2 === void 0 ? void 0 : _merged$inputKey2.datastakeId) || (merged === null || merged === void 0 ? void 0 : merged.datastakeId);
+    const datastakeIdValue = merged?.[inputKey]?.datastakeId || merged?.datastakeId;
     const {
       inputs,
       values
@@ -10180,7 +10181,7 @@ const handleDataLinkGroupWithTableKeys = _ref2 => {
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, "".concat(inputKey, "-group"));
+    }, `${inputKey}-group`);
   }
 };
 

package/dist/pages/index.js

@@ -15480,7 +15480,7 @@ const getColumns$d = ({
   }
 }, {
   dataIndex: 'province',
-  title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -15497,7 +15497,7 @@ const getColumns$d = ({
   }
 }, {
   dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -31971,7 +31971,7 @@ const getColumns$9 = ({
   }
 }, {
   dataIndex: 'province',
-  title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -31988,7 +31988,7 @@ const getColumns$9 = ({
   }
 }, {
   dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -32406,7 +32406,7 @@ const getColumns$8 = ({
   }
 }, {
   dataIndex: 'province',
-  title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -32423,7 +32423,7 @@ const getColumns$8 = ({
   }
 }, {
   dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -32637,7 +32637,8 @@ const getColumns$7 = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, data?.options?.locationCategories);
+    const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+    const category = findOptions(v, locationCategories);
     return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
       children: category
@@ -32662,7 +32663,7 @@ const getColumns$7 = ({
   }
 }, {
   dataIndex: 'province',
-  title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -32679,7 +32680,7 @@ const getColumns$7 = ({
   }
 }, {
   dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -33039,7 +33040,7 @@ const getColumns$6 = ({
   }
 }, {
   dataIndex: 'region',
-  title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -33056,7 +33057,7 @@ const getColumns$6 = ({
   }
 }, {
   dataIndex: 'territory',
-  title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+  title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -33082,7 +33083,8 @@ const getColumns$6 = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, options?.locationCategories);
+    const locationCategories = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+    const category = findOptions(v, locationCategories);
     return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: category,
       children: category

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.789",
+	"version": "0.6.791",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/pages/Events/Activities/columns.js

@@ -72,7 +72,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },  
     {
       dataIndex: 'province',
-      title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+      title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
       ellipsis: true,
       show: true,
       render: (v, all) => {
@@ -87,7 +87,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
   },    
   {
       dataIndex: 'territory',
-      title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+      title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
       ellipsis: true,
       show: true,
       render: (v, all) => {

package/src/@daf/pages/Events/Incidents/columns.js

@@ -72,7 +72,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },  
     {
       dataIndex: 'province',
-      title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+      title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
       ellipsis: true,
       show: true,
       render: (v, all) => {
@@ -87,7 +87,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
   },    
   {
       dataIndex: 'territory',
-      title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+      title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
       ellipsis: true,
       show: true,
       render: (v, all) => {

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -42,7 +42,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },    
     {
         dataIndex: 'region',
-        title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+        title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -57,7 +57,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },   
     {
         dataIndex: 'territory',
-        title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+        title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -79,7 +79,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           if (all.empty) {
             return <div className="daf-default-cell" />
           }
-          const category = findOptions(v, options?.locationCategories);
+          const locationCategories = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])]
+          const category = findOptions(v, locationCategories);
     
           return <Tooltip title={category}>{category}</Tooltip>;
         },

package/src/@daf/pages/Locations/columns.js

@@ -43,7 +43,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const category = findOptions(v, data?.options?.locationCategories);
+          const locationCategories = [...(data?.options?.locationCategories || []), ...(options?.productionSiteCategories || [])]
+
+          const category = findOptions(v, locationCategories);
     
           return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
         },
@@ -65,7 +67,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },      
     {
         dataIndex: 'province',
-        title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+        title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -80,7 +82,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },    
     {
         dataIndex: 'territory',
-        title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+        title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
         ellipsis: true,
         show: true,
         render: (v, all) => {

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -73,7 +73,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },          
     {
         dataIndex: 'province',
-        title: findOptions(user?.company?.country, options?.administrativeLevel1) || t("Province"),
+        title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -88,7 +88,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     },    
     {
         dataIndex: 'territory',
-        title: findOptions(user?.company?.country, options?.administrativeLevel2) || t("Territory"),
+        title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
         ellipsis: true,
         show: true,
         render: (v, all) => {