datastake-daf 0.6.741 → 0.6.742

package/dist/pages/index.js

@@ -15841,7 +15841,7 @@ const TablePageWithTabs = ({
   location,
   loading = false,
   goTo = () => {},
-  defaultActiveTab = "all",
+  defaultActiveTab = "own",
   checkboxConfig = {},
   columns = [],
   data = {},
@@ -16041,8 +16041,8 @@ const getColumns$4 = ({
     });
   }
 }, {
-  dataIndex: 'country',
-  title: t('Country'),
+  dataIndex: 'positionSupplyChain',
+  title: t('Position'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16051,15 +16051,15 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const country = findOptions(v, options?.countries);
+    const country = findOptions(v, data?.options?.positionSupplyChainOptions);
     return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: country,
       children: country
     }) : '-';
   }
 }, {
-  dataIndex: 'type',
-  title: t('Type'),
+  dataIndex: 'subCategory',
+  title: t('Legal Form'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16068,17 +16068,15 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-
-    // const category = findOptions(v, data?.options?.locationCategories);
-
-    return v ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: v,
-      children: v
+    const subCategory = findOptions(v, data?.options?.subCategoriesOptions);
+    return subCategory ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: subCategory,
+      children: subCategory
     }) : '-';
   }
 }, {
-  dataIndex: 'registration',
-  title: t('Registration'),
+  dataIndex: 'province',
+  title: t('Province'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16087,15 +16085,15 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const region = getLinkValue$2(v, all?.linking?.SCL);
+    const region = getLinkValue$2(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
     return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: region,
       children: region
     }) : '-';
   }
 }, {
-  dataIndex: 'status',
-  title: t('Status'),
+  dataIndex: 'territory',
+  title: t('Territory'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16104,7 +16102,7 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const district = getLinkValue$2(v, all?.linking?.SCL);
+    const district = getLinkValue$2(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
     return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
       title: district,
       children: district

package/dist/services/index.js

@@ -1502,7 +1502,7 @@ class OperatorService extends BaseService {
       data: data
     });
   }
-  getOptions(id = "optionPositionSupplyChain,subCategory,activityAtSite,category,countries") {
+  getOptions(id = "positionSupplyChainOptions,subCategoriesOptions,categoriesOptions,countries") {
     return this.apiGet({
       isApp: true,
       url: `/forms/options`,

package/package.json

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

package/src/@daf/pages/dashboards/Operations/Operators/columns.js

@@ -40,8 +40,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },    
     {
-        dataIndex: 'country',
-        title: t('Country'),
+        dataIndex: 'positionSupplyChain',
+        title: t('Position'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -49,14 +49,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const country = findOptions(v, options?.countries);
+          const country = findOptions(v, data?.options?.positionSupplyChainOptions);
 
           return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
     },  
     {
-        dataIndex: 'type',
-        title: t('Type'),
+        dataIndex: 'subCategory',
+        title: t('Legal Form'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -64,14 +64,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          // const category = findOptions(v, data?.options?.locationCategories);
+          const subCategory = findOptions(v, data?.options?.subCategoriesOptions);
     
-          return v ? <Tooltip title={v}>{v}</Tooltip> : '-';
+          return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
         },
     },          
     {
-        dataIndex: 'registration',
-        title: t('Registration'),
+        dataIndex: 'province',
+        title: t('Province'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -79,14 +79,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const region = getLinkValue(v, all?.linking?.SCL);
+          const region = getLinkValue(all?.location?.administrativeLevel1, all?.location?.linking?.SCL);
 
           return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
         },
     },    
     {
-        dataIndex: 'status',
-        title: t('Status'),
+        dataIndex: 'territory',
+        title: t('Territory'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -94,7 +94,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const district = getLinkValue(v, all?.linking?.SCL);
+          const district = getLinkValue(all?.location?.administrativeLevel2, all?.location?.linking?.SCL);
 
           return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },

package/src/@daf/pages/pages/TablePageWithTabs/index.jsx

@@ -12,7 +12,7 @@ const TablePageWithTabs = ({
     location,
     loading = false,
     goTo = () => {},
-    defaultActiveTab = "all",
+    defaultActiveTab = "own",
     checkboxConfig = {},
     columns = [],
     data = {},

package/src/@daf/services/OperatorService.js

@@ -76,7 +76,7 @@ class OperatorService extends BaseService {
 		});
 	}
 
-	getOptions(id = "optionPositionSupplyChain,subCategory,activityAtSite,category,countries") {
+	getOptions(id = "positionSupplyChainOptions,subCategoriesOptions,categoriesOptions,countries") {
 		return this.apiGet({
 			isApp: true,
 			url: `/forms/options`,

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow: