datastake-daf 0.6.844 → 0.6.846

package/dist/components/index.js

@@ -36595,10 +36595,14 @@ const inputTypeComponent$1 = {
         }
         return {
           label: o.label,
-          items: opts.filter(op => op.group === o.value)
+          items: opts.filter(op => op?.filters?.[0]?.value.includes(o.value))
         };
       });
-      const notGrouped = opts.filter(op => !gKeys.includes(op.group));
+      const notGrouped = opts.filter(op => {
+        const filterValue = op?.filters?.[0]?.value;
+        if (!filterValue) return true;
+        return !gKeys.some(key => filterValue.includes(key));
+      });
       if (notGrouped.length) {
         groupOptions.unshift(...notGrouped);
       }
@@ -36762,20 +36766,19 @@ const inputTypeComponent$1 = {
         }
         return {
           label: o.label,
-          items: opts.filter(op => op.group === o.value)
+          items: opts.filter(op => op?.filters?.[0]?.value.includes(o.value))
         };
       });
-      const notGrouped = opts.filter(op => !gKeys.includes(op.group));
+      const notGrouped = opts.filter(op => {
+        const filterValue = op?.filters?.[0]?.value;
+        if (!filterValue) return true;
+        return !gKeys.some(key => filterValue.includes(key));
+      });
       if (notGrouped.length) {
         groupOptions.unshift(...notGrouped);
       }
       opts = groupOptions;
     }
-    console.log({
-      maxWidth,
-      staticWidth,
-      fullWidth
-    });
     return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       size: "medium",
       allowClear: true,
@@ -42168,10 +42171,7 @@ const useCombinedPrefilledValues = (combinedPrefilledValues, values, parentValue
       }
     });
     if (hasChanges) {
-      setValues(prevValues => ({
-        ...prevValues,
-        ...resolvedValues
-      }));
+      setValues(prevValues => _objectSpread2(_objectSpread2({}, prevValues), resolvedValues));
       MainForm.setFieldsValue(resolvedValues);
     }
   }, [values, parentValues, combinedPrefilledValues, setValues, MainForm]);
