datastake-daf 0.6.799 → 0.6.801

package/dist/pages/index.js

@@ -50942,7 +50942,7 @@ class AdminService extends BaseService {
     const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiPut({
       url: `/management/subject/${type}/${id}`,
-      data
+      data: filterCreateData(data)
     });
   }
   deleteSubject({
@@ -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);
@@ -58533,10 +58532,7 @@ const View = ({
     namespaceOverrides: namespaceOverrides
   });
   const groupForm = React.useMemo(() => {
-    // If no group is specified, use the first available group
-    const formKeys = Object.keys(form || {});
-    const selectedGroup = group || (formKeys.length > 0 ? formKeys[0] : null);
-    const gF = selectedGroup ? form[selectedGroup] || {} : {};
+    const gF = form[group] || {};
     if (subsection) {
       const sectionForms = groupSubsections(gF);
       if (sectionForms[subsection]) {
@@ -58660,7 +58656,7 @@ const View = ({
         actionButtons: actionButtons,
         extraButtons: extraPageActions,
         addedHeaderFirst: true,
-        addedHeader: /*#__PURE__*/jsxRuntime.jsx("div", {
+        addedHeader: namespaceConfig?.isAdmin ? null : /*#__PURE__*/jsxRuntime.jsx("div", {
           className: "flex flex-row gap-4",
           children: /*#__PURE__*/jsxRuntime.jsx(Multiselect, {
             options: [...sourceOptions],
@@ -58780,7 +58776,7 @@ const usePrepareForm = ({
             d[k] = undefined;
           }
         });
-        if (d.datastakeId === id || d.applicationId === id || id === "user") {
+        if (d.datastakeId === id || d.applicationId === id || id === "user" || d.id === id) {
           const formG = mapFormGroup(allData[dKey][nKey].form || {}, d);
           setForm(formG);
           if (setExtra) {

package/dist/services/index.js

@@ -683,6 +683,80 @@ class BaseService extends BaseHTTPService {
   }
 }
 
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+
+function createCommonjsModule(fn, module) {
+	return module = { exports: {} }, fn(module, module.exports), module.exports;
+}
+
+var customParseFormat = createCommonjsModule(function (module, exports) {
+!function(e,t){module.exports=t();}(commonjsGlobal,(function(){var e={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},t=/(\[[^[]*\])|([-_:/.,()\s]+)|(A|a|YYYY|YY?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g,n=/\d\d/,r=/\d\d?/,i=/\d*[^-_:/,()\s\d]+/,o={},s=function(e){return (e=+e)+(e>68?1900:2e3)};var a=function(e){return function(t){this[e]=+t;}},f=[/[+-]\d\d:?(\d\d)?|Z/,function(e){(this.zone||(this.zone={})).offset=function(e){if(!e)return 0;if("Z"===e)return 0;var t=e.match(/([+-]|\d\d)/g),n=60*t[1]+(+t[2]||0);return 0===n?0:"+"===t[0]?-n:n}(e);}],h=function(e){var t=o[e];return t&&(t.indexOf?t:t.s.concat(t.f))},u=function(e,t){var n,r=o.meridiem;if(r){for(var i=1;i<=24;i+=1)if(e.indexOf(r(i,0,t))>-1){n=i>12;break}}else n=e===(t?"pm":"PM");return n},d={A:[i,function(e){this.afternoon=u(e,!1);}],a:[i,function(e){this.afternoon=u(e,!0);}],S:[/\d/,function(e){this.milliseconds=100*+e;}],SS:[n,function(e){this.milliseconds=10*+e;}],SSS:[/\d{3}/,function(e){this.milliseconds=+e;}],s:[r,a("seconds")],ss:[r,a("seconds")],m:[r,a("minutes")],mm:[r,a("minutes")],H:[r,a("hours")],h:[r,a("hours")],HH:[r,a("hours")],hh:[r,a("hours")],D:[r,a("day")],DD:[n,a("day")],Do:[i,function(e){var t=o.ordinal,n=e.match(/\d+/);if(this.day=n[0],t)for(var r=1;r<=31;r+=1)t(r).replace(/\[|\]/g,"")===e&&(this.day=r);}],M:[r,a("month")],MM:[n,a("month")],MMM:[i,function(e){var t=h("months"),n=(h("monthsShort")||t.map((function(e){return e.slice(0,3)}))).indexOf(e)+1;if(n<1)throw new Error;this.month=n%12||n;}],MMMM:[i,function(e){var t=h("months").indexOf(e)+1;if(t<1)throw new Error;this.month=t%12||t;}],Y:[/[+-]?\d+/,a("year")],YY:[n,function(e){this.year=s(e);}],YYYY:[/\d{4}/,a("year")],Z:f,ZZ:f};function c(n){var r,i;r=n,i=o&&o.formats;for(var s=(n=r.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(t,n,r){var o=r&&r.toUpperCase();return n||i[r]||e[r]||i[o].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(e,t,n){return t||n.slice(1)}))}))).match(t),a=s.length,f=0;f<a;f+=1){var h=s[f],u=d[h],c=u&&u[0],l=u&&u[1];s[f]=l?{regex:c,parser:l}:h.replace(/^\[|\]$/g,"");}return function(e){for(var t={},n=0,r=0;n<a;n+=1){var i=s[n];if("string"==typeof i)r+=i.length;else {var o=i.regex,f=i.parser,h=e.slice(r),u=o.exec(h)[0];f.call(t,u),e=e.replace(u,"");}}return function(e){var t=e.afternoon;if(void 0!==t){var n=e.hours;t?n<12&&(e.hours+=12):12===n&&(e.hours=0),delete e.afternoon;}}(t),t}}return function(e,t,n){n.p.customParseFormat=!0,e&&e.parseTwoDigitYear&&(s=e.parseTwoDigitYear);var r=t.prototype,i=r.parse;r.parse=function(e){var t=e.date,r=e.utc,s=e.args;this.$u=r;var a=s[1];if("string"==typeof a){var f=!0===s[2],h=!0===s[3],u=f||h,d=s[2];h&&(d=s[2]),o=this.$locale(),!f&&d&&(o=n.Ls[d]),this.$d=function(e,t,n){try{if(["x","X"].indexOf(t)>-1)return new Date(("X"===t?1e3:1)*e);var r=c(t)(e),i=r.year,o=r.month,s=r.day,a=r.hours,f=r.minutes,h=r.seconds,u=r.milliseconds,d=r.zone,l=new Date,m=s||(i||o?1:l.getDate()),M=i||l.getFullYear(),Y=0;i&&!o||(Y=o>0?o-1:l.getMonth());var p=a||0,v=f||0,D=h||0,g=u||0;return d?new Date(Date.UTC(M,Y,m,p,v,D,g+60*d.offset*1e3)):n?new Date(Date.UTC(M,Y,m,p,v,D,g)):new Date(M,Y,m,p,v,D,g)}catch(e){return new Date("")}}(t,a,r),this.init(),d&&!0!==d&&(this.$L=this.locale(d).$L),u&&t!=this.format(a)&&(this.$d=new Date("")),o={};}else if(a instanceof Array)for(var l=a.length,m=1;m<=l;m+=1){s[1]=a[m-1];var M=n.apply(this,s);if(M.isValid()){this.$d=M.$d,this.$L=M.$L,this.init();break}m===l&&(this.$d=new Date(""));}else i.call(this,e);};}}));
+});
+
+var utc = createCommonjsModule(function (module, exports) {
+!function(t,i){module.exports=i();}(commonjsGlobal,(function(){var t="minute",i=/[+-]\d\d(?::?\d\d)?/g,e=/([+-]|\d\d)/g;return function(s,f,n){var u=f.prototype;n.utc=function(t){var i={date:t,utc:!0,args:arguments};return new f(i)},u.utc=function(i){var e=n(this.toDate(),{locale:this.$L,utc:!0});return i?e.add(this.utcOffset(),t):e},u.local=function(){return n(this.toDate(),{locale:this.$L,utc:!1})};var o=u.parse;u.parse=function(t){t.utc&&(this.$u=!0),this.$utils().u(t.$offset)||(this.$offset=t.$offset),o.call(this,t);};var r=u.init;u.init=function(){if(this.$u){var t=this.$d;this.$y=t.getUTCFullYear(),this.$M=t.getUTCMonth(),this.$D=t.getUTCDate(),this.$W=t.getUTCDay(),this.$H=t.getUTCHours(),this.$m=t.getUTCMinutes(),this.$s=t.getUTCSeconds(),this.$ms=t.getUTCMilliseconds();}else r.call(this);};var a=u.utcOffset;u.utcOffset=function(s,f){var n=this.$utils().u;if(n(s))return this.$u?0:n(this.$offset)?a.call(this):this.$offset;if("string"==typeof s&&(s=function(t){void 0===t&&(t="");var s=t.match(i);if(!s)return null;var f=(""+s[0]).match(e)||["-",0,0],n=f[0],u=60*+f[1]+ +f[2];return 0===u?0:"+"===n?u:-u}(s),null===s))return this;var u=Math.abs(s)<=16?60*s:s,o=this;if(f)return o.$offset=u,o.$u=0===s,o;if(0!==s){var r=this.$u?this.toDate().getTimezoneOffset():-1*this.utcOffset();(o=this.local().add(u+r,t)).$offset=u,o.$x.$localOffset=r;}else o=this.utc();return o};var h=u.format;u.format=function(t){var i=t||(this.$u?"YYYY-MM-DDTHH:mm:ss[Z]":"");return h.call(this,i)},u.valueOf=function(){var t=this.$utils().u(this.$offset)?0:this.$offset+(this.$x.$localOffset||this.$d.getTimezoneOffset());return this.$d.valueOf()-6e4*t},u.isUTC=function(){return !!this.$u},u.toISOString=function(){return this.toDate().toISOString()},u.toString=function(){return this.toDate().toUTCString()};var l=u.toDate;u.toDate=function(t){return "s"===t&&this.$offset?n(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate():l.call(this)};var c=u.diff;u.diff=function(t,i,e){if(t&&this.$u===t.$u)return c.call(this,t,i,e);var s=this.local(),f=n(t).local();return c.call(s,f,i,e)};}}));
+});
+
+var localizedFormat = createCommonjsModule(function (module, exports) {
+!function(e,t){module.exports=t();}(commonjsGlobal,(function(){var e={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"};return function(t,o,n){var r=o.prototype,i=r.format;n.en.formats=e,r.format=function(t){void 0===t&&(t="YYYY-MM-DDTHH:mm:ssZ");var o=this.$locale().formats,n=function(t,o){return t.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(t,n,r){var i=r&&r.toUpperCase();return n||o[r]||e[r]||o[i].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(e,t,o){return t||o.slice(1)}))}))}(t,void 0===o?{}:o);return i.call(this,n)};}}));
+});
+
+createCommonjsModule(function (module, exports) {
+!function(e,n){module.exports=n(dayjs__default["default"]);}(commonjsGlobal,(function(e){function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),i={name:"fr",weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinal:function(e){return ""+e+(1===e?"er":"")}};return t.default.locale(i,null,!0),i}));
+});
+
+createCommonjsModule(function (module, exports) {
+!function(e,o){module.exports=o(dayjs__default["default"]);}(commonjsGlobal,(function(e){function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"es",monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"}};return s.default.locale(d,null,!0),d}));
+});
+
+createCommonjsModule(function (module, exports) {
+!function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}}));
+});
+
+/* eslint-disable no-case-declarations */
+dayjs__default["default"].extend(customParseFormat);
+dayjs__default["default"].extend(utc);
+dayjs__default["default"].extend(utc);
+dayjs__default["default"].extend(localizedFormat);
+const isObjectEmpty = obj => {
+  if (obj === null || typeof obj !== "object") {
+    return false;
+  }
+  if (Object.keys(obj).length === 0) {
+    return true;
+  }
+  return Object.values(obj).every(value => isObjectEmpty(value));
+};
+
+/**
+ * Filters and processes the input data by extracting specific properties.
+ * It checks if the 'meta' property is empty and sets it to undefined if so,
+ * then returns the rest of the data merged with the processed 'meta'. Used to clear data
+ * when they are sent to backend.
+ *
+ * @param {Object} data - The input data object containing various properties.
+ * @returns {Object} - The processed data object with filtered properties.
+ */
+
+const filterCreateData = data => {
+  // eslint-disable-next-line no-unused-vars
+  const {
+    view,
+    module,
+    scope,
+    form,
+    meta,
+    createdAt,
+    updatedAt,
+    ...rest
+  } = data;
+  const _meta = isObjectEmpty(meta) ? undefined : meta;
+  return {
+    ...rest,
+    meta: _meta
+  };
+};
+
 class AdminService extends BaseService {
   updateCompany(id, data) {
     return this.apiPut({
@@ -860,7 +934,7 @@ class AdminService extends BaseService {
     const type = subject === 'location' ? 'location' : 'stakeholder';
     return this.apiPut({
       url: `/management/subject/${type}/${id}`,
-      data
+      data: filterCreateData(data)
     });
   }
   deleteSubject({
@@ -1349,80 +1423,6 @@ class DashboardService extends BaseService {
 }
 var DashboardService$1 = createLazyService(DashboardService);
 
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-function createCommonjsModule(fn, module) {
-	return module = { exports: {} }, fn(module, module.exports), module.exports;
-}
-
-var customParseFormat = createCommonjsModule(function (module, exports) {
-!function(e,t){module.exports=t();}(commonjsGlobal,(function(){var e={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},t=/(\[[^[]*\])|([-_:/.,()\s]+)|(A|a|YYYY|YY?|MM?M?M?|Do|DD?|hh?|HH?|mm?|ss?|S{1,3}|z|ZZ?)/g,n=/\d\d/,r=/\d\d?/,i=/\d*[^-_:/,()\s\d]+/,o={},s=function(e){return (e=+e)+(e>68?1900:2e3)};var a=function(e){return function(t){this[e]=+t;}},f=[/[+-]\d\d:?(\d\d)?|Z/,function(e){(this.zone||(this.zone={})).offset=function(e){if(!e)return 0;if("Z"===e)return 0;var t=e.match(/([+-]|\d\d)/g),n=60*t[1]+(+t[2]||0);return 0===n?0:"+"===t[0]?-n:n}(e);}],h=function(e){var t=o[e];return t&&(t.indexOf?t:t.s.concat(t.f))},u=function(e,t){var n,r=o.meridiem;if(r){for(var i=1;i<=24;i+=1)if(e.indexOf(r(i,0,t))>-1){n=i>12;break}}else n=e===(t?"pm":"PM");return n},d={A:[i,function(e){this.afternoon=u(e,!1);}],a:[i,function(e){this.afternoon=u(e,!0);}],S:[/\d/,function(e){this.milliseconds=100*+e;}],SS:[n,function(e){this.milliseconds=10*+e;}],SSS:[/\d{3}/,function(e){this.milliseconds=+e;}],s:[r,a("seconds")],ss:[r,a("seconds")],m:[r,a("minutes")],mm:[r,a("minutes")],H:[r,a("hours")],h:[r,a("hours")],HH:[r,a("hours")],hh:[r,a("hours")],D:[r,a("day")],DD:[n,a("day")],Do:[i,function(e){var t=o.ordinal,n=e.match(/\d+/);if(this.day=n[0],t)for(var r=1;r<=31;r+=1)t(r).replace(/\[|\]/g,"")===e&&(this.day=r);}],M:[r,a("month")],MM:[n,a("month")],MMM:[i,function(e){var t=h("months"),n=(h("monthsShort")||t.map((function(e){return e.slice(0,3)}))).indexOf(e)+1;if(n<1)throw new Error;this.month=n%12||n;}],MMMM:[i,function(e){var t=h("months").indexOf(e)+1;if(t<1)throw new Error;this.month=t%12||t;}],Y:[/[+-]?\d+/,a("year")],YY:[n,function(e){this.year=s(e);}],YYYY:[/\d{4}/,a("year")],Z:f,ZZ:f};function c(n){var r,i;r=n,i=o&&o.formats;for(var s=(n=r.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(t,n,r){var o=r&&r.toUpperCase();return n||i[r]||e[r]||i[o].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(e,t,n){return t||n.slice(1)}))}))).match(t),a=s.length,f=0;f<a;f+=1){var h=s[f],u=d[h],c=u&&u[0],l=u&&u[1];s[f]=l?{regex:c,parser:l}:h.replace(/^\[|\]$/g,"");}return function(e){for(var t={},n=0,r=0;n<a;n+=1){var i=s[n];if("string"==typeof i)r+=i.length;else {var o=i.regex,f=i.parser,h=e.slice(r),u=o.exec(h)[0];f.call(t,u),e=e.replace(u,"");}}return function(e){var t=e.afternoon;if(void 0!==t){var n=e.hours;t?n<12&&(e.hours+=12):12===n&&(e.hours=0),delete e.afternoon;}}(t),t}}return function(e,t,n){n.p.customParseFormat=!0,e&&e.parseTwoDigitYear&&(s=e.parseTwoDigitYear);var r=t.prototype,i=r.parse;r.parse=function(e){var t=e.date,r=e.utc,s=e.args;this.$u=r;var a=s[1];if("string"==typeof a){var f=!0===s[2],h=!0===s[3],u=f||h,d=s[2];h&&(d=s[2]),o=this.$locale(),!f&&d&&(o=n.Ls[d]),this.$d=function(e,t,n){try{if(["x","X"].indexOf(t)>-1)return new Date(("X"===t?1e3:1)*e);var r=c(t)(e),i=r.year,o=r.month,s=r.day,a=r.hours,f=r.minutes,h=r.seconds,u=r.milliseconds,d=r.zone,l=new Date,m=s||(i||o?1:l.getDate()),M=i||l.getFullYear(),Y=0;i&&!o||(Y=o>0?o-1:l.getMonth());var p=a||0,v=f||0,D=h||0,g=u||0;return d?new Date(Date.UTC(M,Y,m,p,v,D,g+60*d.offset*1e3)):n?new Date(Date.UTC(M,Y,m,p,v,D,g)):new Date(M,Y,m,p,v,D,g)}catch(e){return new Date("")}}(t,a,r),this.init(),d&&!0!==d&&(this.$L=this.locale(d).$L),u&&t!=this.format(a)&&(this.$d=new Date("")),o={};}else if(a instanceof Array)for(var l=a.length,m=1;m<=l;m+=1){s[1]=a[m-1];var M=n.apply(this,s);if(M.isValid()){this.$d=M.$d,this.$L=M.$L,this.init();break}m===l&&(this.$d=new Date(""));}else i.call(this,e);};}}));
-});
-
-var utc = createCommonjsModule(function (module, exports) {
-!function(t,i){module.exports=i();}(commonjsGlobal,(function(){var t="minute",i=/[+-]\d\d(?::?\d\d)?/g,e=/([+-]|\d\d)/g;return function(s,f,n){var u=f.prototype;n.utc=function(t){var i={date:t,utc:!0,args:arguments};return new f(i)},u.utc=function(i){var e=n(this.toDate(),{locale:this.$L,utc:!0});return i?e.add(this.utcOffset(),t):e},u.local=function(){return n(this.toDate(),{locale:this.$L,utc:!1})};var o=u.parse;u.parse=function(t){t.utc&&(this.$u=!0),this.$utils().u(t.$offset)||(this.$offset=t.$offset),o.call(this,t);};var r=u.init;u.init=function(){if(this.$u){var t=this.$d;this.$y=t.getUTCFullYear(),this.$M=t.getUTCMonth(),this.$D=t.getUTCDate(),this.$W=t.getUTCDay(),this.$H=t.getUTCHours(),this.$m=t.getUTCMinutes(),this.$s=t.getUTCSeconds(),this.$ms=t.getUTCMilliseconds();}else r.call(this);};var a=u.utcOffset;u.utcOffset=function(s,f){var n=this.$utils().u;if(n(s))return this.$u?0:n(this.$offset)?a.call(this):this.$offset;if("string"==typeof s&&(s=function(t){void 0===t&&(t="");var s=t.match(i);if(!s)return null;var f=(""+s[0]).match(e)||["-",0,0],n=f[0],u=60*+f[1]+ +f[2];return 0===u?0:"+"===n?u:-u}(s),null===s))return this;var u=Math.abs(s)<=16?60*s:s,o=this;if(f)return o.$offset=u,o.$u=0===s,o;if(0!==s){var r=this.$u?this.toDate().getTimezoneOffset():-1*this.utcOffset();(o=this.local().add(u+r,t)).$offset=u,o.$x.$localOffset=r;}else o=this.utc();return o};var h=u.format;u.format=function(t){var i=t||(this.$u?"YYYY-MM-DDTHH:mm:ss[Z]":"");return h.call(this,i)},u.valueOf=function(){var t=this.$utils().u(this.$offset)?0:this.$offset+(this.$x.$localOffset||this.$d.getTimezoneOffset());return this.$d.valueOf()-6e4*t},u.isUTC=function(){return !!this.$u},u.toISOString=function(){return this.toDate().toISOString()},u.toString=function(){return this.toDate().toUTCString()};var l=u.toDate;u.toDate=function(t){return "s"===t&&this.$offset?n(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate():l.call(this)};var c=u.diff;u.diff=function(t,i,e){if(t&&this.$u===t.$u)return c.call(this,t,i,e);var s=this.local(),f=n(t).local();return c.call(s,f,i,e)};}}));
-});
-
-var localizedFormat = createCommonjsModule(function (module, exports) {
-!function(e,t){module.exports=t();}(commonjsGlobal,(function(){var e={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"};return function(t,o,n){var r=o.prototype,i=r.format;n.en.formats=e,r.format=function(t){void 0===t&&(t="YYYY-MM-DDTHH:mm:ssZ");var o=this.$locale().formats,n=function(t,o){return t.replace(/(\[[^\]]+])|(LTS?|l{1,4}|L{1,4})/g,(function(t,n,r){var i=r&&r.toUpperCase();return n||o[r]||e[r]||o[i].replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g,(function(e,t,o){return t||o.slice(1)}))}))}(t,void 0===o?{}:o);return i.call(this,n)};}}));
-});
-
-createCommonjsModule(function (module, exports) {
-!function(e,n){module.exports=n(dayjs__default["default"]);}(commonjsGlobal,(function(e){function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=n(e),i={name:"fr",weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinal:function(e){return ""+e+(1===e?"er":"")}};return t.default.locale(i,null,!0),i}));
-});
-
-createCommonjsModule(function (module, exports) {
-!function(e,o){module.exports=o(dayjs__default["default"]);}(commonjsGlobal,(function(e){function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var s=o(e),d={name:"es",monthsShort:"ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),weekStart:1,formats:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:function(e){return e+"º"}};return s.default.locale(d,null,!0),d}));
-});
-
-createCommonjsModule(function (module, exports) {
-!function(e,n){module.exports=n();}(commonjsGlobal,(function(){return {name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(e){var n=["th","st","nd","rd"],t=e%100;return "["+e+(n[(t-20)%10]||n[t]||n[0])+"]"}}}));
-});
-
-/* eslint-disable no-case-declarations */
-dayjs__default["default"].extend(customParseFormat);
-dayjs__default["default"].extend(utc);
-dayjs__default["default"].extend(utc);
-dayjs__default["default"].extend(localizedFormat);
-const isObjectEmpty = obj => {
-  if (obj === null || typeof obj !== "object") {
-    return false;
-  }
-  if (Object.keys(obj).length === 0) {
-    return true;
-  }
-  return Object.values(obj).every(value => isObjectEmpty(value));
-};
-
-/**
- * Filters and processes the input data by extracting specific properties.
- * It checks if the 'meta' property is empty and sets it to undefined if so,
- * then returns the rest of the data merged with the processed 'meta'. Used to clear data
- * when they are sent to backend.
- *
- * @param {Object} data - The input data object containing various properties.
- * @returns {Object} - The processed data object with filtered properties.
- */
-
-const filterCreateData = data => {
-  // eslint-disable-next-line no-unused-vars
-  const {
-    view,
-    module,
-    scope,
-    form,
-    meta,
-    createdAt,
-    updatedAt,
-    ...rest
-  } = data;
-  const _meta = isObjectEmpty(meta) ? undefined : meta;
-  return {
-    ...rest,
-    meta: _meta
-  };
-};
-
 dayjs__default["default"].extend(utc);
 const removeKeysFromObject = (obj = {}, keys = []) => {
   if (typeof obj !== 'object' || obj === null) return obj;

package/package.json

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

package/src/@daf/core/components/Screens/Admin/AdminScreens/Location.jsx

@@ -41,7 +41,8 @@ export default function AdminLocationScreen({ config }) {
 		headerTitle = "location",
 		breadcrumbs,
 		refetchTrigger,
-		getData
+		getData,
+		user,
 	} = config;
 
 	const handleMergeLocations = useCallback(
@@ -89,6 +90,8 @@ export default function AdminLocationScreen({ config }) {
 					countries: options?.countries,
 				},
 			}}
+			user={user}
+			options={options}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminScreens/Subjects.jsx

@@ -42,6 +42,7 @@ export default function AdminSubjectsScreen({ config }) {
 		breadcrumbs,
 		refetchTrigger,
 		getData,
+		user,
 	} = config;
 
 	const handleMergeSubjects = useCallback(
@@ -89,6 +90,8 @@ export default function AdminSubjectsScreen({ config }) {
 					countries: options?.countries,
 				},
 			}}
+			user={user}
+			options={options}
 		/>
 	);
 }

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/column.js

@@ -13,6 +13,8 @@ export const getColumns = ({
 	setSelectedLocations,
 	selectOptions,
 	entity,
+	user,
+	options,
 }) => {
 	const cols = [
 		{
@@ -105,7 +107,7 @@ export const getColumns = ({
 			},
 		},
 	{
-		title: t("Admin Level 1"),
+		title: findOptions(user?.company?.country, options?.administrativeLevel1)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel1) : t("Province"),
 		dataIndex: "administrativeLevel1",
 		key: "administrativeLevel1",
 		ellipsis: true,
@@ -126,7 +128,7 @@ export const getColumns = ({
 		},
 	},
 	{
-		title: t("Admin Level 2"),
+		title: findOptions(user?.company?.country, options?.administrativeLevel2)?.length > 2 ? findOptions(user?.company?.country, options?.administrativeLevel2) : t("Territory"),
 		dataIndex: "administrativeLevel2",
 		key: "administrativeLevel2",
 		show: entity.includes("location"),

package/src/@daf/core/components/Screens/Admin/AdminTables/LocationTable/index.jsx

@@ -31,6 +31,8 @@ export default function LocationTable({
 	breadcrumbs,
 	mergeLocationsFunction,
 	refetchTrigger,
+	user,
+	options,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -116,7 +118,9 @@ export default function LocationTable({
 			setSelectedLocations,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle
+			entity: headerTitle,
+			user,
+			options,
 		});
 	}, [t, goTo, module, token, selectedLocations, getRedirectLink, selectOptions, headerTitle]);
 

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/columns.js

@@ -13,6 +13,7 @@ export const getColumns = ({
 	setSelectedSubjects,
 	selectOptions,
 	entity,
+	options,
 }) => {
 	const cols = [
 		{
@@ -84,7 +85,8 @@ export const getColumns = ({
 					return <div className="daf-default-cell" />;
 				}
 
-				const category = findOptions(value, selectOptions?.category || []) || "--";
+				console.log({value, options})
+				const category = findOptions(value, options?.categoriesOptions || []) || "-";
 
 				return <Tooltip title={category}>{category}</Tooltip>;
 			},
@@ -99,7 +101,7 @@ export const getColumns = ({
 				if (all.empty) {
 					return <div className="daf-default-cell" />;
 				}
-				const country = findOptions(value, selectOptions?.country || []) || "--";
+				const country = findOptions(value, options?.countries || []) || "-";
 
 				return <Tooltip title={country}>{country}</Tooltip>;
 			},

package/src/@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/index.jsx

@@ -31,6 +31,8 @@ export default function SubjectsTable({
 	breadcrumbs,
 	mergeSubjectsFunction,
 	refetchTrigger,
+	user,
+	options,
 }) {
 	const [showFilters, setShowFilters] = useState(false);
 	const [hasError, setHasError] = useState(false);
@@ -116,9 +118,10 @@ const getDataWithStringPagination = async ({ params }) => {
 			setSelectedSubjects,
 			getRedirectLink,
 			selectOptions,
-			entity: headerTitle
+			entity: headerTitle,
+			options,
 		});
-	}, [t, goTo, module, token, selectedSubjects, getRedirectLink, selectOptions, headerTitle]);
+	}, [t, goTo, module, token, selectedSubjects, getRedirectLink, selectOptions, headerTitle, options]);
 
 	return (
 		<>

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -158,50 +158,6 @@ export function getAdminRoutes(config) {
           },
         ]
       : []),
-    ...(typeof useAdminLocationViewConfig === "function"
-      ? [
-          // {
-          //   path: "view/management-location/:id",
-          //   key: `${APP_PREFIX}_ADMIN_LOCATION_VIEW`,
-          //   exact: true,
-          //   visible: (user) => userIsAdmin(user),
-          //   component: <LocationViewWrapper />,
-          // },
-        ]
-      : []),
-    ...(typeof useAdminSubjectsViewConfig === "function"
-      ? [
-          {
-            path: "view/management-stakeholder/:id",
-            key: `${APP_PREFIX}_ADMIN_STAKEHOLDER_VIEW`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <StakeholderViewWrapper />,
-          },
-        ]
-      : []),
-    ...(typeof useAdminLocationViewConfig === "function"
-      ? [
-          {
-            path: "edit/management-location/:id",
-            key: `${APP_PREFIX}_ADMIN_LOCATION_EDIT`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <LocationEditWrapper />,
-          },
-        ]
-      : []),
-    ...(typeof useAdminSubjectsViewConfig === "function"
-      ? [
-          {
-            path: "edit/management-stakeholder/:id",
-            key: `${APP_PREFIX}_ADMIN_STAKEHOLDER_EDIT`,
-            exact: true,
-            visible: (user) => userIsAdmin(user),
-            component: <StakeholderEditWrapper />,
-          },
-        ]
-      : []),
   ];
 
   return routes;

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

@@ -36,7 +36,7 @@ export const usePrepareForm = ({
 						d[k] = undefined;
 					}
 				});
-				if (d.datastakeId === id || d.applicationId === id || id === "user") {
+				if (d.datastakeId === id || d.applicationId === id || id === "user" || d.id === id) {
 					const formG = mapFormGroup(allData[dKey][nKey].form || {}, d);
 					setForm(formG);
 

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);

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

@@ -116,11 +116,7 @@ const View = ({
 	});
 
     const groupForm = useMemo(() => {
-		// If no group is specified, use the first available group
-		const formKeys = Object.keys(form || {});
-		const selectedGroup = group || (formKeys.length > 0 ? formKeys[0] : null);
-		const gF = selectedGroup ? (form[selectedGroup] || {}) : {};
-		
+		const gF = form[group] || {};
 		if (subsection) {
 			const sectionForms = groupSubsections(gF);
 			if (sectionForms[subsection]) {
@@ -241,7 +237,7 @@ const View = ({
                     extraButtons={extraPageActions}
                     addedHeaderFirst
                     addedHeader={
-                        <div className="flex flex-row gap-4">
+                        namespaceConfig?.isAdmin ? null : <div className="flex flex-row gap-4">
                             <Multiselect
                                 options={[...sourceOptions]}
                                 isAvatarGroup

package/src/@daf/services/AdminService.js

@@ -1,5 +1,6 @@
 import { BaseService } from './BaseService.js';
 import { createLazyService } from './helpers/LazyService.js';
+import { filterCreateData } from "../../helpers/Forms.js";
 
 class AdminService extends BaseService {
     updateCompany(id, data) {
@@ -165,7 +166,7 @@ class AdminService extends BaseService {
       const type = subject === 'location' ? 'location' : 'stakeholder';
       return this.apiPut({
         url: `/management/subject/${type}/${id}`,
-        data,
+        data: filterCreateData(data),
       });
     }