datastake-daf 0.6.790 → 0.6.792

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) => {
@@ -32663,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) => {
@@ -32680,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) => {
@@ -32870,7 +32870,7 @@ const getFiltersConfig$3 = ({
       getLabel: option => option.label,
       getValue: option => option.value
     },
-    type: {
+    category: {
       type: 'select',
       label: 'Type',
       placeholder: () => `${t('Filter by')} ${t('Type').toLowerCase()}`,
@@ -32924,13 +32924,14 @@ const getFilterOptions$3 = (options, t) => {
     administrativeLevel1,
     administrativeLevel2,
     mineralOptions,
+    productionSiteCategories,
     locationCategories = []
   } = options || {};
   const _default = {
-    category: stakeholderCategoryOptions || categoryOptions,
+    // category: stakeholderCategoryOptions || categoryOptions,
     country: countries,
     product: mineralOptions,
-    type: locationCategories,
+    category: productionSiteCategories || locationCategories,
     administrativeLevel1,
     administrativeLevel2,
     subCategory: subCategoriesOptions,
@@ -33040,7 +33041,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) => {
@@ -33057,7 +33058,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) => {

package/package.json

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

package/src/@daf/core/components/AuthForm/index.jsx

@@ -128,13 +128,13 @@ function AuthForm ({
       case "input":
       case "email":
       case "number":
-        inputNode = <Input type={field.type} placeholder={field.placeholder} {...field.props} />;
+        inputNode = <Input type={field.type} placeholder={field.placeholder} disabled={field.disabled} {...field.props} />;
         break;
       case "password":
-        inputNode = <Input.Password placeholder={field.placeholder} {...field.props} />;
+        inputNode = <Input.Password placeholder={field.placeholder} disabled={field.disabled} {...field.props} />;
         break;
       case "textarea":
-        inputNode = <Input.TextArea placeholder={field.placeholder} {...field.props} />;
+        inputNode = <Input.TextArea placeholder={field.placeholder} disabled={field.disabled} {...field.props} />;
         break;
       case "select": {
         const { onChange: fieldOnChange, value: fieldValue, ...restSelectProps } = field.props || {};
@@ -142,6 +142,7 @@ function AuthForm ({
         inputNode = (
           <StyledSelect 
             placeholder={field.placeholder}
+            disabled={field.disabled}
             {...restSelectProps}
           >
             {field.options?.map((opt) => (
@@ -157,7 +158,7 @@ function AuthForm ({
         inputNode = field.component;
         break;
       default:
-        inputNode = <Input placeholder={field.placeholder} {...field.props} />;
+        inputNode = <Input placeholder={field.placeholder} disabled={field.disabled} {...field.props} />;
     }
 
     const formItemProps = {

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) => {

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

@@ -81,7 +81,7 @@ export const getFiltersConfig = ({t}) => {
 		  getLabel: (option) => option.label,
 		  getValue: (option) => option.value,
 		},		
-		type: {
+		category: {
 		  type: 'select',
 		  label: 'Type',
 		  placeholder: () => `${t('Filter by')} ${t('Type').toLowerCase()}`,
@@ -124,14 +124,15 @@ export const getFilterOptions = (options, t) => {
 		administrativeLevel1,
 		administrativeLevel2,
 		mineralOptions,
+		productionSiteCategories,
 		locationCategories = [],
 	  } = options || {};
 
 	const _default  = {
-		category: stakeholderCategoryOptions || categoryOptions,
+		// category: stakeholderCategoryOptions || categoryOptions,
 		country: countries,
 		product: mineralOptions,
-		type: locationCategories,
+		category: productionSiteCategories || locationCategories,
 		administrativeLevel1,
 		administrativeLevel2,
 		subCategory: subCategoriesOptions,

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

@@ -67,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) => {
@@ -82,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) => {