@@ -54422,55 +54422,26 @@ const getColumns$8 = ({
   onCopyInvitation = () => {},
   onResendInvitation = () => {},
   onCanelVerification = () => {},
-  setAddAccountVisible = () => {},
-  setSelectedAccounts = () => {},
-  selectedAccounts = []
+  setAddAccountVisible = () => {}
 }) => {
   const cols = [{
-    title: "",
-    dataIndex: "select",
-    key: "select",
-    width: 50,
-    active: true,
-    pending: true,
-    suspended: true,
-    show: true,
-    render: (v, all) => {
-      if (all.empty) {
-        return /*#__PURE__*/jsxRuntime.jsx("div", {
-          className: "daf-default-cell"
-        });
-      }
-      return /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox, {
-        onChange: () => setSelectedAccounts(prev => {
-          const isSelected = prev.some(p => p.userId === all.userId);
-          if (isSelected) {
-            return prev.filter(p => p.userId !== all.userId);
-          }
-          return [...prev, all];
-        }),
-        checked: selectedAccounts.some(p => p.userId === all.userId),
-        disabled: selectedAccounts.length >= 3 && !selectedAccounts.some(p => p.userId === all.userId)
-      });
-    }
-  }, {
     title: t("ID"),
-    dataIndex: "userId",
     key: "userId",
+    ellipsis: true,
+    width: 160,
     active: true,
     pending: true,
     suspended: true,
-    ellipsis: true,
-    width: 160,
-    render: (v, all) => {
+    render: (_, all) => {
       if (all.empty) {
         return /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "daf-default-cell"
         });
       }
+      const id = all.status === "pending" ? all.users?.[0]?.userId ?? all.invitedUser?.userId ?? all.datastakeId ?? "--" : all.userId ?? "--";
       return /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "daf-default-cell",
-        children: v || "--"
+        children: id
       });
     }
   }, {
@@ -54486,19 +54457,18 @@ const getColumns$8 = ({
     pending: true,
     suspended: true
   }, {
-    title: t("type"),
-    dataIndex: "apps",
-    key: "apps",
-    render: (apps, all) => {
+    title: t("Type"),
+    key: "type",
+    render: (_, all) => {
       if (all.empty) {
         return /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "daf-default-cell"
         });
       }
-      const sbg = all?.interface ? all : (apps || []).find(a => a.app === module);
+      const typeValue = all.status === "pending" ? all.type ?? all.otherData?.interface : all.apps?.[0]?.interface;
       return renderTypeTag({
-        value: sbg?.interface,
-        label: findOptions(sbg?.interface, selectOptions.type)
+        value: typeValue,
+        label: findOptions(typeValue, selectOptions.type)
       });
     },
     active: true,
@@ -54573,7 +54543,8 @@ const getColumns$8 = ({
           className: "daf-default-cell"
         });
       }
-      return verified ? /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
+      const isVerified = all.users?.[0]?.emailVerified ?? verified ?? all.emailVerfied;
+      return isVerified ? /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
         color: "green",
         children: t("Yes")
       }) : /*#__PURE__*/jsxRuntime.jsx(antd.Tag, {
@@ -56993,7 +56964,7 @@ function NewUser({
       const localUserData = {
         ...apiPayload,
         status: 'pending',
-        id: apiPayload.email // Add a unique ID for the table key
+        id: apiPayload.email
         // apps: {
         // 	[module]: {
         // 		role: val.role,
@@ -58059,14 +58030,6 @@ function AdminView(_ref) {
               id: editData.id,
               data: newData
             });
-            console.log({
-              data
-            });
-            console.log('Checking for pending users...', {
-              hasPendingUsers: pendingUsers.length > 0,
-              hasInviteFunction: !!inviteCompanyAccount,
-              pendingUsers: pendingUsers
-            });
             if (pendingUsers.length > 0 && inviteCompanyAccount) {
               console.log('Inviting pending users:', pendingUsers.length);
               for (const user of pendingUsers) {
@@ -58076,8 +58039,6 @@ function AdminView(_ref) {
                       status
                     } = user,
                     userDataToInvite = _objectWithoutProperties(user, _excluded2);
-                  console.log('Sending invitation for:', user.email, userDataToInvite);
-                  // Use the standalone invite function, don't mix it with updateAccount
                   // await inviteCompanyAccount({
                   // 	companyId: editData.id,
                   // 	data: {

package/dist/hooks/index.js

@@ -1732,7 +1732,8 @@ function useSource({
   user = {},
   t = () => {},
   getData = () => {},
-  id
+  id,
+  stop
 }) {
   const [loading, setLoading] = React.useState(true);
   const [partners, setPartners] = React.useState([]);
@@ -1786,8 +1787,10 @@ function useSource({
         console.error("Error fetching partners:", error);
       }
     }
-    fetchPartners();
-  }, [user.language, id]);
+    if (!stop) {
+      fetchPartners();
+    }
+  }, [user.language, id, stop]);
   function handleSelectedPartnersChange(selected) {
     setSelectedPartners(prev => ({
       ...prev,
@@ -1813,9 +1816,6 @@ const useSources = ({
   stop
 }) => {
   function getData(params) {
-    if (stop) return Promise.resolve({
-      data: []
-    });
     if (id !== undefined && id !== null) {
       return SourceService$1.getSources({
         type,
@@ -1834,7 +1834,8 @@ const useSources = ({
     user,
     t,
     getData: getData,
-    id
+    id,
+    stop
   });
   const informationSources = partners?.length > 0 ? partners?.length - 1 : 0;
   return {
@@ -2306,46 +2307,35 @@ const useWidgetFetch = ({
   } = config;
   const [data, setData] = React.useState(defaultData || {});
   const [loading, setLoading] = React.useState(false);
-  const [initFetchDone, setInitFetchDone] = React.useState(false);
-  const isMounted = React.useRef(true);
   const fetchData = async () => {
     setLoading(true);
     try {
       const {
         data
       } = await getData(rest);
-      if (!isMounted.current) return;
-      setData(data || defaultData);
+      setData(data);
       if (isErrorResponse(data)) {
         const errorMessage = getErrorMessage(data);
         antd.message.error(errorMessage);
         return;
       }
       onFetch();
-      setInitFetchDone(true);
     } catch (err) {
       console.log(err);
-    }
-    if (isMounted.current) {
+    } finally {
       setLoading(false);
     }
   };
-  React.useEffect(() => {
-    isMounted.current = true;
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
   React.useEffect(() => {
     if (!stop) {
+      console.log('fetching data');
       fetchData();
     }
   }, [JSON.stringify(config), stop]);
   return {
     data,
     loading,
-    setData,
-    initFetchDone
+    setData
   };
 };