datastake-daf 0.6.763 → 0.6.764

package/dist/components/index.js

@@ -5901,10 +5901,10 @@ function DAFTable(_ref) {
     }) : filtersConfig;
   }, [sourcesKey, sources, filtersConfig, t]);
   React.useEffect(() => {
-    if (data) {
+    if (data && Array.isArray(data)) {
       setSource(data);
     }
-  }, [data]);
+  }, [data, data.length]);
   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;
@@ -10140,37 +10140,42 @@ const handleDataLinkGroupWithTableKeys = ({
   }
 };
 
-const handleDataLinkWithTableKeys = ({
-  inputConfig,
-  inputKey,
-  value,
-  level,
-  t,
-  rootForm,
-  allData,
-  user,
-  getApiBaseUrl = () => {},
-  getAppHeader = () => {},
-  app,
-  TreeNodeComponent
-}) => {
-  if (inputConfig?.type !== 'dataLink' || !inputConfig?.meta?.tableKeys) {
+const handleDataLinkWithTableKeys = _ref => {
+  var _inputConfig$meta, _inputConfig$meta3, _inputConfig$meta4, _inputConfig$meta5;
+  let {
+    inputConfig,
+    inputKey,
+    value,
+    level,
+    t,
+    rootForm,
+    allData,
+    user,
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    app,
+    TreeNodeComponent
+  } = _ref;
+  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)) {
     return null;
   }
   const tableKeys = inputConfig.meta.tableKeys;
-  const isAjaxModal = React.useMemo(() => !!inputConfig?.meta?.namespace, [inputConfig]);
+  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 ajaxModalValues = useAjaxModal$2({
     name: inputKey,
     user,
-    namespace: inputConfig?.meta?.namespace,
-    skipFetch: inputConfig?.meta?.skipFetch,
+    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,
     isAjaxModal,
-    formScope: inputConfig?.meta?.formScope,
+    formScope: inputConfig === null || inputConfig === void 0 || (_inputConfig$meta5 = inputConfig.meta) === null || _inputConfig$meta5 === void 0 ? void 0 : _inputConfig$meta5.formScope,
     APP: app,
     apiBaseUrl: getApiBaseUrl(),
     _getAppHeader: getAppHeader
   });
-  const dataLinkForm = ajaxModalValues?.form;
+  const dataLinkForm = ajaxModalValues === null || ajaxModalValues === void 0 ? void 0 : ajaxModalValues.form;
   const createInputsAndValues = item => {
     const inputs = {};
     const values = {};
@@ -10183,19 +10188,20 @@ const handleDataLinkWithTableKeys = ({
     };
     const isUploadFieldEmpty = (fieldKey, itemToCheck) => {
       if (uploadTypeFields.includes(fieldKey)) {
-        const itemValue = itemToCheck?.[fieldKey];
+        const itemValue = itemToCheck === null || itemToCheck === void 0 ? void 0 : itemToCheck[fieldKey];
         return itemValue === undefined || itemValue === null || Array.isArray(itemValue) && itemValue.length === 0;
       }
       return false;
     };
     const processedTableKeys = processConditionalTableKeys(tableKeys, item);
     processedTableKeys.filter(tableKey => tableKey !== 'datastakeId').filter(tableKey => !isUploadFieldEmpty(tableKey, item)).forEach(tableKey => {
-      const formInputConfig = dataLinkForm?.[tableKey] || dataLinkForm?.['identification']?.[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]);
       if (formInputConfig) {
-        inputs[tableKey] = {
-          ...formInputConfig,
+        var _item$linking, _formInputConfig$meta, _formInputConfig$tabl;
+        inputs[tableKey] = _objectSpread2(_objectSpread2({}, 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;
@@ -10203,7 +10209,7 @@ const handleDataLinkWithTableKeys = ({
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10211,16 +10217,17 @@ const handleDataLinkWithTableKeys = ({
           }
           inputs[tableKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey);
         }
-        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item[formInputConfig?.meta?.onNewSetValueKey] || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[tableKey];
+        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[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$meta = formInputConfig.meta) === null || _formInputConfig$meta === void 0 ? void 0 : _formInputConfig$meta.onNewSetValueKey] || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl = formInputConfig.tableLabel) === null || _formInputConfig$tabl === void 0 ? void 0 : _formInputConfig$tabl.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[tableKey]);
       } else {
+        var _item$linking2;
         inputs[tableKey] = {
           label: uploadTypeFields.includes(tableKey) ? uploadTypeLabels[tableKey] : tableKey,
-          type: inputConfig?.type
+          type: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.type
         };
-        values[tableKey] = item?.linking?.SCL?.[item?.[tableKey]]?.name || item?.[tableKey];
+        values[tableKey] = (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[tableKey]]) === null || _item$linking2 === void 0 ? void 0 : _item$linking2.name) || (item === null || item === void 0 ? void 0 : item[tableKey]);
       }
     });
-    if (dataLinkForm?.identification && typeof dataLinkForm.identification === 'object') {
+    if (dataLinkForm !== null && dataLinkForm !== void 0 && dataLinkForm.identification && typeof dataLinkForm.identification === 'object') {
       Object.keys(dataLinkForm.identification).filter(fieldKey => {
         if (uploadTypeFields.includes(fieldKey)) {
           return !isUploadFieldEmpty(fieldKey, item);
@@ -10230,11 +10237,11 @@ const handleDataLinkWithTableKeys = ({
         const formInputConfig = dataLinkForm.identification[fieldKey];
         return formInputConfig && typeof formInputConfig === 'object' && !Array.isArray(formInputConfig);
       }).forEach(fieldKey => {
+        var _item$linking3, _formInputConfig$tabl2;
         const formInputConfig = dataLinkForm.identification[fieldKey];
-        inputs[fieldKey] = {
-          ...formInputConfig,
+        inputs[fieldKey] = _objectSpread2(_objectSpread2({}, formInputConfig), {}, {
           label: uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : formInputConfig.label || formInputConfig.tableLabel || fieldKey
-        };
+        });
         if (formInputConfig.label && typeof formInputConfig.label === 'object') {
           const dynamicLabelKeys = Object.keys(formInputConfig.label);
           let resolvedLabel = null;
@@ -10242,7 +10249,7 @@ const handleDataLinkWithTableKeys = ({
             const parts = labelKey.split(' is ');
             if (parts.length === 2) {
               const [conditionKey, conditionValue] = parts;
-              if (item?.[conditionKey] === conditionValue) {
+              if ((item === null || item === void 0 ? void 0 : item[conditionKey]) === conditionValue) {
                 resolvedLabel = formInputConfig.label[labelKey];
                 break;
               }
@@ -10250,7 +10257,7 @@ const handleDataLinkWithTableKeys = ({
           }
           inputs[fieldKey].label = resolvedLabel || Object.values(formInputConfig.label)[0] || (uploadTypeFields.includes(fieldKey) ? uploadTypeLabels[fieldKey] : fieldKey);
         }
-        values[fieldKey] = item?.linking?.SCL?.[item?.[fieldKey]]?.name || item?.[formInputConfig?.tableLabel?.toLowerCase()] || item?.[fieldKey];
+        values[fieldKey] = (item === null || item === void 0 || (_item$linking3 = item.linking) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3.SCL) === null || _item$linking3 === void 0 || (_item$linking3 = _item$linking3[item === null || item === void 0 ? void 0 : item[fieldKey]]) === null || _item$linking3 === void 0 ? void 0 : _item$linking3.name) || (item === null || item === void 0 ? void 0 : item[formInputConfig === null || formInputConfig === void 0 || (_formInputConfig$tabl2 = formInputConfig.tableLabel) === null || _formInputConfig$tabl2 === void 0 ? void 0 : _formInputConfig$tabl2.toLowerCase()]) || (item === null || item === void 0 ? void 0 : item[fieldKey]);
       });
     }
     return {
@@ -10260,7 +10267,7 @@ const handleDataLinkWithTableKeys = ({
   };
   if (Array.isArray(value)) {
     return value.map((item, itemIndex) => {
-      const datastakeIdValue = item?.datastakeId;
+      const datastakeIdValue = item === null || item === void 0 ? void 0 : item.datastakeId;
       const {
         inputs,
         values
@@ -10269,9 +10276,9 @@ const handleDataLinkWithTableKeys = ({
         return null;
       }
       return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
-        nodeKey: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+        nodeKey: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
         config: {
-          label: datastakeIdValue || t(`No ID ${itemIndex + 1}`),
+          label: datastakeIdValue || t("No ID ".concat(itemIndex + 1)),
           type: 'custom-datalink',
           inputs: inputs
         },
@@ -10285,10 +10292,10 @@ const handleDataLinkWithTableKeys = ({
         getApiBaseUrl: getApiBaseUrl,
         getAppHeader: getAppHeader,
         app: app
-      }, `${inputKey}-${itemIndex}`);
+      }, "".concat(inputKey, "-").concat(itemIndex));
     });
   } else {
-    const datastakeIdValue = value?.datastakeId;
+    const datastakeIdValue = value === null || value === void 0 ? void 0 : value.datastakeId;
     const {
       inputs,
       values
@@ -10313,25 +10320,24 @@ const handleDataLinkWithTableKeys = ({
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
       app: app
-    }, `${inputKey}-single`);
+    }, "".concat(inputKey, "-single"));
   }
 };
 
-const handleGroupChildren = _ref => {
-  let {
-    config,
-    value,
-    allData,
-    level,
-    t,
-    rootForm,
-    user,
-    getApiBaseUrl = () => {},
-    getAppHeader = () => {},
-    app,
-    TreeNodeComponent
-  } = _ref;
-  if (!(config !== null && config !== void 0 && config.inputs)) {
+const handleGroupChildren = ({
+  config,
+  value,
+  allData,
+  level,
+  t,
+  rootForm,
+  user,
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  app,
+  TreeNodeComponent
+}) => {
+  if (!config?.inputs) {
     return null;
   }
   const inputKeys = Object.keys(config.inputs);
@@ -10344,7 +10350,7 @@ const handleGroupChildren = _ref => {
     if (value && typeof value === 'object' && value[inputKey]) {
       inputValue = value[inputKey];
     } else {
-      inputValue = allData === null || allData === void 0 ? void 0 : allData[inputKey];
+      inputValue = allData?.[inputKey];
     }
     return /*#__PURE__*/jsxRuntime.jsx(TreeNodeComponent, {
       nodeKey: inputKey,
@@ -44109,7 +44115,7 @@ const useFilters = ({
     return Math.ceil(pagination.total / pagination.pageSize);
   }, [pagination]);
   const canGoPrev = React.useMemo(() => pagination.current !== 1, [pagination]);
-  const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);
+  const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages > 0, [pagination, totalPages]);
   const goPrev = () => {
     if (!canGoPrev) {
       return;
@@ -60269,6 +60275,32 @@ CountryFlag.propTypes = {
   hasTooltip: PropTypes__default["default"].bool
 };
 
+function KeyIndicatorNavigateLabel(_ref) {
+  let {
+    t,
+    getRedirectLink,
+    theme,
+    label,
+    link
+  } = _ref;
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    className: "flex",
+    children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "flex-1",
+      children: t(label)
+    }), /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "cursor-pointer",
+      onClick: () => window.open(getRedirectLink(link), '_blank'),
+      children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+        name: "LinkNewTab",
+        width: 16,
+        height: 16,
+        color: theme.colorPrimary
+      })
+    })]
+  });
+}
+
 var Style$5 = styled__default["default"].div`
   display: flex;
   flex-direction: column;
@@ -61610,6 +61642,7 @@ exports.InformationChannelsDataPoint = DataPoint;
 exports.InformationChannelsSubject = Subject;
 exports.InformationChannelsView = InformationChannel;
 exports.InformationUnavailable = InformationUnavailable;
+exports.KeyIndicatorNavigateLabel = KeyIndicatorNavigateLabel;
 exports.KeyIndicators = KeyIndicatorsWidget$1;
 exports.KeyIndicatorsDetails = KeyIndicatorsDetails;
 exports.LineChart = LineChart;

package/dist/hooks/index.js

@@ -418,7 +418,7 @@ const useFilters = ({
     return Math.ceil(pagination.total / pagination.pageSize);
   }, [pagination]);
   const canGoPrev = React.useMemo(() => pagination.current !== 1, [pagination]);
-  const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages, [pagination, totalPages]);
+  const canGoNext = React.useMemo(() => pagination.current !== totalPages && totalPages > 0, [pagination, totalPages]);
   const goPrev = () => {
     if (!canGoPrev) {
       return;

package/dist/layouts/index.js

@@ -4583,6 +4583,10 @@ CustomIcon.propTypes = {
   size: PropTypes__default["default"].number
 };
 
+const userIsAdmin = user => {
+  return user?.role?.id === 'APP_ADMIN';
+};
+
 /* eslint-disable no-unused-vars */
 const featureIsNotAvailable = (t, isDemo) => {
   antd.Modal.error({
@@ -5800,10 +5804,12 @@ function MobileDrawer({
   userHelpers = {},
   isDev = false,
   selectedProject,
-  theme = {}
+  theme = {},
+  dropdownItems = []
 }) {
   const items = React.useMemo(() => sidenavConfig[mod] || [], [sidenavConfig, mod]);
-  const canViewPartners = React.useMemo(() => mod === 'tazama', [mod]);
+  const appsWithPartners = ['tazama', 'nashiriki', 'wazi', 'hatua'];
+  const canViewPartners = React.useMemo(() => appsWithPartners.includes(mod), [mod]);
   const canViewProjects = checkPermission({
     permission: 'projects.canView',
     permissions: user?.role?.permissions
@@ -5856,7 +5862,7 @@ function MobileDrawer({
       }, {
         type: 'link',
         name: t('Partners'),
-        path: `/app/${mod}/partners`,
+        path: `/app/partners`,
         isDashboard: true,
         visible: canViewPartners
       }, {
@@ -5962,16 +5968,14 @@ const UserDropdownMenu = ({
   userHelpers = {},
   isDev = false,
   theme = {},
-  moduleInterfaceConfig = null
+  moduleInterfaceConfig = null,
+  dropdownItems = []
 }) => {
   const resizeContext = useResizeContext();
   const {
     windowWidth
   } = resizeContext || {};
-  const {
-    userIsAdmin
-  } = userHelpers;
-  const isAdmin = React.useMemo(() => userIsAdmin?.(user), [user, userIsAdmin]);
+  const isAdmin = React.useMemo(() => userIsAdmin(user), [user]);
 
   // Add fallback for windowWidth
   const actualWidth = windowWidth || (typeof window !== 'undefined' ? window.innerWidth : 1920);
@@ -6029,7 +6033,8 @@ const UserDropdownMenu = ({
       changeNotificationState: changeNotificationState,
       appName: appName,
       theme: theme,
-      moduleInterfaceConfig: moduleInterfaceConfig
+      moduleInterfaceConfig: moduleInterfaceConfig,
+      dropdownItems: dropdownItems
     })]
   }) : /*#__PURE__*/jsxRuntime.jsx(antd.Dropdown, {
     trigger: "click",
@@ -6047,7 +6052,25 @@ const UserDropdownMenu = ({
             })]
           }), /*#__PURE__*/jsxRuntime.jsxs("div", {
             className: "list",
-            children: [user.company && !isDemoEnv && canViewUsers && !isAdmin ? /*#__PURE__*/jsxRuntime.jsx("div", {
+            children: [dropdownItems && dropdownItems.filter(item => {
+              if (typeof item.condition === 'function') {
+                return item.condition({
+                  user,
+                  isAdmin,
+                  module,
+                  checkPermission,
+                  appName
+                });
+              }
+              if ('condition' in item) {
+                return !!item.condition;
+              }
+              return true;
+            }).map(item => /*#__PURE__*/jsxRuntime.jsx("div", {
+              className: "list-item",
+              onClick: () => handlegoTo(getRedirectLink(item.path)),
+              children: item.name
+            }, item.key)), user.company && !isDemoEnv && canViewUsers && !isAdmin ? /*#__PURE__*/jsxRuntime.jsx("div", {
               className: "list-item",
               onClick: () => handlegoTo(getRedirectLink(`/app/users`)),
               children: t('Users')
@@ -7905,6 +7928,7 @@ function AppLayout({
   updateLanguage,
   getUserOptions,
   selectedProject,
+  dropdownItems = [],
   // Navigation (injected from app)
   goTo = () => {},
   location,
@@ -8233,7 +8257,8 @@ function AppLayout({
               userHelpers: userHelpers,
               isDev: isDev,
               theme: theme,
-              moduleInterfaceConfig: moduleInterfaceConfig
+              moduleInterfaceConfig: moduleInterfaceConfig,
+              dropdownItems: dropdownItems
             })
           })]
         })]