From 7d38b83148ec2d8f63e9238a83cb2eff1c970132 Mon Sep 17 00:00:00 2001
From: Max Frederiksen <maxfrederiksen@Maxs-MacBook-Air.local>
Date: Mon, 18 Nov 2024 09:23:45 +0100
Subject: [PATCH] Remove serialize and deserialize
---
src/components/common/URLState/URLState.js | 25 ----------------------
src/components/common/URLState/index.js | 3 ---
src/components/records/RecordSearch.jsx | 7 +++---
src/views/IOC/IOCListView.tsx | 10 +++------
src/views/host/HostListView.jsx | 10 +++------
src/views/records/RecordListView.jsx | 10 +++------
6 files changed, 12 insertions(+), 53 deletions(-)
delete mode 100644 src/components/common/URLState/URLState.js
delete mode 100644 src/components/common/URLState/index.js
diff --git a/src/components/common/URLState/URLState.js b/src/components/common/URLState/URLState.js
deleted file mode 100644
index e291eeda..00000000
--- a/src/components/common/URLState/URLState.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export function serialize(value) {
- if (typeof value === "boolean") {
- return value ? "true" : "false";
- }
- if (typeof value === "number") {
- return value.toString();
- }
- if (typeof value === "object") {
- return JSON.stringify(value);
- }
- return value;
-}
-
-export function deserialize(value) {
- if (value === "true") {
- return true;
- }
- if (value === "false") {
- return false;
- }
- if (Number(value).toString() === value && !isNaN(Number(value))) {
- return Number(value);
- }
- return value;
-}
diff --git a/src/components/common/URLState/index.js b/src/components/common/URLState/index.js
deleted file mode 100644
index 778ede8a..00000000
--- a/src/components/common/URLState/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { serialize, deserialize } from "./URLState";
-
-export { serialize, deserialize };
diff --git a/src/components/records/RecordSearch.jsx b/src/components/records/RecordSearch.jsx
index d87c13f4..3ac34497 100644
--- a/src/components/records/RecordSearch.jsx
+++ b/src/components/records/RecordSearch.jsx
@@ -2,7 +2,6 @@ import { useEffect, useCallback, useState, useContext } from "react";
import { initRequestParams } from "../common/Helper";
import { RecordTable } from "./RecordTable";
import { useSearchParams } from "react-router-dom";
-import { serialize, deserialize } from "../common/URLState/URLState";
import { Grid, Tabs, Tab } from "@mui/material";
import { useAPIMethod, usePagination, SearchBar } from "@ess-ics/ce-ui-common";
import { apiContext } from "../../api/DeployApi";
@@ -52,7 +51,7 @@ export function RecordSearch({ iocName, rowType }) {
useEffect(() => {
let requestParams = initRequestParams(pagination);
requestParams.pv_status = recordFilter;
- requestParams.text = deserialize(searchParams.get("query"));
+ requestParams.text = searchParams.get("query");
requestParams.ioc_name = iocName;
getRecords(requestParams);
@@ -64,7 +63,7 @@ export function RecordSearch({ iocName, rowType }) {
// Callback for searchbar, called whenever user updates search
const setSearch = useCallback(
(query) => {
- setSearchParams({ query: serialize(query) });
+ setSearchParams({ query: query });
},
[setSearchParams]
);
@@ -94,7 +93,7 @@ export function RecordSearch({ iocName, rowType }) {
<Grid item>
<SearchBar
search={setSearch}
- query={deserialize(searchParams.get("query"))}
+ query={searchParams.get("query")}
loading={loading || !dataReady}
>
<RecordTable
diff --git a/src/views/IOC/IOCListView.tsx b/src/views/IOC/IOCListView.tsx
index 2c357380..9f915df6 100644
--- a/src/views/IOC/IOCListView.tsx
+++ b/src/views/IOC/IOCListView.tsx
@@ -11,10 +11,6 @@ import {
initRequestParams
} from "../../components/common/Helper";
import { useSearchParams } from "react-router-dom";
-import {
- serialize,
- deserialize
-} from "../../components/common/URLState/URLState";
import { GlobalAppBarContext, OnPageParams } from "../../types/common";
import { ApiAlertError } from "../../components/common/Alerts/ApiAlertError";
import { Container, Grid, Tabs, Tab } from "@mui/material";
@@ -54,7 +50,7 @@ export const IOCListView = () => {
// Callback for searchbar, called whenever user updates search
const setSearch = useCallback(
(query: string) => {
- setSearchParams({ query: serialize(query) });
+ setSearchParams({ query: query });
},
[setSearchParams]
);
@@ -69,7 +65,7 @@ export const IOCListView = () => {
useEffect(() => {
const requestParams = Object.assign(
{},
- initRequestParams(pagination, deserialize(searchParams.get("query"))),
+ initRequestParams(pagination, searchParams.get("query")),
{ deploymentStatus: deploymentStatus }
);
@@ -108,7 +104,7 @@ export const IOCListView = () => {
>
<SearchBar
search={setSearch}
- query={deserialize(searchParams.get("query"))}
+ query={searchParams.get("query")}
loading={isFetching || !iocs}
>
{error ? (
diff --git a/src/views/host/HostListView.jsx b/src/views/host/HostListView.jsx
index 08c57d51..f18bd8b2 100644
--- a/src/views/host/HostListView.jsx
+++ b/src/views/host/HostListView.jsx
@@ -13,10 +13,6 @@ import {
initRequestParams
} from "../../components/common/Helper";
import { useSearchParams } from "react-router-dom";
-import {
- serialize,
- deserialize
-} from "../../components/common/URLState/URLState";
import { apiContext } from "../../api/DeployApi";
import { ROWS_PER_PAGE } from "../../constants";
@@ -66,7 +62,7 @@ export function HostListView() {
useEffect(() => {
let requestParams = initRequestParams(pagination);
requestParams.filter = hostFilter;
- requestParams.text = deserialize(searchParams.get("query"));
+ requestParams.text = searchParams.get("query");
getHosts(requestParams);
return () => {
@@ -77,7 +73,7 @@ export function HostListView() {
// Callback for searchbar, called whenever user updates search
const setSearch = useCallback(
(query) => {
- setSearchParams({ query: serialize(query) });
+ setSearchParams({ query: query });
},
[setSearchParams]
);
@@ -91,7 +87,7 @@ export function HostListView() {
const content = (
<SearchBar
search={setSearch}
- query={deserialize(searchParams.get("query"))}
+ query={searchParams.get("query")}
loading={loading}
>
<HostTable
diff --git a/src/views/records/RecordListView.jsx b/src/views/records/RecordListView.jsx
index 2243dadc..4199d0d6 100644
--- a/src/views/records/RecordListView.jsx
+++ b/src/views/records/RecordListView.jsx
@@ -12,10 +12,6 @@ import {
initRequestParams
} from "../../components/common/Helper";
import { useSearchParams } from "react-router-dom";
-import {
- serialize,
- deserialize
-} from "../../components/common/URLState/URLState";
import { RecordTable } from "../../components/records/RecordTable";
import { apiContext } from "../../api/DeployApi";
import { ROWS_PER_PAGE } from "../../constants";
@@ -68,7 +64,7 @@ export function RecordListView() {
useEffect(() => {
let requestParams = initRequestParams(pagination);
requestParams.pv_status = recordFilter;
- requestParams.text = deserialize(searchParams.get("query"));
+ requestParams.text = searchParams.get("query");
getRecords(requestParams);
return () => {
@@ -79,7 +75,7 @@ export function RecordListView() {
// Callback for searchbar, called whenever user updates search
const setSearch = useCallback(
(query) => {
- setSearchParams({ query: serialize(query) });
+ setSearchParams({ query: query });
},
[setSearchParams]
);
@@ -93,7 +89,7 @@ export function RecordListView() {
let content = (
<SearchBar
search={setSearch}
- query={deserialize(searchParams.get("query"))}
+ query={searchParams.get("query")}
loading={loading || !dataReady}
>
<RecordTable
--
GitLab