datastake-daf 0.6.261 → 0.6.263

package/dist/utils/index.js

@@ -4007,36 +4007,36 @@ function _checkValue(wantedValue, match, fieldValue) {
   if (!match) {
     return propHasValue(fieldValue) || Array.isArray(fieldValue) && fieldValue.length > 0 ? true : false;
   } else {
-    const values = wantedValue.split(',');
-    if (match === 'is') {
+    const values = wantedValue.split(",");
+    if (match === "is") {
       if (values.length === 1) {
         return Array.isArray(fieldValue) ? fieldValue.includes(values[0]) : String(fieldValue) === values[0];
       } else {
         return false;
       }
     }
-    if (match === 'includes') {
+    if (match === "includes") {
       if (values.length) {
         return Array.isArray(fieldValue) ? values.filter(v => fieldValue.includes(v)).length > 0 : values.includes(String(fieldValue));
       } else {
         return false;
       }
     }
-    if (match === 'not') {
+    if (match === "not") {
       if (values.length && propHasValue(fieldValue)) {
         return Array.isArray(fieldValue) ? values.filter(v => fieldValue.includes(v)).length === 0 : !values.includes(String(fieldValue));
       } else {
         return false;
       }
     }
-    if (match === 'notOnly') {
+    if (match === "notOnly") {
       if (values.length) {
         return Array.isArray(fieldValue) ? values.filter(v => fieldValue.includes(v)).length === 0 : !values.includes(String(fieldValue));
       } else {
         return false;
       }
     }
-    if (match === 'notEmpty') {
+    if (match === "notEmpty") {
       return fieldValue && Object.keys(fieldValue).includes(wantedValue) && (!Array.isArray(fieldValue[wantedValue]) || Array.isArray(fieldValue[wantedValue]) && fieldValue[wantedValue].length > 0);
     }
   }
@@ -4057,8 +4057,8 @@ function _checkValue(wantedValue, match, fieldValue) {
  * filterString('h ll ', 'll') // true
  */
 const filterString = (str1, str2) => {
-  str1 = typeof str1 === 'string' ? str1.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, "") : '';
-  str2 = typeof str2 === 'string' ? str2.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, "") : '';
+  str1 = typeof str1 === "string" ? str1.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "") : "";
+  str2 = typeof str2 === "string" ? str2.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "") : "";
   return str1.toLowerCase().indexOf(str2.toLowerCase()) >= 0;
 };
 
@@ -4076,12 +4076,12 @@ const filterString = (str1, str2) => {
  * filterSelectOptions('hello', { label: 'goodbye world' }) // false
  */
 const filterSelectOptions = (inputValue, option) => {
-  return filterString(typeof option.children === 'string' ? option.children : typeof option.label === 'string' ? option.label : '', inputValue);
+  return filterString(typeof option.children === "string" ? option.children : typeof option.label === "string" ? option.label : "", inputValue);
 };
 
 /**
  * Filters select options based on the given filters. Used in filterOptions of ant select
- * 
+ *
  * @param {Object[]} options - Options to filter.
  * @param {string[]} filters - Filters to apply.
  * @param {Object} [formsValue={}] - Form values.
@@ -4090,17 +4090,17 @@ const filterSelectOptions = (inputValue, option) => {
  * @returns {Object[]} - Filtered options.
  */
 function filterOptions(options, filters, formsValue = {}, repeatValues = {}, filterCond = null) {
-  const isOrCond = filterCond !== 'and';
+  const isOrCond = filterCond !== "and";
   const objFilter = {};
   filters.forEach(f => {
-    const [name, p] = f.split('|');
-    const [path, delimeter] = p.split(/( as )/gmi);
+    const [name, p] = f.split("|");
+    const [path, delimeter] = p.split(/( as )/gim);
     let value;
     let isRepeatable = false;
-    if (delimeter && delimeter.trim() === 'as') {
+    if (delimeter && delimeter.trim() === "as") {
       value = path;
     } else {
-      const pathInsideRepeatValues = path.split('./');
+      const pathInsideRepeatValues = path.split("./");
       isRepeatable = pathInsideRepeatValues.length > 1;
       value = deepFind(isRepeatable ? repeatValues : formsValue, pathInsideRepeatValues[pathInsideRepeatValues.length - 1]);
     }
@@ -4120,7 +4120,7 @@ function filterOptions(options, filters, formsValue = {}, repeatValues = {}, fil
       const parts = opFilters.map(fi => {
         const filter = objFilter[fi.name];
         const value = Array.isArray(filter.value) ? filter.value : [filter.value];
-        return _checkValue(value.join(','), fi.condition, fi.value);
+        return _checkValue(value.join(","), fi.condition, fi.value);
       });
       return parts.length > 0 && (isOrCond && parts.filter(p => p).length >= 1 || parts.filter(p => !p).length === 0);
       // if (!filter) {
@@ -4157,15 +4157,15 @@ function filterOptions(options, filters, formsValue = {}, repeatValues = {}, fil
  * @param {Array} arr - The array to check.
  * @returns {boolean} - True if the array contains only objects, false otherwise.
  */
-const isArrayOfObjects = arr => Array.isArray(arr) && arr.map(i => typeof i === 'object').every(i => i);
+const isArrayOfObjects = arr => Array.isArray(arr) && arr.map(i => typeof i === "object").every(i => i);
 
 /**
  * Determines if two sets of data have not changed. Used to show Save button disabled or not.
- * 
+ *
  * @param {Object} old - The original data set.
  * @param {Object} newData - The new data set to compare against the original.
  * @returns {boolean} - True if the data sets have not changed, false otherwise.
- * 
+ *
  * This function compares two objects by iterating over the union of their keys.
  * For each key, it checks the type of the value in newData:
  * - If undefined, it considers it unchanged.
@@ -4181,13 +4181,13 @@ const hasNotChanged = (old, newData) => {
     switch (typeof newData[key]) {
       case undefined:
         return true;
-      case 'object':
+      case "object":
         try {
           if (moment__default["default"].isMoment(newData[key])) {
-            if (typeof newData[key].format === 'function') {
-              return old[key] === newData[key].format('YYYY-MM-DD');
+            if (typeof newData[key].format === "function") {
+              return old[key] === newData[key].format("YYYY-MM-DD");
             }
-            return old[key] === moment__default["default"](newData[key]._d).format('YYYY-MM-DD');
+            return old[key] === moment__default["default"](newData[key]._d).format("YYYY-MM-DD");
           } else if (isArrayOfObjects(newData[key])) {
             return newData[key].length === (old[key] || []).length && newData[key].map((oKey, i) => hasNotChanged((old[key] || [])[i] || {}, oKey || {})).every(i => i);
           }
@@ -4195,9 +4195,9 @@ const hasNotChanged = (old, newData) => {
           // console.log(e, data[key], key);
         }
         return ___default["default"].isEqual(old[key], newData[key]);
-      case 'number':
-      case 'string':
-      case 'boolean':
+      case "number":
+      case "string":
+      case "boolean":
         return old[key] === newData[key];
       default:
         return false;
@@ -4207,14 +4207,14 @@ const hasNotChanged = (old, newData) => {
 
 /**
  * Maps sub groups in the form data structure for submission. This is mainly created for ajaxSubGroup input type.
- * 
+ *
  * This function takes a form data structure and maps its sub groups to
  * the format expected by the server. It does this by iterating over the
  * form definition and checking if any of the inputs have the type 'ajaxSubGroup'
  * with either yearRecords or checkboxRecords set. If they do, it aggregates
  * the data from the corresponding year-specific keys and sets it as an array
  * on the key specified in the form definition.
- * 
+ *
  * @param {{ data: Object, form: Object }} - The form data structure.
  * @returns {Object} - The mapped form data structure.
  */
@@ -4229,7 +4229,7 @@ const mapSubGroupsInSubmit = ({
   Object.keys(form).forEach(k => {
     Object.keys(form[k]).forEach(key => {
       const input = form[k][key];
-      if (input?.type === 'ajaxSubGroup' && (typeof input?.meta?.yearRecords === 'number' || typeof input?.meta?.checkboxRecords === 'string')) {
+      if (input?.type === "ajaxSubGroup" && (typeof input?.meta?.yearRecords === "number" || typeof input?.meta?.checkboxRecords === "string")) {
         ajaxSubGroupsWithPeridicity.push(key);
       }
     });
@@ -4277,13 +4277,13 @@ const mapSubGroupsInGet = ({
   Object.keys(form).forEach(k => {
     if (form[k]?.type && form[k]?.dataId) {
       const input = form[k];
-      if (input?.type === 'ajaxSubGroup' && (typeof input?.meta?.yearRecords === 'number' || typeof input?.meta?.checkboxRecords === 'string')) {
+      if (input?.type === "ajaxSubGroup" && (typeof input?.meta?.yearRecords === "number" || typeof input?.meta?.checkboxRecords === "string")) {
         ajaxSubGroupsWithPeridicity.push(k);
       }
     } else {
       Object.keys(form[k]).forEach(key => {
         const input = form[k][key];
-        if (input?.type === 'ajaxSubGroup' && (typeof input?.meta?.yearRecords === 'number' || typeof input?.meta?.checkboxRecords === 'string')) {
+        if (input?.type === "ajaxSubGroup" && (typeof input?.meta?.yearRecords === "number" || typeof input?.meta?.checkboxRecords === "string")) {
           ajaxSubGroupsWithPeridicity.push(key);
         }
       });
@@ -4301,7 +4301,7 @@ const mapSubGroupsInGet = ({
   return _data;
 };
 const isObjectEmpty = obj => {
-  if (obj === null || typeof obj !== 'object') {
+  if (obj === null || typeof obj !== "object") {
     return false;
   }
   if (Object.keys(obj).length === 0) {
@@ -4419,8 +4419,8 @@ const changeInputMeta = ({
  * @returns {string} - The formatted date string.
  */
 
-const renderDateFormatted = (value, format = 'DD MMM YYYY', locale = 'en') => {
-  return dayjs__default["default"].utc(value, 'YYYY-MM-DD').locale(locale).format(format);
+const renderDateFormatted = (value, format = "DD MMM YYYY", locale = "en") => {
+  return dayjs__default["default"].utc(value, "YYYY-MM-DD").locale(locale).format(format);
 };
 
 ({

package/package.json

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

package/src/@daf/core/components/EditForm/components/ajaxSelect.js

@@ -71,7 +71,7 @@ export function AjaxSelectMain({
 	const [isFetchWithThisFilter, setIsFetchWithThisFilter] = useState(false);
 	const url = getApiBaseUrl();
 
-	const queryOptionsApps = ["kota", "nashiriki", "straatos" ];
+	const queryOptionsApps = ["kota", "nashiriki", "straatos"];
 	const queryOptionsAppEndpoints = {
 		kota: `query/options`,
 		nashiriki: "query",