datastake-daf 0.6.800 → 0.6.801

package/dist/components/index.js

@@ -8501,22 +8501,20 @@ const useHeader = _ref => {
 const {
   useToken: useToken$m
 } = antd.theme;
-function BreadCrumbs(_ref) {
-  let {
-    breadcrumbs = [],
-    mainContWidth = 0
-  } = _ref;
+function BreadCrumbs({
+  breadcrumbs = [],
+  mainContWidth = 0
+}) {
   const [splitIndex, setSplitIndex] = React.useState(0);
   const {
     token
   } = useToken$m();
-  const _renderBreadcrumb = function (b, i, isLast) {
-    let noOnClickLast = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  const _renderBreadcrumb = (b, i, isLast, noOnClickLast = false) => {
     return /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "flex breadcrumb-item",
-      onClick: noOnClickLast && isLast ? undefined : b === null || b === void 0 ? void 0 : b.onClick,
+      onClick: noOnClickLast && isLast ? undefined : b?.onClick,
       children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-        children: b === null || b === void 0 ? void 0 : b.label
+        children: b?.label
       }), !isLast && /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "flex flex-column justify-content-center",
         children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
@@ -8526,7 +8524,7 @@ function BreadCrumbs(_ref) {
           color: token.baseGray50
         })
       })]
-    }, "breadcrumb-item-".concat(i));
+    }, `breadcrumb-item-${i}`);
   };
   React.useEffect(() => {
     const _placeholderCont = document.getElementById("header-breadcrumbs");
@@ -8569,7 +8567,7 @@ function BreadCrumbs(_ref) {
         placement: "bottomRight",
         menu: {
           items: groupedBreadCrumbs[2].map((it, i) => ({
-            key: "items-".concat(i),
+            key: `items-${i}`,
             label: it.label,
             onClick: it.onClick
           }))
@@ -9561,24 +9559,29 @@ const processConditionalTableKeys = (tableKeys, item) => {
   });
   return processedKeys;
 };
-const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, allValues, formValues = {}) => {
+const renderFieldData = function (type, value, user, config) {
+  let getApiBaseUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : () => {};
+  let getAppHeader = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : () => {};
+  let app = arguments.length > 6 ? arguments[6] : undefined;
+  let allValues = arguments.length > 7 ? arguments[7] : undefined;
+  let formValues = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : {};
   switch (type) {
     case 'year':
       return value !== '-' ? renderDateFormatted(value, 'YYYY', 'en') : '-';
     case 'date':
       {
-        const language = user?.language && user?.language === 'sp' ? 'es' : user?.language;
+        const language = user !== null && user !== void 0 && user.language && (user === null || user === void 0 ? void 0 : user.language) === 'sp' ? 'es' : user === null || user === void 0 ? void 0 : user.language;
         return value !== '-' ? renderDateFormatted(value, 'DD MMM YYYY', language || 'en') : '-';
       }
     case 'select':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const option = findOptions(value, options);
         return option;
       }
     case 'multiselect':
       {
-        const options = config?.options || [];
+        const options = (config === null || config === void 0 ? void 0 : config.options) || [];
         const _val = typeof value === 'string' ? value.split(',').map(v => v.trim()) : value;
         const option = findOptions(_val, options);
         return option.join(', ');
@@ -9593,7 +9596,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
         formValues: formValues
       });
     case 'percentage':
-      return value === '-' || value === null || value === undefined ? '-' : `${value} %`;
+      return value === '-' || value === null || value === undefined ? '-' : "".concat(value, " %");
     case 'geolocation':
       {
         const val = JSON.parse(value) || {};
@@ -9607,7 +9610,7 @@ const renderFieldData = (type, value, user, config, getApiBaseUrl = () => {}, ge
     case 'upload':
     case 'videoUpload':
       {
-        const documentName = allValues?.map(item => item?.name).join(', ');
+        const documentName = allValues === null || allValues === void 0 ? void 0 : allValues.map(item => item === null || item === void 0 ? void 0 : item.name).join(', ');
         return documentName;
       }
     default:

package/dist/pages/index.js

@@ -57749,20 +57749,19 @@ const usePrepareForm$1 = ({
       } = JSON.parse(JSON.stringify(allData[dKey][nKey] || {}));
       console.log("here", dKey, nKey);
       if (data.datastakeId === id || id === "user" || data.id === id) {
-        console.log("here2", data.datastakeId, id, data.id);
-        //   if (viewConfig.linkingSubjects.includes(namespace)) {
-        setForm({
-          ...form,
-          linking: {
-            position: 100,
-            excludeFromEdit: true,
-            label: t("Linked Subjects"),
-            template: "linkingSubjects"
-          }
-        });
-        //   } else {
-        //       setForm(form);
-        //   }
+        if (viewConfig.adminNamespaces.includes(namespace)) {
+          setForm(form);
+        } else {
+          setForm({
+            ...form,
+            linking: {
+              position: 100,
+              excludeFromEdit: true,
+              label: t("Linked Subjects"),
+              template: "linkingSubjects"
+            }
+          });
+        }
         setData(data);
         setGroups(config.groups || {});
         setLinkingForms(linkingForms);

package/package.json

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

package/src/@daf/pages/View/hooks/usePrepareForm.js

@@ -38,10 +38,11 @@ export const usePrepareForm = ({
               console.log("here", dKey, nKey)
   
               if (data.datastakeId === id || id === "user" || data.id === id) {
-                console.log("here2", data.datastakeId, id, data.id)
-                //   if (viewConfig.linkingSubjects.includes(namespace)) {
+                  if (viewConfig.adminNamespaces.includes(namespace)) {
+                    setForm(form);
+                  } else {
                       setForm({
-                          ...form,
+                        ...form,
                           linking: {
                               position: 100,
                               excludeFromEdit: true,
@@ -49,9 +50,7 @@ export const usePrepareForm = ({
                               template: "linkingSubjects",
                           },
                       });
-                //   } else {
-                //       setForm(form);
-                //   }
+                  }
                   setData(data);
                   setGroups(config.groups || {});
                   setLinkingForms(linkingForms);