datastake-daf 0.6.848 → 0.6.849

package/dist/pages/index.js

@@ -61423,25 +61423,13 @@ const getColumns$1 = ({
 
 const checkboxConfig = {
   name: 'Name',
-  datastakeId: 'ID'
+  datastakeId: 'ID',
+  email: 'Email'
 };
 const getFiltersConfig = ({
   t
 }) => {
   return {
-    email: {
-      type: 'text',
-      label: 'Email',
-      placeholder: t => `${t('Filter by')} ${t('Email').toLowerCase()}`,
-      style: {
-        flex: 1
-      },
-      labelStyle: {
-        flex: 1
-      },
-      getLabel: option => option.label,
-      getValue: option => option.value
-    },
     status: {
       type: "select",
       label: "Status",
@@ -61481,7 +61469,8 @@ const getFiltersConfig = ({
 };
 const filtersConfig = {
   name: '',
-  datastakeId: ''
+  datastakeId: '',
+  email: ''
 };
 const getFilterOptions = (options, t) => {
   const {
@@ -61493,7 +61482,6 @@ const getFilterOptions = (options, t) => {
   const _default = {
     timeframe: timeframeOptions,
     email: emailOptions,
-    status: statusOptions,
     userRole: userRoleOptions,
     status: [{
       value: "active",
@@ -61653,7 +61641,6 @@ const UsersCreate = ({
             }
           }
         });
-        onCancel();
       }
     })
   });
@@ -61683,7 +61670,7 @@ const UsersTable = ({
   changeAjaxOptions = () => {},
   extendingFilters = {},
   userRoles = [],
-  breadCrumbs = []
+  breadcrumbs = []
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const params = new URLSearchParams(location?.search);
@@ -61723,10 +61710,11 @@ const UsersTable = ({
       onSubmitted: payload => {
         if (userToEdit) {
           onEditUser(payload);
+          onDrawerClose();
         } else {
           onInviteUser(payload);
+          onDrawerClose();
         }
-        onDrawerClose();
       },
       onCancel: () => {
         onDrawerClose();
@@ -61757,7 +61745,7 @@ const UsersTable = ({
     getAppHeader: getAppHeader,
     extendingFilters: extendingFilters,
     subject: "users",
-    breadcrumbs: breadCrumbs,
+    breadcrumbs: breadcrumbs,
     headerInfo: {
       title: "users",
       createTitle: "New User"
@@ -64567,7 +64555,7 @@ function ConflictManagement({
   // }, [t, APP, goTo]);
 
   const sourceOptions = React.useMemo(() => {
-    return partners.map(partner => {
+    return partners?.map(partner => {
       const isOwnData = partner.id === user?.company?.id;
       return {
         label: partner.nickName,
@@ -64598,7 +64586,7 @@ function ConflictManagement({
       }),
       addedHeader: /*#__PURE__*/jsxRuntime.jsx("div", {
         children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
-          options: [...sourceOptions],
+          options: [...(Array.isArray(sourceOptions) ? sourceOptions : [])],
           isAvatarGroup: true,
           canUnselectLast: false,
           onChange: selected => {
@@ -64610,7 +64598,7 @@ function ConflictManagement({
           },
           dropDownWidth: 200,
           selectionType: "checkbox",
-          defaultSelected: partners.map(p => p.id) || []
+          defaultSelected: partners?.map(p => p.id) || []
         }, partners?.length)
       })
     }),

package/package.json

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

package/src/@daf/pages/Dashboards/ConflictManagement/index.js

@@ -33,7 +33,7 @@ export default function ConflictManagement({
 	// }, [t, APP, goTo]);
 
 	const sourceOptions = useMemo(() => {
-		return partners.map((partner) => {
+		return partners?.map((partner) => {
 			const isOwnData = partner.id === user?.company?.id;
 
 			return {
@@ -69,7 +69,7 @@ export default function ConflictManagement({
 				addedHeader={
 					<div>
 						<Multiselect
-							options={[...sourceOptions]}
+							options={[...(Array.isArray(sourceOptions) ? sourceOptions : [])]}
 							isAvatarGroup
 							canUnselectLast={false}
 							key={partners?.length}
@@ -82,7 +82,7 @@ export default function ConflictManagement({
 							}}
 							dropDownWidth={200}
 							selectionType="checkbox"
-							defaultSelected={partners.map((p) => p.id) || []}
+							defaultSelected={partners?.map((p) => p.id) || []}
 						/>
 					</div>
 				}

package/src/@daf/pages/Users/config.js

@@ -1,21 +1,11 @@
 export const checkboxConfig = {
 	name: 'Name',
-	datastakeId: 'ID'
+	datastakeId: 'ID',
+	email: 'Email',
 }
 
 export const getFiltersConfig = ({t}) => {
     return {
-		email: {
-		  type: 'text',
-		  label: 'Email',
-		  placeholder: (t) => `${t('Filter by')} ${t('Email').toLowerCase()}`,
-		  style: { flex: 1 },
-		  labelStyle: { flex: 1 },
-		  getLabel: (option) => option.label,
-		  getValue: (option) => option.value,
-		},
-
-
 		status: {
 		  type: "select",
 		  label: "Status",
@@ -45,6 +35,7 @@ export const getFiltersConfig = ({t}) => {
 export const filtersConfig = {
 	name: '',
 	datastakeId: '',
+	email: ''
 };
 
 export const getFilterOptions = (options, t) => {
@@ -56,10 +47,9 @@ export const getFilterOptions = (options, t) => {
 	  } = options || {};
 
 	const _default  = {
-  timeframe: timeframeOptions,
-  email: emailOptions,
-  status: statusOptions,
-  userRole: userRoleOptions,
+		timeframe: timeframeOptions,
+		email: emailOptions,
+		userRole: userRoleOptions,
 		status: [
 			{
 				value: "active",

package/src/@daf/pages/Users/create.jsx

@@ -54,7 +54,6 @@ const UsersCreate = ({
                             },
                         },
                     });
-                    onCancel()
                 }}
             />
         </div>

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

@@ -31,7 +31,7 @@ const UsersTable = ({
   changeAjaxOptions = () => {},
   extendingFilters = {},
   userRoles = [],
-  breadCrumbs = []
+  breadcrumbs = []
 }) => {
   const [selectOptions, setSelectOptions] = useState();
   const params = new URLSearchParams(location?.search);
@@ -72,10 +72,11 @@ const UsersTable = ({
           onSubmitted={(payload) => {
             if (userToEdit) {
               onEditUser(payload);
+              onDrawerClose()
             } else {
               onInviteUser(payload);
+              onDrawerClose()
             }
-            onDrawerClose()
           }}
           onCancel={() => {
             onDrawerClose()
@@ -109,7 +110,7 @@ const UsersTable = ({
       getAppHeader={getAppHeader}
       extendingFilters={extendingFilters}
       subject="users"
-      breadcrumbs={breadCrumbs}
+      breadcrumbs={breadcrumbs}
       headerInfo={{
         title: "users",
         createTitle: "New User"