datastake-daf 0.6.739 → 0.6.741

package/dist/components/index.js

@@ -5797,7 +5797,7 @@ function DAFTable(_ref) {
     if (data) {
       setSource(data);
     }
-  }, [data.length]);
+  }, [data]);
   const paginationPageSize = pagination === null || pagination === void 0 ? void 0 : pagination.pageSize;
   const dataSource = React.useMemo(() => {
     const pageSize = paginationPageSize ? paginationPageSize : source.length > 10 ? source.length : 10;

package/dist/pages/index.js

@@ -15163,7 +15163,7 @@ function DAFTable({
     if (data) {
       setSource(data);
     }
-  }, [data.length]);
+  }, [data]);
   const paginationPageSize = pagination?.pageSize;
   const dataSource = React.useMemo(() => {
     const pageSize = paginationPageSize ? paginationPageSize : source.length > 10 ? source.length : 10;
@@ -16041,8 +16041,8 @@ const getColumns$4 = ({
     });
   }
 }, {
-  dataIndex: 'category',
-  title: t('Category'),
+  dataIndex: 'country',
+  title: t('Country'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16051,15 +16051,15 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const category = findOptions(v, data?.options?.locationCategories);
-    return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: category,
-      children: category
+    const country = findOptions(v, options?.countries);
+    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: country,
+      children: country
     }) : '-';
   }
 }, {
-  dataIndex: 'country',
-  title: t('Country'),
+  dataIndex: 'type',
+  title: t('Type'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16068,15 +16068,17 @@ const getColumns$4 = ({
         className: "daf-default-cell"
       });
     }
-    const country = findOptions(v, options?.countries);
-    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: country,
-      children: country
+
+    // const category = findOptions(v, data?.options?.locationCategories);
+
+    return v ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
     }) : '-';
   }
 }, {
-  dataIndex: 'administrativeLevel1',
-  title: t('Region'),
+  dataIndex: 'registration',
+  title: t('Registration'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16092,8 +16094,8 @@ const getColumns$4 = ({
     }) : '-';
   }
 }, {
-  dataIndex: 'administrativeLevel2',
-  title: t('District'),
+  dataIndex: 'status',
+  title: t('Status'),
   ellipsis: true,
   show: true,
   render: (v, all) => {
@@ -16108,24 +16110,6 @@ const getColumns$4 = ({
       children: district
     }) : '-';
   }
-}, {
-  title: t("Last Update"),
-  dataIndex: "updatedAt",
-  key: "updatedAt",
-  width: 125,
-  render: (date, all) => {
-    if (all.empty) {
-      return /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "daf-default-cell"
-      });
-    }
-    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
-      title: _date,
-      children: _date
-    });
-  },
-  ellipsis: true
 }, {
   title: t("Sources"),
   dataIndex: "sources",
@@ -16145,6 +16129,24 @@ const getColumns$4 = ({
       items: val
     });
   }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  width: 125,
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
 }, {
   id: 'actions',
   title: "",

package/package.json

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

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

@@ -89,7 +89,7 @@ export default function DAFTable({
     if (data) {
       setSource(data);
     }
-  }, [data.length]);
+  }, [data]);
 
   const paginationPageSize = pagination?.pageSize;
   const dataSource = useMemo(() => {

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

@@ -38,10 +38,10 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
           return <Tooltip title={v}>{v}</Tooltip>;
         },
-    },     
+    },    
     {
-        dataIndex: 'category',
-        title: t('Category'),
+        dataIndex: 'country',
+        title: t('Country'),
         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 category = findOptions(v, data?.options?.locationCategories);
-    
-          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+          const country = findOptions(v, options?.countries);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
-    },     
+    },  
     {
-        dataIndex: 'country',
-        title: t('Country'),
+        dataIndex: 'type',
+        title: t('Type'),
         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 country = findOptions(v, options?.countries);
-
-          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+          // const category = findOptions(v, data?.options?.locationCategories);
+    
+          return v ? <Tooltip title={v}>{v}</Tooltip> : '-';
         },
-    },      
+    },          
     {
-        dataIndex: 'administrativeLevel1',
-        title: t('Region'),
+        dataIndex: 'registration',
+        title: t('Registration'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -85,8 +85,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },    
     {
-        dataIndex: 'administrativeLevel2',
-        title: t('District'),
+        dataIndex: 'status',
+        title: t('Status'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -99,21 +99,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },
     },     
-    {
-        title: t("Last Update"),
-        dataIndex: "updatedAt",
-        key: "updatedAt",
-        width: 125,
-        render: (date, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
-
-            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-            return <Tooltip title={_date}>{_date}</Tooltip>;
-        },
-        ellipsis: true,
-    },
     {
         title: t("Sources"),
         dataIndex: "sources",
@@ -129,6 +114,21 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <AvatarGroup items={val}></AvatarGroup>;
         },
     },
+    {
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
+        width: 125,
+        render: (date, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+            return <Tooltip title={_date}>{_date}</Tooltip>;
+        },
+        ellipsis: true,
+    },
     {
       id: 'actions',
       title: "",