[#204] fixed query string parsing

ui/src/components/admins/PageAdminLogin.svelte

@@ -1,16 +1,14 @@
 <script>
-    import { link } from "svelte-spa-router";
-    import { replace } from "svelte-spa-router";
+    import { link, replace, querystring } from "svelte-spa-router";
     import FullPage from "@/components/base/FullPage.svelte";
     import ApiClient from "@/utils/ApiClient";
-    import CommonHelper from "@/utils/CommonHelper";
     import Field from "@/components/base/Field.svelte";
     import { addErrorToast } from "@/stores/toasts";
 
-    const queryParams = CommonHelper.getQueryParams(window.location?.href);
+    const queryParams = new URLSearchParams($querystring);
 
-    let email = queryParams.demoEmail || "";
-    let password = queryParams.demoPassword || "";
+    let email = queryParams.get("demoEmail") || "";
+    let password = queryParams.get("demoPassword") || "";
     let isLoading = false;
 
     function login() {

ui/src/components/admins/PageAdmins.svelte

@@ -1,4 +1,5 @@
 <script>
+    import { replace, querystring } from "svelte-spa-router";
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
     import { pageTitle } from "@/stores/app";
@@ -11,22 +12,20 @@
     import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
     import AdminUpsertPanel from "@/components/admins/AdminUpsertPanel.svelte";
 
-    const queryParams = CommonHelper.getQueryParams(window.location?.href);
-
     $pageTitle = "Admins";
 
+    const queryParams = new URLSearchParams($querystring);
+
     let adminUpsertPanel;
     let admins = [];
     let isLoading = false;
-    let filter = queryParams.filter || "";
-    let sort = queryParams.sort || "-created";
+    let filter = queryParams.get("filter") || "";
+    let sort = queryParams.get("sort") || "-created";
 
     $: if (sort !== -1 && filter !== -1) {
         // keep listing params in sync
-        CommonHelper.replaceClientQueryParams({
-            filter: filter,
-            sort: sort,
-        });
+        const query = new URLSearchParams({ filter, sort }).toString();
+        replace("/settings/admins?" + query);
 
         loadAdmins();
     }

ui/src/components/records/PageRecords.svelte

@@ -1,11 +1,11 @@
 <script>
+    import { replace, querystring } from "svelte-spa-router";
     import {
         collections,
         activeCollection,
         isCollectionsLoading,
         loadCollections,
     } from "@/stores/collections";
-    import CommonHelper from "@/utils/CommonHelper";
     import tooltip from "@/actions/tooltip";
     import { pageTitle } from "@/stores/app";
     import Searchbar from "@/components/base/Searchbar.svelte";
@@ -16,17 +16,17 @@
     import RecordUpsertPanel from "@/components/records/RecordUpsertPanel.svelte";
     import RecordsList from "@/components/records/RecordsList.svelte";
 
-    const queryParams = CommonHelper.getQueryParams(window.location?.href);
-
     $pageTitle = "Collections";
 
+    const queryParams = new URLSearchParams($querystring);
+
     let collectionUpsertPanel;
     let collectionDocsPanel;
     let recordPanel;
     let recordsList;
-    let filter = queryParams.filter || "";
-    let sort = queryParams.sort || "-created";
-    let selectedCollectionId = queryParams.collectionId;
+    let filter = queryParams.get("filter") || "";
+    let sort = queryParams.get("sort") || "-created";
+    let selectedCollectionId = queryParams.get("collectionId") || "";
 
     $: viewableCollections = $collections.filter((c) => c.name != import.meta.env.PB_PROFILE_COLLECTION);
 
@@ -37,11 +37,12 @@
 
     // keep the url params in sync
     $: if (sort || filter || $activeCollection?.id) {
-        CommonHelper.replaceClientQueryParams({
-            collectionId: $activeCollection?.id,
+        const query = new URLSearchParams({
+            collectionId: $activeCollection?.id || "",
             filter: filter,
             sort: sort,
-        });
+        }).toString();
+        replace("/collections?" + query);
     }
 
     function reset() {

ui/src/components/users/PageUsers.svelte

@@ -1,4 +1,5 @@
 <script>
+    import { replace, querystring } from "svelte-spa-router";
     import { Collection } from "pocketbase";
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
@@ -14,11 +15,11 @@
     import RecordUpsertPanel from "@/components/records/RecordUpsertPanel.svelte";
     import RecordFieldCell from "@/components/records/RecordFieldCell.svelte";
 
-    const queryParams = CommonHelper.getQueryParams(window.location?.href);
-    const excludedProfileFields = ["id", "userId", "created", "updated"];
-
     $pageTitle = "Users";
 
+    const queryParams = new URLSearchParams($querystring);
+    const excludedProfileFields = ["id", "userId", "created", "updated"];
+
     let userUpsertPanel;
     let collectionUpsertPanel;
     let recordUpsertPanel;
@@ -26,17 +27,15 @@
     let currentPage = 1;
     let totalItems = 0;
     let isLoadingUsers = false;
-    let filter = queryParams.filter || "";
-    let sort = queryParams.sort || "-created";
+    let filter = queryParams.get("filter") || "";
+    let sort = queryParams.get("sort") || "-created";
     let profileCollection = new Collection();
     let isLoadingProfileCollection = false;
 
     $: if (sort !== -1 && filter !== -1) {
         // keep query params
-        CommonHelper.replaceClientQueryParams({
-            filter: filter,
-            sort: sort,
-        });
+        const query = new URLSearchParams({ filter, sort }).toString();
+        replace("/users?" + query);
 
         loadUsers();
     }