adminforth 2.4.0-next.271 → 2.4.0-next.273

package/dist/spa/src/utils.ts

@@ -478,4 +478,23 @@ export function checkShowIf(c: AdminForthResourceColumnInputCommon, record: Reco
   };
 
   return evaluatePredicate(c.showIf);
-}
+}
+
+
+export function encodeQueryJSON(obj) {
+  return JSON.stringify(obj)
+    .replace(/{/g, '(')
+    .replace(/}/g, ')')
+    .replace(/\[/g, '<')
+    .replace(/]/g, '>')
+}
+
+export function decodeQueryJSON(str) {
+  return JSON.parse(
+    str
+      .replace(/\(/g, '{')
+      .replace(/\)/g, '}')
+      .replace(/</g, '[')
+      .replace(/>/g, ']')
+  );
+}

package/dist/spa/src/views/CreateView.vue

@@ -79,7 +79,7 @@ import BreadcrumbsWithButtons from '@/components/BreadcrumbsWithButtons.vue';
 import ResourceForm from '@/components/ResourceForm.vue';
 import SingleSkeletLoader from '@/components/SingleSkeletLoader.vue';
 import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown } from '@/utils';
+import { callAdminForthApi, getCustomComponent,checkAcessByAllowedActions, initThreeDotsDropdown, decodeQueryJSON } from '@/utils';
 import { IconFloppyDiskSolid } from '@iconify-prerendered/vue-flowbite';
 import { onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -125,11 +125,26 @@ onMounted(async () => {
     }
     return acc;
   }, {});
+  let userUseMultipleEncoding = false;  //TODO remove this in future versions
   if (route.query.values) {
-    initialValues.value = { ...initialValues.value, ...JSON.parse(decodeURIComponent(route.query.values as string)) };
+    try {
+      JSON.parse((route.query.values as string));
+    } catch (e) {
+      userUseMultipleEncoding = true;
+      console.warn('You are using an outdated format for the query vales. Please update your links and don`t use multiple URL encoding.');
+    }
+    if (userUseMultipleEncoding) {
+      initialValues.value = { ...initialValues.value, ...JSON.parse(decodeURIComponent((route.query.values as string))) };
+    } else {
+      initialValues.value = { ...initialValues.value, ...JSON.parse(decodeQueryJSON(route.query.values as string)) };
+    }
   }
   if (route.query.readonlyColumns) {
-    readonlyColumns.value = JSON.parse(decodeURIComponent(route.query.readonlyColumns as string));
+    if (userUseMultipleEncoding) {
+      readonlyColumns.value = JSON.parse(decodeURIComponent((route.query.readonlyColumns as string)));
+    } else {
+      readonlyColumns.value = JSON.parse(decodeQueryJSON(route.query.readonlyColumns as string));
+    }
   }
   record.value = initialValues.value;
   loading.value = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "2.4.0-next.271",
+  "version": "2.4.0-next.273",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",