datastake-daf 0.6.728 → 0.6.730

package/dist/services/index.js

@@ -4,10 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var axios = require('axios');
 require('antd');
+require('moment');
+require('lodash');
+var dayjs = require('dayjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
+var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 
 const cleanJSON = json => {
   for (let key in json) {
@@ -1227,6 +1231,214 @@ 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;
+  const result = {};
+  for (const key of Object.keys(obj)) {
+    if (!keys.includes(key)) {
+      result[key] = obj[key];
+    }
+  }
+  return result;
+};
+
+const getNamespace = namespace => {
+  console.log({
+    namespace
+  });
+  let _namespace = namespace;
+  switch (namespace) {
+    case "locations":
+      _namespace = "location";
+      break;
+    case "stakeholders":
+      _namespace = "stakeholder";
+      break;
+    case "documents":
+      _namespace = "document";
+      break;
+    case "nashirikiEvent":
+    case "events":
+      _namespace = "event";
+      break;
+  }
+  return _namespace;
+};
+class LinkedSubjectsService extends BaseService {
+  getForm({
+    namespace
+  }, language = "en") {
+    return this.apiGet({
+      url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
+      isApp: true,
+      params: {
+        scope: "create",
+        language
+      }
+    });
+  }
+  getWithModule({
+    query,
+    signal,
+    namespace
+  }) {
+    const _namespace = getNamespace(namespace);
+    return this.apiGet({
+      url: `/${_namespace}/associated-information`,
+      isApp: true,
+      params: query,
+      signal
+    });
+  }
+  getOne({
+    id,
+    signal,
+    namespace,
+    sourceId
+  }) {
+    return this.apiGet({
+      url: `/${namespace === "nashirikiEvent" ? "event" : namespace}/${id}`,
+      isApp: true,
+      signal,
+      params: {
+        authorId: sourceId
+      }
+    });
+  }
+  getData(query, namespace) {
+    return this.apiGet({
+      url: `/${namespace}/data`,
+      isApp: true,
+      params: query
+    });
+  }
+  save(payload, namespace) {
+    if (payload.datastakeId) {
+      let _namespace = getNamespace(namespace);
+      const keysToRemove = ['associatedSubjects', 'authorId', 'channels', 'form', 'createdAt', 'meta', 'module', 'updatedAt', 'published', 'version', 'sbgi'];
+      const filteredData = removeKeysFromObject(payload, keysToRemove);
+      return this.apiPut({
+        url: `/${_namespace}/${filteredData.id}`,
+        isApp: true,
+        data: filterCreateData(filteredData)
+      });
+    }
+    return this.apiPost({
+      url: `/${getNamespace(namespace)}`,
+      isApp: true,
+      data: payload
+    });
+  }
+  remove(id, data, namespace, mod) {
+    if (mod) {
+      return this.apiDelete({
+        url: `/${namespace}/${id}`,
+        isApp: true,
+        data: data
+      });
+    }
+    return this.apiDelete({
+      url: `/${namespace}/${id}/remove`,
+      data: data
+    });
+  }
+  getLinkedSubjects({
+    namespace,
+    id
+  }) {
+    const _namespace = getNamespace(namespace);
+    return this.apiGet({
+      url: `/${namespace === "events" ? "event" : _namespace}/${id}/linkedSubjects`,
+      isApp: true
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      url: `/forms/options`,
+      isApp: true,
+      params: {
+        id: "categoryOptions,locationCategories,countries,category,subCategory,optionPositionSupplyChain"
+      }
+    });
+  }
+}
+var LinkedSubjects = createLazyService(LinkedSubjectsService);
+
 exports.AdminService = AdminService$1;
 exports.AuthenticationService = AuthenticationService$1;
 exports.BaseHTTPService = BaseHTTPService;
@@ -1236,6 +1448,7 @@ exports.DashboardService = DashboardService$1;
 exports.DataStoreService = DataStoreService$1;
 exports.ErrorHandler = ErrorHandler;
 exports.ErrorService = ErrorService;
+exports.LinkedSubjectsService = LinkedSubjects;
 exports.NotificationService = NotificationService$1;
 exports.QueryService = QueryService$1;
 exports.SourceService = SourceService$1;

package/dist/style/datastake/datastake.css

@@ -1775,8 +1775,8 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   padding: 30px var(--size-lg);
 }
 
-.components-layout .sidenav-cont .sidenav-footer .text-col h6 {
-  color: var(--custom-sidenav-text-color, white) !important;
+.components-layout .sidenav-cont .sidenav-footer h6 {
+  color: white;
   font-size: 10px;
   font-weight: 500;
   margin-bottom: 6px;

package/dist/utils/index.js

@@ -5888,6 +5888,28 @@ const changeInputMeta = ({
 const renderDateFormatted = (value, format = "DD MMM YYYY", locale = "en") => {
   return dayjs__default["default"].utc(value, "YYYY-MM-DD").locale(locale).format(format);
 };
+/**
+ * Sorts a form object by its inputs' positions.
+ *
+ * @param {Object} form - The form object containing various inputs.
+ * @returns {Object} - The sorted form object.
+ */
+const sortForm = ({
+  form
+}) => {
+  const _form = Object.keys(form).reduce((all, key) => {
+    const _this = Object.keys(form[key]).sort((a, b) => form[key][a].position - form[key][b].position).reduce((all, k) => {
+      if (k === "scope") {
+        return all;
+      }
+      all[k] = form[key][k];
+      return all;
+    }, {});
+    all[key] = _this;
+    return all;
+  }, {});
+  return _form;
+};
 
 ({
   background: PropTypes__default["default"].string,
@@ -14413,6 +14435,7 @@ exports.renderTooltipJsx = renderTooltipJsx;
 exports.safeJsonParse = safeJsonParse;
 exports.showHideInput = showHideInput;
 exports.snakeCaseToTitleCase = snakeCaseToTitleCase;
+exports.sortForm = sortForm;
 exports.splitStringInMultipleLines = splitStringInMultipleLines;
 exports.tazamaTheme = tazamaTheme;
 exports.tifTheme = tifTheme;

package/package.json

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

package/src/@daf/core/components/Sidenav/index.jsx

@@ -24,7 +24,6 @@ export default function Sidenav({
   hoverContentSecond,
   t = (s) => s,
   isDatastake = false,
-  logoVariant = "white", 
 }) {
   return (
     <ConfigProvider
@@ -70,15 +69,10 @@ export default function Sidenav({
           {hoverContentSecond}
         </div>
         {isDatastake && !isCollapsed ? (
-          <div className="sidenav-footer text-col"  >
-            <h6 style={{ color: logoVariant === "black" ? "#B5B5C3" : "white" }}>
-              {t("Powered By")}
-            </h6>
+          <div className="sidenav-footer">
+            <h6>{t("Powered By")}</h6>
             <img
-              src={
-                poweredByLogo ||
-                `/assets/favicons/datastake-${logoVariant}.svg`
-              }
+              src={poweredByLogo || "/assets/images/datastake-white.svg"}
               alt="logo"
             />
           </div>
@@ -287,10 +281,8 @@ Sidenav.propTypes = {
   topHoverSecond: propTypes.any,
   hoverItemSecond: propTypes.any,
   widthHoverSecond: propTypes.any,
-  poweredByLogo: propTypes.any,
   hoverContentSecond: propTypes.any,
   t: propTypes.any,
   isDatastake: propTypes.any,
-  logoVariant: propTypes.oneOf(["white", "black"]),
 };
 

package/src/@daf/core/components/Table/index.jsx

@@ -44,7 +44,7 @@ export default function DAFTable({
     if (!filtersInit && !loading) {
       setFiltersInit(true);
     }
-  }, [loading]);
+  }, [loading, filtersInit]);
 
   const sources = useMemo(() => {
     if (projectData) {
@@ -61,34 +61,40 @@ export default function DAFTable({
     return undefined;
   }, [projectData, sourceId, projectSources]);
 
-  const _selectOptions = typeof sourcesKey === 'string' && sources ? {
-    ...selectOptions,
-    [sourcesKey]: sources,
-  } : selectOptions;
-  const _filtersConfig = typeof sourcesKey === 'string' && sources ? {
-    ...filtersConfig,
-    [sourcesKey]: {
-      type: "select",
-      label: t("Source"),
-      placeholder: (t) => `${t("Filter By")} ${t('Source')}`,
-      labelStyle: { flex: 1 },
-      style: {
-        flex: 1,
+  const _selectOptions = useMemo(() => {
+    return typeof sourcesKey === 'string' && sources ? {
+      ...selectOptions,
+      [sourcesKey]: sources,
+    } : selectOptions;
+  }, [sourcesKey, sources, selectOptions]);
+
+  const _filtersConfig = useMemo(() => {
+    return typeof sourcesKey === 'string' && sources ? {
+      ...filtersConfig,
+      [sourcesKey]: {
+        type: "select",
+        label: t("Source"),
+        placeholder: (t) => `${t("Filter By")} ${t('Source')}`,
+        labelStyle: { flex: 1 },
+        style: {
+          flex: 1,
+        },
+        getLabel: (opt) => opt.label,
+        getValue: (opt) => opt.value,
       },
-      getLabel: (opt) => opt.label,
-      getValue: (opt) => opt.value,
-    },
-  } : filtersConfig;
+    } : filtersConfig;
+  }, [sourcesKey, sources, filtersConfig, t]);
 
   useEffect(() => {
     if (data) {
       setSource(data);
     }
-  }, [data]);
+  }, [data.length]);
 
+  const paginationPageSize = pagination?.pageSize;
   const dataSource = useMemo(() => {
-    const pageSize = pagination?.pageSize
-    ? pagination.pageSize
+    const pageSize = paginationPageSize
+    ? paginationPageSize
     : source.length > 10 ? source.length : 10;
     
     if (doEmptyRows && pageSize) {
@@ -101,7 +107,7 @@ export default function DAFTable({
       return emptyDataSource.map((empty, i) => source[i] || empty);
     }
     return source;
-  }, [source, pagination]);
+  }, [source, paginationPageSize, doEmptyRows]);
 
   return <>
     {(showFilters && filtersConfig && onFilterChange && filtersInit) && (

package/src/@daf/hooks/useFilters.js

@@ -91,7 +91,7 @@ export const useFilters = ({
               : `${`/app/${module}/${view}`}`);
       }
     }
-  }, [module, view, location.pathname]); // Updated dependency array
+  }, [module, view, location.pathname, goTo, getRedirectLink, doPagination]);
 
   const defaultFilters = useMemo(() => {
     const def = {};

package/src/@daf/hooks/useGetQueryParams.js

@@ -0,0 +1,26 @@
+import { useMemo } from "react";
+import { safeJsonParse } from "../../helpers/StringHelper.js";
+
+export const useGetQueryParams = ({location}) => {
+    const queryParams = useMemo(() => {
+        const params = new URLSearchParams(location?.search);
+        return Object.fromEntries(params.entries());
+    }, [location.search]);
+
+    const params = useMemo(() => {
+        const { page, pageSize, search, searchParams: rawSearchParams, ...rest } = queryParams;
+          
+        return {
+          paginationQuery: { page, pageSize },
+          searchParams: {
+            qs: search,
+            fields: safeJsonParse(rawSearchParams),
+          },
+          otherParams: {
+            ...rest,
+          }
+        };
+      }, [queryParams]);
+
+    return params;
+}

package/src/@daf/layouts/AppLayout/components/Sidenav/index.js

@@ -88,7 +88,6 @@ const Sidenav = ({
   getRedirectLink = () => {},
   isDatastake,
   selectedProject,
-  logoVariant = "white",
 }) => {
   const hoverDiv = useRef();
   const hoverDivSecond = useRef();
@@ -249,7 +248,6 @@ const Sidenav = ({
         hoverContentSecond={hoverContentSecond}
         t={t}
         isDatastake={isDatastake}
-        logoVariant={logoVariant}
       >
         {showMenu ? (
           <SidenavMenu

package/src/@daf/layouts/AppLayout/index.jsx

@@ -126,9 +126,6 @@ function AppLayout({
   // Theme
   theme = {},
   
-  // Logo variant
-  logoVariant = "white",
-  
   // Children
   children,
 }) {
@@ -168,8 +165,6 @@ function AppLayout({
     }
   };
 
-
-
   const logOut = () => {
     sessionStorage.removeItem('notifications');
     if (hasPrevious) {
@@ -283,8 +278,7 @@ function AppLayout({
             isDatastake={isDatastake}          
             selectedProject={selectedProject}  
             userHelpers={userHelpers}          
-            isDev={isDev}
-            logoVariant={logoVariant}
+            isDev={isDev}  
           />
         </div>
       ) : null}

package/src/@daf/pages/dashboards/AllInformation/Stakeholders/columns.js

@@ -0,0 +1,129 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions } from '../../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../../helpers/Forms.js';
+import CustomIcon from '../../../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../../../core/components/AvatarGroup/index.jsx';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+          show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },     
+    {
+        dataIndex: 'category',
+        title: t('Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const category = findOptions(v, options?.categoriesOptions);
+    
+          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+        },
+    },     
+    {
+        dataIndex: 'subCategory',
+        title: t('Sub Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const subCategory = findOptions(v, options?.subCategoriesOptions);
+    
+          return subCategory ? <Tooltip title={subCategory}>{subCategory}</Tooltip> : '-';
+        },
+    }, 
+    {
+        dataIndex: 'country',
+        title: t('Country'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const country = findOptions(v, options?.countries);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+        },
+    },     
+    {
+        title: t("Date"),
+        dataIndex: "date",
+        key: "date",
+        width: 125,
+        render: (date, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+            return <Tooltip title={_date}>{_date}</Tooltip>;
+        },
+        ellipsis: true,
+    },
+    {
+        title: t("Sources"),
+        dataIndex: "sources",
+        key: "sources",
+        show: activeTab !== "own",
+        render: (val, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+            if (!val || val?.length === 0) {
+                return "--";
+            }
+
+            return <AvatarGroup items={val}></AvatarGroup>;
+        },
+    },
+    {
+      id: 'actions',
+      title: "",
+      width: 60,
+      render: (_, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />;
+        }
+
+        const link = `/app/view/${subject}/${all.datastakeId}`;
+
+        return <div style={{ display: "flex", justifyContent: "center" }}>
+						<a href={getRedirectLink(link)}>
+							<CustomIcon name="Link" size={15} color={theme.baseGray70} />
+						</a>
+			</div>;
+      }
+    }
+].filter((column) => column.show !== false);

package/src/@daf/pages/dashboards/AllInformation/Stakeholders/config.js

@@ -0,0 +1,31 @@
+export const checkboxConfig = {
+	name: 'Name',
+	datastakeId: 'ID'
+}
+
+export const getFiltersConfig = ({t}) => {
+    return {
+        country: {
+			type: 'select',
+			placeholder: t('Country'),
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		},
+    }
+}
+
+export const filtersConfig = {
+	name: '',
+	datastakeId: '',
+};
+
+export const getFilterOptions = (options, t) => {
+	const { countries } = options || {};
+	const _default  = {
+		country: countries,
+	}
+
+	return _default;
+}