diff --git a/webapp/package.json b/webapp/package.json
index 0620159..2019f14 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -19,6 +19,7 @@
"jss": "^10.8.2",
"notistack": "^2.0.5",
"react": "^18.1.0",
+ "react-cookie": "^4.1.1",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2",
"react-jss": "^10.8.2",
diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx
index 7245e83..3486724 100644
--- a/webapp/src/App.tsx
+++ b/webapp/src/App.tsx
@@ -3,6 +3,7 @@ import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
import { useConnectedApiService } from 'apiService';
import { ErrorBoundary } from 'components/ErrorBoundary';
+import { CookiesProvider } from "react-cookie";
function App() {
const api = useConnectedApiService();
@@ -10,11 +11,13 @@ function App() {
return (
-
-
- } />
-
-
+
+
+
+ } />
+
+
+
);
diff --git a/webapp/src/components/AutomationList/AutomationListBox.stories.tsx b/webapp/src/components/AutomationList/AutomationListBox.stories.tsx
index ddb5823..366ddc0 100644
--- a/webapp/src/components/AutomationList/AutomationListBox.stories.tsx
+++ b/webapp/src/components/AutomationList/AutomationListBox.stories.tsx
@@ -3,6 +3,7 @@ import { useState } from "react";
import { AutomationListBox } from "./AutomationListBox";
import { createMockAuto } from "utils/mocks";
import { Page } from "components/Page";
+import { CookiesProvider } from "react-cookie";
export default {
title: 'App/AutomationList/Box',
@@ -16,10 +17,12 @@ export default {
const Template: ComponentStory = args => {
const [selected, setSelected] = useState(args.selected)
return
- {
- setSelected(i)
- args.onSelectAutomation(i)
- }} />
+
+ {
+ setSelected(i)
+ args.onSelectAutomation(i)
+ }} />
+
}
diff --git a/webapp/src/components/AutomationList/AutomationListBox.tsx b/webapp/src/components/AutomationList/AutomationListBox.tsx
index 933ce16..72a960b 100644
--- a/webapp/src/components/AutomationList/AutomationListBox.tsx
+++ b/webapp/src/components/AutomationList/AutomationListBox.tsx
@@ -6,6 +6,7 @@ import InputText from "components/Inputs/InputText";
import { Button } from "components/Inputs/Button";
import { makeGrouping } from "./automationGrouper";
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
+import { useCookies } from "react-cookie";
export type Props = {
@@ -16,6 +17,33 @@ export type Props = {
onAdd: () => void;
}
+const useAutomationListBoxState = () => {
+ const [cookies, setCookies, _] = useCookies(['albSearchText', 'albSelected']);
+ let initialSelected = [];
+ try {
+ initialSelected = JSON.parse(cookies.albSelected)
+ if (!Array.isArray(initialSelected)) {
+ initialSelected = [initialSelected]
+ }
+ initialSelected = initialSelected.map(Number)
+ } catch (_) { }
+ const [searchText, setSearchText] = useState(cookies.albSearchText ?? "");
+ const [selectedTagIdx, setSelectedTagIdx] = useState(initialSelected);
+
+ return {
+ searchText,
+ setSearchText(v: string) {
+ setSearchText(v)
+ setCookies('albSearchText', v)
+ },
+ setSelectedTagIdx(n: number[]) {
+ setSelectedTagIdx(n)
+ setCookies('albSelected', JSON.stringify(n))
+ },
+ selectedTagIdx,
+ }
+}
+
export const AutomationListBox: FC = ({
automations,
selected,
@@ -25,9 +53,13 @@ export const AutomationListBox: FC = ({
}) => {
const tags = getTagList(automations);
- const [searchText, setSearchText] = useState('');
- const [selectedTagIdx, setSelectedTagIdx] = useState([]);
- const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
+ const {
+ searchText,
+ setSearchText,
+ selectedTagIdx,
+ setSelectedTagIdx,
+ } = useAutomationListBoxState();
+ const filteredAutomations = filterAutomations(automations, searchText.toLowerCase(), selectedTagIdx, tags);
const grouping = makeGrouping(
filteredAutomations.map(([a, _]) => a),
selectedTagIdx.map(i => tags[i]),
diff --git a/webapp/src/components/AutomationList/index.tsx b/webapp/src/components/AutomationList/index.tsx
index 3fd8892..5f465d0 100644
--- a/webapp/src/components/AutomationList/index.tsx
+++ b/webapp/src/components/AutomationList/index.tsx
@@ -13,6 +13,7 @@ import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
+import { useCookies } from 'react-cookie';
interface AutomationListParams {
@@ -24,6 +25,27 @@ interface AutomationListParams {
children?: ReactNode;
}
+export const useAutomationListState = () => {
+ const [cookies, setCookies, _] = useCookies(['alCurrent']);
+ let initialCurrent = 0;
+ try {
+ initialCurrent = Number(cookies.alCurrent ?? '0');
+ } catch (_) { }
+
+ const [hideList, setHideList] = useState(false);
+ const [current, setCurrent] = useState(initialCurrent);
+
+ return {
+ hideList,
+ setHideList,
+ current,
+ setCurrent(i: number) {
+ setCurrent(i)
+ setCookies('alCurrent', String(i))
+ }
+ }
+}
+
export const AutomationList: FC = ({
automations,
onUpdate,
@@ -33,8 +55,7 @@ export const AutomationList: FC = ({
children,
}) => {
// state
- const [hideList, setHideList] = useState(false);
- const [current, setCurrent] = useState(0);
+ const { hideList, setHideList, current, setCurrent } = useAutomationListState();
const { isMobile } = useWindowSize();
// alias
const currentAuto = automations.length > 0 ? automations[current] : null;
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index bdee25a..fe41f6b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3594,6 +3594,11 @@
dependencies:
"@types/node" "*"
+"@types/cookie@^0.3.3":
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
+ integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
+
"@types/eslint-scope@^3.7.3":
version "3.7.3"
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
@@ -3669,6 +3674,14 @@
dependencies:
"@types/unist" "*"
+"@types/hoist-non-react-statics@^3.0.1":
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+ integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
+ dependencies:
+ "@types/react" "*"
+ hoist-non-react-statics "^3.3.0"
+
"@types/html-minifier-terser@^5.0.0":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
@@ -6039,6 +6052,11 @@ cookie@0.5.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@^0.4.0:
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+ integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+
copy-concurrently@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -8503,7 +8521,7 @@ hmac-drbg@^1.0.1:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"
-hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -12633,6 +12651,15 @@ react-colorful@^5.0.1:
resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784"
integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg==
+react-cookie@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-4.1.1.tgz#832e134ad720e0de3e03deaceaab179c4061a19d"
+ integrity sha512-ffn7Y7G4bXiFbnE+dKhHhbP+b8I34mH9jqnm8Llhj89zF4nPxPutxHT1suUqMeCEhLDBI7InYwf1tpaSoK5w8A==
+ dependencies:
+ "@types/hoist-non-react-statics" "^3.0.1"
+ hoist-non-react-statics "^3.0.0"
+ universal-cookie "^4.0.0"
+
react-dev-utils@^12.0.1:
version "12.0.1"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
@@ -14900,6 +14927,14 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
unist-util-is "^4.0.0"
unist-util-visit-parents "^3.0.0"
+universal-cookie@^4.0.0:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-4.0.4.tgz#06e8b3625bf9af049569ef97109b4bb226ad798d"
+ integrity sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==
+ dependencies:
+ "@types/cookie" "^0.3.3"
+ cookie "^0.4.0"
+
universalify@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"