From 02ec81c16ac23a965baea86d0a497316eb2c604b Mon Sep 17 00:00:00 2001 From: Ari Date: Thu, 28 Jul 2022 13:24:13 -0400 Subject: [PATCH] moved control for tag update to tag db renamed list to manager --- .../AutomationListV2/MetadataBox/index.css | 152 ------------------ .../AutomationListV2/Sidebar/index.css | 12 -- .../src/components/AutomationListV2/TagDB.ts | 34 ---- .../src/components/AutomationListV2/index.tsx | 17 -- .../ListBoxGroup/index.css | 14 +- .../ListBoxGroup/index.stories.tsx | 0 .../ListBoxGroup/index.tsx | 8 +- .../AutomationManager/MetadataBox/Tags.css | 123 ++++++++++++++ .../MetadataBox/Tags.tsx | 71 +++++--- .../AutomationManager/MetadataBox/index.css | 74 +++++++++ .../MetadataBox/index.mobile.css | 5 + .../MetadataBox/index.stories.tsx | 17 +- .../MetadataBox/index.tsx | 41 ++--- .../AutomationManager/Sidebar/index.css | 28 ++++ .../Sidebar/index.stories.tsx | 67 ++++---- .../Sidebar/index.tsx | 19 +-- .../src/components/AutomationManager/TagDB.ts | 93 +++++++++++ .../automationGrouper.test.ts | 6 +- .../automationGrouper.tsx | 12 +- .../helpers.ts | 3 - .../components/AutomationManager/index.tsx | 50 ++++++ .../src/components/AutomationManager/state.ts | 25 +++ .../types.ts | 3 +- .../src/components/Inputs/InputAutoText.tsx | 2 +- .../Inputs/InputMultiSelect.stories.tsx | 45 +++--- .../components/Inputs/InputMultiSelect.tsx | 131 +++++++++------ 26 files changed, 669 insertions(+), 383 deletions(-) delete mode 100644 webapp/src/components/AutomationListV2/MetadataBox/index.css delete mode 100644 webapp/src/components/AutomationListV2/Sidebar/index.css delete mode 100644 webapp/src/components/AutomationListV2/TagDB.ts delete mode 100644 webapp/src/components/AutomationListV2/index.tsx rename webapp/src/components/{AutomationListV2 => AutomationManager}/ListBoxGroup/index.css (54%) rename webapp/src/components/{AutomationListV2 => AutomationManager}/ListBoxGroup/index.stories.tsx (100%) rename webapp/src/components/{AutomationListV2 => AutomationManager}/ListBoxGroup/index.tsx (90%) create mode 100644 webapp/src/components/AutomationManager/MetadataBox/Tags.css rename webapp/src/components/{AutomationListV2 => AutomationManager}/MetadataBox/Tags.tsx (68%) create mode 100644 webapp/src/components/AutomationManager/MetadataBox/index.css create mode 100644 webapp/src/components/AutomationManager/MetadataBox/index.mobile.css rename webapp/src/components/{AutomationListV2 => AutomationManager}/MetadataBox/index.stories.tsx (71%) rename webapp/src/components/{AutomationListV2 => AutomationManager}/MetadataBox/index.tsx (74%) create mode 100644 webapp/src/components/AutomationManager/Sidebar/index.css rename webapp/src/components/{AutomationListV2 => AutomationManager}/Sidebar/index.stories.tsx (70%) rename webapp/src/components/{AutomationListV2 => AutomationManager}/Sidebar/index.tsx (80%) create mode 100644 webapp/src/components/AutomationManager/TagDB.ts rename webapp/src/components/{AutomationListV2 => AutomationManager}/automationGrouper.test.ts (96%) rename webapp/src/components/{AutomationListV2 => AutomationManager}/automationGrouper.tsx (93%) rename webapp/src/components/{AutomationListV2 => AutomationManager}/helpers.ts (94%) create mode 100644 webapp/src/components/AutomationManager/index.tsx create mode 100644 webapp/src/components/AutomationManager/state.ts rename webapp/src/components/{AutomationListV2 => AutomationManager}/types.ts (87%) diff --git a/webapp/src/components/AutomationListV2/MetadataBox/index.css b/webapp/src/components/AutomationListV2/MetadataBox/index.css deleted file mode 100644 index 7b866b7..0000000 --- a/webapp/src/components/AutomationListV2/MetadataBox/index.css +++ /dev/null @@ -1,152 +0,0 @@ -.automation-list--metadatabox { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-around; - gap: 0.25em; - - padding: 0.25em; - background-color: var(--mui-background-paper); - - border-style: solid; - border-width: 1px; - border-color: transparent; - border-radius: 10px; -} - -.automation-list--metadatabox:hover, .automation-list--metadatabox.selected { - border-color: var(--mui-action-focus); - background-color: var(--mui-action-focus); -} - -.automation-list--metadatabox .metadatabox--title .input-text-view { - max-width: fit-content; -} - -.automation-list--metadatabox .metadatabox--title { - flex: 1; -} - -.automation-list--metadatabox .metadatabox--title .title { - font-size: 1.25em; - font-weight: bold; -} - -.automation-list--metadatabox .metadatabox--title .issue { - padding: 0 0.5em; - user-select: none; - max-width: fit-content; -} - -.automation-list--metadatabox .metadatabox--title .description { - font-size: 0.9em; -} - -.automation-list--metadatabox .delete:hover { - cursor: pointer; - color: var(--mui-error-light); - background-color: var(--mui-error-dark); -} - -.automation-list--metadatabox .select:hover, -.automation-list--metadatabox.selected.automation-list--metadatabox .select { - cursor: pointer; - color: var(--mui-primary-light); - background-color: var(--mui-primary-dark); -} - -.automation-list--metadatabox.selected.automation-list--metadatabox .select:hover { - color: var(--mui-secondary-light); - background-color: var(--mui-secondary-dark); - cursor: default; -} - -.automation-list--metadatabox .metadatabox--switch { - display: flex; - cursor: pointer; - flex-direction: column; - justify-content: center; - align-items: center; - text-align: center; - font-size: 0.75em; - user-select: none; - max-width: 5em; -} - -.automation-list--metadatabox .metadatabox--tags { - display: flex; - flex-direction: row; - flex-wrap: wrap; - gap: 0.25em; - margin-top: 0.25em; -} - -.automation-list--metadatabox .metadatabox--tags .tag, -.automation-list--metadatabox .metadatabox--tags .tag-add { - display: flex; - max-width: fit-content; - align-items: center; - gap: 0.25em; - - border-color: var(--mui-grey-400); - border-style: solid; - border-width: 1px; - border-radius: 0.5em; - padding: 0.1em 0.5em; -} - -.automation-list--metadatabox .metadatabox--tags .tag-add { - cursor: pointer; - color: var(--mui-success-light); - border-color: var(--mui-success-main); -} - -.automation-list--metadatabox .metadatabox--tags .tag-add:hover { - background-color: var(--mui-success-light); - color: var(--mui-success-contrastText); -} - -.automation-list--metadatabox .metadatabox--tags .tag .delete-tag { - font-size: 1em; -} - -.automation-list--metadatabox .metadatabox--tags .tag .delete-tag:hover { - cursor: pointer; - color: var(--mui-error-light); - outline: 1px solid var(--mui-error-dark); - border-radius: 20px; -} - -.automation-list--metadatabox .metadatabox--tags .tag .inner { - font-size: 1em; - display: flex; - justify-content: center; - align-items: center; - cursor: text; - user-select: none; -} - -.automation-list--metadatabox .metadatabox--tags .tag .inner .edit-icon { - height: 0.7em; - width: 0.7em; - padding: 0.15em; -} - - -.metadatabox--tags--modal { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - gap: 0.25em; -} - -.metadatabox--tags--modal .input-autotext { - min-width: calc(max(10em, 100%)); -} - -.metadatabox--tags--modal .buttons { - display: flex; - gap: 0.5em; - justify-content: space-evenly; -} \ No newline at end of file diff --git a/webapp/src/components/AutomationListV2/Sidebar/index.css b/webapp/src/components/AutomationListV2/Sidebar/index.css deleted file mode 100644 index d14bc5b..0000000 --- a/webapp/src/components/AutomationListV2/Sidebar/index.css +++ /dev/null @@ -1,12 +0,0 @@ -.automation-list.loading { - min-height: 100%; - height: 100%; - max-height: 100vh; - margin-left: 5em; - margin-right: 5em; -} - -.automation-list .automation-list-box--list { - max-height: 100vh; - overflow: auto; -} \ No newline at end of file diff --git a/webapp/src/components/AutomationListV2/TagDB.ts b/webapp/src/components/AutomationListV2/TagDB.ts deleted file mode 100644 index d4089c3..0000000 --- a/webapp/src/components/AutomationListV2/TagDB.ts +++ /dev/null @@ -1,34 +0,0 @@ -export type TagDB = ReturnType; -export const makeTagDB = ( - automations: Array<{ - id: string; - tags: Record; - }> -) => { - const allTags: Record> = {}; - const automationTags: Record> = {}; - automations.forEach(({ id, tags }) => { - automationTags[id] = tags; - Object.keys(tags).forEach((tagName) => { - const tagValue = tags[tagName]; - if (!allTags[tagName]) { - allTags[tagName] = new Set(); - } - allTags[tagName].add(tagValue); - }); - }); - const allTagNames = Object.keys(allTags); - return { - getTags(automationId: string) { - return automationTags[automationId] ?? {}; - }, - getTagNames(myTags: string[]): string[] { - return allTagNames.filter((n) => !myTags.includes(n)).sort(); - }, - getTagValues(tagName: string): string[] { - return allTags[tagName] - ? Array.from(allTags[tagName].values()).sort() - : []; - }, - }; -}; diff --git a/webapp/src/components/AutomationListV2/index.tsx b/webapp/src/components/AutomationListV2/index.tsx deleted file mode 100644 index 5598b25..0000000 --- a/webapp/src/components/AutomationListV2/index.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { ListData } from "apiService/types"; -import { HAEntitiesState } from "haService/HAEntities"; -import { FC } from "react"; -import { AutomationData } from "types/automations"; - -export type AutomationListProps = { - haEntites: HAEntitiesState; - configAutomations: ListData; - onUpdate: (i: number, auto: AutomationData) => void; - onUpdateTags: (id: string, tags: Record) => void; - onAdd: (auto: AutomationData) => void; - onRemove: (i: number) => void; -}; - -export const AutomationList: FC = (props) => { - return <>; -}; diff --git a/webapp/src/components/AutomationListV2/ListBoxGroup/index.css b/webapp/src/components/AutomationManager/ListBoxGroup/index.css similarity index 54% rename from webapp/src/components/AutomationListV2/ListBoxGroup/index.css rename to webapp/src/components/AutomationManager/ListBoxGroup/index.css index 6004bdc..6afa590 100644 --- a/webapp/src/components/AutomationListV2/ListBoxGroup/index.css +++ b/webapp/src/components/AutomationManager/ListBoxGroup/index.css @@ -1,19 +1,19 @@ -.automation-list--list-box-group--title { +.automation-manager--list-box-group--title { margin: 0.5em; } -.automation-list--list-box-group--title .icon { +.automation-manager--list-box-group--title .icon { font-size: 1.2em; } -.automation-list--list-box-group--title:hover, -.automation-list--list-box-group.selected .automation-list--list-box-group--title { +.automation-manager--list-box-group--title:hover, +.automation-manager--list-box-group.selected .automation-manager--list-box-group--title { color: var(--mui-primary-main); cursor: pointer; user-select: none; } -.automation-list--list-box-group { +.automation-manager--list-box-group { border-color: var(--mui-text-secondary); border-width: 0.125px; border-bottom-style: solid; @@ -21,13 +21,13 @@ border-bottom-right-radius: 0; } -.automation-list--list-box-group--list.close { +.automation-manager--list-box-group--list.close { height: 0; opacity: 0; display: none; } -.automation-list--list-box-group .automation-list--list-box-group { +.automation-manager--list-box-group .automation-manager--list-box-group { margin-left: 0.5em; margin-bottom: 0.5em; border-left: 1px solid var(--mui-text-secondary); diff --git a/webapp/src/components/AutomationListV2/ListBoxGroup/index.stories.tsx b/webapp/src/components/AutomationManager/ListBoxGroup/index.stories.tsx similarity index 100% rename from webapp/src/components/AutomationListV2/ListBoxGroup/index.stories.tsx rename to webapp/src/components/AutomationManager/ListBoxGroup/index.stories.tsx diff --git a/webapp/src/components/AutomationListV2/ListBoxGroup/index.tsx b/webapp/src/components/AutomationManager/ListBoxGroup/index.tsx similarity index 90% rename from webapp/src/components/AutomationListV2/ListBoxGroup/index.tsx rename to webapp/src/components/AutomationManager/ListBoxGroup/index.tsx index 3a9a012..ae518e7 100644 --- a/webapp/src/components/AutomationListV2/ListBoxGroup/index.tsx +++ b/webapp/src/components/AutomationManager/ListBoxGroup/index.tsx @@ -6,7 +6,6 @@ import { AutomationListAutoUpdatable, AutomationListItem } from "../types"; import { TagDB } from "../TagDB"; export type ListBoxGroupProps = AutomationListItem & { - onTagUpdate: (t: Record, aid: string) => void; onAutomationUpdate: ( a: AutomationListAutoUpdatable, aid: string, @@ -38,13 +37,13 @@ export const ListBoxGroup: FC = ({ return (
setOpen(!open)} - className="automation-list--list-box-group--title" + className="automation-manager--list-box-group--title" > {title} {openIcon} ( {totalAutomations} automation @@ -52,7 +51,7 @@ export const ListBoxGroup: FC = ({
@@ -64,7 +63,6 @@ export const ListBoxGroup: FC = ({ tagsDB={tagsDB} onDelete={() => events.onAutomationDelete(auto.id)} onSelect={() => events.onSelect(auto.id)} - onTagUpdate={(t) => events.onTagUpdate(t, auto.id)} onDescriptionUpdate={(description) => events.onAutomationUpdate( { diff --git a/webapp/src/components/AutomationManager/MetadataBox/Tags.css b/webapp/src/components/AutomationManager/MetadataBox/Tags.css new file mode 100644 index 0000000..f1fc0c5 --- /dev/null +++ b/webapp/src/components/AutomationManager/MetadataBox/Tags.css @@ -0,0 +1,123 @@ +.automation-manager--metadatabox .metadatabox--tags { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 0.25em; + margin-top: 0.25em; + padding: 0.25em; +} + + +.automation-manager--metadatabox .metadatabox--tags.modified { + border: 1px solid var(--mui-success-light); + border-radius: 10px; +} + + +.automation-manager--metadatabox .metadatabox--tags .tag, +.automation-manager--metadatabox .metadatabox--tags .buttons .tag-add { + display: flex; + max-width: fit-content; + align-items: center; + gap: 0.25em; + + border-color: var(--mui-grey-400); + border-style: solid; + border-width: 1px; + border-radius: 0.5em; + padding: 0.1em 0.5em; +} + +.automation-manager--metadatabox .metadatabox--tags .buttons { + display: flex; + justify-content: center; + align-items: center; + gap: 0.25em; +} + +.automation-manager--metadatabox .metadatabox--tags .buttons .tag-add { + cursor: pointer; + color: var(--mui-primary-light); + border-color: var(--mui-primary-main); +} + +.automation-manager--metadatabox .metadatabox--tags .buttons .tag-save { + cursor: pointer; + border-radius: 0.25em; + color: var(--mui-success-main); + height: 1em; + padding: 0.1em; +} + +.automation-manager--metadatabox .metadatabox--tags .buttons .tag-add:hover { + background-color: var(--mui-primary-light); + color: var(--mui-primary-contrastText); +} + +.automation-manager--metadatabox .metadatabox--tags .buttons .tag-save:hover { + background-color: var(--mui-success-light); + color: var(--mui-success-contrastText); +} + +.automation-manager--metadatabox .metadatabox--tags .tag .delete-tag { + font-size: 1em; +} + +.automation-manager--metadatabox .metadatabox--tags .tag .delete-tag:hover { + cursor: pointer; + color: var(--mui-error-light); + outline: 1px solid var(--mui-error-dark); + border-radius: 20px; +} + +.automation-manager--metadatabox .metadatabox--tags .tag .inner { + font-size: 1em; + display: flex; + justify-content: center; + align-items: center; + gap: 0.25em; + + cursor: text; + user-select: none; + + text-overflow: ellipsis; + overflow: hidden; + word-wrap: break-word; +} + +.automation-manager--metadatabox .metadatabox--tags .tag .inner span, +.automation-manager--metadatabox .metadatabox--tags .tag .inner b { + font-size: 0.9em; + overflow: hidden; + text-overflow: ellipsis; + word-wrap: break-word; +} + +.automation-manager--metadatabox .metadatabox--tags .tag .edit-icon { + height: 0.7em; + width: 0.7em; + padding: 0.15em; + cursor: text; +} + +.automation-manager--metadatabox .metadatabox--tags .tag:hover .edit-icon { + transform: rotate(10deg); +} + +.metadatabox--tags--modal { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 0.25em; +} + +.metadatabox--tags--modal .input-autotext { + min-width: calc(max(10em, 100%)); +} + +.metadatabox--tags--modal .buttons { + display: flex; + gap: 0.5em; + justify-content: space-evenly; +} \ No newline at end of file diff --git a/webapp/src/components/AutomationListV2/MetadataBox/Tags.tsx b/webapp/src/components/AutomationManager/MetadataBox/Tags.tsx similarity index 68% rename from webapp/src/components/AutomationListV2/MetadataBox/Tags.tsx rename to webapp/src/components/AutomationManager/MetadataBox/Tags.tsx index c37a649..db55803 100644 --- a/webapp/src/components/AutomationListV2/MetadataBox/Tags.tsx +++ b/webapp/src/components/AutomationManager/MetadataBox/Tags.tsx @@ -1,7 +1,10 @@ +import "./Tags.css"; + import { FC, ReactNode, useState } from "react"; import DeleteIcon from "@mui/icons-material/ClearTwoTone"; import EditIcon from "@mui/icons-material/EditOutlined"; +import SaveIcon from "@mui/icons-material/SaveOutlined"; import { cleanUpUndefined } from "utils/helpers"; import { Modal } from "components/Modal"; @@ -11,8 +14,7 @@ import InputAutoText from "components/Inputs/InputAutoText"; import { TagDB } from "../TagDB"; export type TagsProps = { - tags: Record; - onUpdate: (t: Record) => void; + automationId: string; tagsDB: TagDB; }; @@ -26,8 +28,11 @@ export type TagModalState = isNew: boolean; }; -export const Tags: FC = ({ tags, onUpdate, tagsDB }) => { +export const Tags: FC = ({ automationId, tagsDB }) => { const [modalState, setModal] = useState({ open: false }); + const tags = tagsDB.getTags(automationId); + const onUpdate = (t: Record) => + tagsDB.update(automationId, t); let innerModal: ReactNode = <>; if (modalState.open) { @@ -83,10 +88,15 @@ export const Tags: FC = ({ tags, onUpdate, tagsDB }) => { } return ( -
+
{innerModal} {Object.entries(tags).map(([tagName, tagValue]) => ( - +
onUpdate( @@ -98,7 +108,7 @@ export const Tags: FC = ({ tags, onUpdate, tagsDB }) => { } className="delete-tag" /> - setModal({ @@ -108,22 +118,41 @@ export const Tags: FC = ({ tags, onUpdate, tagsDB }) => { }) } > - {tagName}: {tagValue} - - + {tagName}: + {tagValue} +
+ + setModal({ + open: true, + isNew: false, + tag: [tagName, tagValue], + }) + } + /> +
))} - - setModal({ - open: true, - isNew: true, - tag: ["", ""], - }) - } - > - + - +
+ + setModal({ + open: true, + isNew: true, + tag: ["", ""], + }) + } + > + + + + {tagsDB.isModified(automationId) && ( + tagsDB.save(automationId)} + /> + )} +
); }; diff --git a/webapp/src/components/AutomationManager/MetadataBox/index.css b/webapp/src/components/AutomationManager/MetadataBox/index.css new file mode 100644 index 0000000..a055148 --- /dev/null +++ b/webapp/src/components/AutomationManager/MetadataBox/index.css @@ -0,0 +1,74 @@ +.automation-manager--metadatabox { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-around; + gap: 0.25em; + + padding: 0.25em; + background-color: var(--mui-background-paper); + + border-style: solid; + border-width: 1px; + border-color: transparent; + border-radius: 10px; +} + +.automation-manager--metadatabox:hover, .automation-manager--metadatabox.selected { + border-color: var(--mui-action-focus); + background-color: var(--mui-action-focus); +} + +.automation-manager--metadatabox .metadatabox--title .input-text-view { + max-width: fit-content; +} + +.automation-manager--metadatabox .metadatabox--title { + flex: 1; +} + +.automation-manager--metadatabox .metadatabox--title .title { + font-size: 1.25em; + font-weight: bold; +} + +.automation-manager--metadatabox .metadatabox--title .issue { + padding: 0 0.5em; + user-select: none; + max-width: fit-content; +} + +.automation-manager--metadatabox .metadatabox--title .description { + font-size: 0.9em; +} + +.automation-manager--metadatabox .delete:hover { + cursor: pointer; + color: var(--mui-error-light); + background-color: var(--mui-error-dark); +} + +.automation-manager--metadatabox .select:hover, +.automation-manager--metadatabox.selected.automation-manager--metadatabox .select { + cursor: pointer; + color: var(--mui-primary-light); + background-color: var(--mui-primary-dark); +} + +.automation-manager--metadatabox.selected.automation-manager--metadatabox .select:hover { + color: var(--mui-secondary-light); + background-color: var(--mui-secondary-dark); + cursor: default; +} + +.automation-manager--metadatabox .metadatabox--switch { + display: flex; + cursor: pointer; + flex-direction: column; + justify-content: center; + align-items: center; + text-align: center; + font-size: 0.75em; + user-select: none; + max-width: 5em; +} \ No newline at end of file diff --git a/webapp/src/components/AutomationManager/MetadataBox/index.mobile.css b/webapp/src/components/AutomationManager/MetadataBox/index.mobile.css new file mode 100644 index 0000000..471b6e5 --- /dev/null +++ b/webapp/src/components/AutomationManager/MetadataBox/index.mobile.css @@ -0,0 +1,5 @@ +.automation-manager--metadatabox.mobile .buttons { + display: flex; + flex-direction: column; + gap: 0.5em; +} \ No newline at end of file diff --git a/webapp/src/components/AutomationListV2/MetadataBox/index.stories.tsx b/webapp/src/components/AutomationManager/MetadataBox/index.stories.tsx similarity index 71% rename from webapp/src/components/AutomationListV2/MetadataBox/index.stories.tsx rename to webapp/src/components/AutomationManager/MetadataBox/index.stories.tsx index 2acae86..1328f5f 100644 --- a/webapp/src/components/AutomationListV2/MetadataBox/index.stories.tsx +++ b/webapp/src/components/AutomationManager/MetadataBox/index.stories.tsx @@ -2,13 +2,15 @@ import "styles/root.css"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { MetadataBox } from "."; -import { makeTagDB } from "../TagDB"; +import { useTagDB } from "../TagDB"; +import { useState } from "react"; export default { title: "App/AutomationList/MetadataBox", component: MetadataBox, parameters: { actions: { argTypesRegex: "^on.*" } }, args: { + id: "dummy", title: "Example", description: "Cool!", state: "on", @@ -21,9 +23,20 @@ export default { } as ComponentMeta; const Template: ComponentStory = (args) => { + const [autoTags, setTags] = useState([{ id: args.id, tags: args.tags }]); + const tagsDB = useTagDB(autoTags, (aid, t) => + setTags( + autoTags + .filter(({ id }) => id !== aid) + .concat({ + id: aid, + tags: t, + }) + ) + ); return ( - + ); }; diff --git a/webapp/src/components/AutomationListV2/MetadataBox/index.tsx b/webapp/src/components/AutomationManager/MetadataBox/index.tsx similarity index 74% rename from webapp/src/components/AutomationListV2/MetadataBox/index.tsx rename to webapp/src/components/AutomationManager/MetadataBox/index.tsx index 0b0db38..d508bd0 100644 --- a/webapp/src/components/AutomationListV2/MetadataBox/index.tsx +++ b/webapp/src/components/AutomationManager/MetadataBox/index.tsx @@ -1,4 +1,5 @@ import "./index.css"; +import "./index.mobile.css"; import { FC } from "react"; import Switch from "@mui/material/Switch"; @@ -12,23 +13,26 @@ import { ButtonIcon } from "components/Icons/ButtonIcons"; import { AutomationListAuto } from "../types"; import { Tags } from "./Tags"; import { TagDB } from "../TagDB"; +import useWindowSize from "utils/useWindowSize"; export type MetadataBoxProps = AutomationListAuto & { onDelete: () => void; onSelect: () => void; onStateUpdate: (s: "on" | "off") => void; - onTagUpdate: (t: Record) => void; onTitleUpdate: (t: string) => void; onDescriptionUpdate: (t: string) => void; tagsDB: TagDB; + isSelected: boolean; }; export const MetadataBox: FC = (props) => { const isValidState = ["on", "off"].includes(props.state); + const { isMobile } = useWindowSize(); return (
= (props) => { /> {!isValidState && `Invalid state: '${props.state}'`}
-
+
= (props) => { value={props.description} onChange={props.onDescriptionUpdate} /> - + {props.issue ? ( {props.issue} @@ -71,16 +74,18 @@ export const MetadataBox: FC = (props) => { <> )}
- } - onClick={props.onSelect} - /> - } - onClick={props.onDelete} - /> +
+ } + onClick={props.onSelect} + /> + } + onClick={props.onDelete} + /> +
); }; diff --git a/webapp/src/components/AutomationManager/Sidebar/index.css b/webapp/src/components/AutomationManager/Sidebar/index.css new file mode 100644 index 0000000..84cf780 --- /dev/null +++ b/webapp/src/components/AutomationManager/Sidebar/index.css @@ -0,0 +1,28 @@ +.automation-manager--sidebar { + display: flex; + flex-direction: column; + --nav-height: 10em; + --bottom-height: 3em; + position: relative; + height: 100%; +} + +.automation-manager--sidebar-box--nav { + max-height: var(--nav-height); +} + +.automation-manager--sidebar .automation-manager--sidebar-box--list { + flex: 1; + max-height: calc(100vh - var(--bottom-height) - var(--nav-height)); + min-height: calc(100vh - var(--bottom-height) - var(--nav-height)); + overflow: auto; + box-shadow: 1px 1px var(--mui-primary-light); +} + +.automation-manager--sidebar-box--bottom-buttons { + height: 100%; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/webapp/src/components/AutomationListV2/Sidebar/index.stories.tsx b/webapp/src/components/AutomationManager/Sidebar/index.stories.tsx similarity index 70% rename from webapp/src/components/AutomationListV2/Sidebar/index.stories.tsx rename to webapp/src/components/AutomationManager/Sidebar/index.stories.tsx index 6632b3a..b7b49b3 100644 --- a/webapp/src/components/AutomationListV2/Sidebar/index.stories.tsx +++ b/webapp/src/components/AutomationManager/Sidebar/index.stories.tsx @@ -2,7 +2,7 @@ import "styles/root.css"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { AutomationListSidebar } from "."; -import { makeTagDB } from "../TagDB"; +import { useTagDB } from "../TagDB"; import { useState } from "react"; import { AutomationListAuto } from "../types"; @@ -15,11 +15,32 @@ export default { const Template: ComponentStory = (args) => { const [automations, setAutomations] = useState(args.automations); + const [selectedAutomationId, setSelAutoId] = useState( + args.selectedAutomationId + ); + const onTagUpdate = (tags: Record, aid: string) => { + const index = automations.findIndex(({ id }) => id === aid); + if (index >= 0) { + setAutomations([ + ...automations.slice(0, index), + { + ...automations[index], + tags, + }, + ...automations.slice(index + 1), + ]); + } + }; return ( onTagUpdate(t, a))} automations={automations} + onSelectedAutomationId={(aid) => { + args.onSelectedAutomationId(aid); + setSelAutoId(aid); + }} onAutomationDelete={(aid) => { args.onAutomationDelete(aid); setAutomations(automations.filter(({ id }) => id !== aid)); @@ -38,20 +59,6 @@ const Template: ComponentStory = (args) => { ]); } }} - onTagUpdate={(tags, aid) => { - args.onTagUpdate(tags, aid); - const index = automations.findIndex(({ id }) => id === aid); - if (index >= 0) { - setAutomations([ - ...automations.slice(0, index), - { - ...automations[index], - tags, - }, - ...automations.slice(index + 1), - ]); - } - }} onAutomationAdd={() => { args.onAutomationAdd(); const id = String(Date.now()); @@ -63,10 +70,10 @@ const Template: ComponentStory = (args) => { title: "new", tags: {}, entityId: "automation." + id, - isSelected: true, state: "on", }, ]); + setSelAutoId(id); }} /> @@ -81,16 +88,18 @@ const make = (automations: AutomationListAuto[]) => { }; return Basic; }; -const makeAuto = (data: Partial): AutomationListAuto => ({ - id: String(Date.now()), - entityId: `automation.${Date.now()}`, - title: "", - description: "", - state: "on", - isSelected: false, - tags: {}, - ...data, -}); +const makeAuto = (data: Partial): AutomationListAuto => { + const id = `${Date.now()}_${Math.random().toString(26).slice(3, 6)}`; + return { + id, + entityId: `automation.${id}`, + title: "", + description: "", + state: "on", + tags: {}, + ...data, + }; +}; export const Empty = make([]); export const Basic = make([ @@ -110,4 +119,8 @@ export const Tagged = make([ title: "example 4", tags: { room: "bedroom", floor: "2", type: "button" }, }), + makeAuto({ + title: "example 5", + tags: { room: "bedroom", floor: "2", type: "routine", mode: "party" }, + }), ]); diff --git a/webapp/src/components/AutomationListV2/Sidebar/index.tsx b/webapp/src/components/AutomationManager/Sidebar/index.tsx similarity index 80% rename from webapp/src/components/AutomationListV2/Sidebar/index.tsx rename to webapp/src/components/AutomationManager/Sidebar/index.tsx index 1b02b44..3f73524 100644 --- a/webapp/src/components/AutomationListV2/Sidebar/index.tsx +++ b/webapp/src/components/AutomationManager/Sidebar/index.tsx @@ -15,7 +15,7 @@ import { Button } from "components/Inputs/Button"; export type AutomationListSidebarProps = { tagsDB: TagDB; automations: AutomationListAuto[]; - onTagUpdate: (t: Record, aid: string) => void; + selectedAutomationId: string | null; onAutomationUpdate: ( a: AutomationListAutoUpdatable, aid: string, @@ -23,17 +23,18 @@ export type AutomationListSidebarProps = { ) => void; onAutomationDelete: (aid: string) => void; onAutomationAdd: () => void; + onSelectedAutomationId: (aid: string) => void; }; export const AutomationListSidebar: FC = ({ automations, tagsDB, onAutomationAdd, + selectedAutomationId, + onSelectedAutomationId, ...events }) => { const [searchText, setSearchText] = useState(""); const [selectedTagIdx, setSelectedTagIdx] = useState([]); - const [selectedAutomationId, setSelectedAutomationId] = - useState(null); const tags = tagsDB.getTagNames([]); @@ -51,12 +52,12 @@ export const AutomationListSidebar: FC = ({ ); const items = grouping.top.map((i) => - convertGroupingToItems(i, automations, grouping) + convertGroupingToItems(i, selectedAutomationId, automations, grouping) ); return ( -
-
+
+
= ({ max={3} />
-
+
{items.map((item, i) => ( ))}
-
+
diff --git a/webapp/src/components/AutomationManager/TagDB.ts b/webapp/src/components/AutomationManager/TagDB.ts new file mode 100644 index 0000000..39a971b --- /dev/null +++ b/webapp/src/components/AutomationManager/TagDB.ts @@ -0,0 +1,93 @@ +import { useEffect, useState } from "react"; +export type TagDB = ReturnType; +export const useTagDB = ( + automations: Array<{ + id: string; + tags: Record; + }>, + onUpdate: (aid: string, tags: Record) => void +) => { + const [{ automationTags, changed }, setState] = useState({ + automationTags: convertAutoListToMap(automations), + changed: new Set(), + }); + const allTags = computeAllTags(automationTags); + const allTagNames = Object.keys(allTags); + const isModified = changed.size > 0; + + useEffect(() => { + console.log("updating..."); + setState({ + automationTags: convertAutoListToMap(automations), + changed: new Set(), + }); + }, [automations, setState]); + + return { + getTags(automationId: string) { + return automationTags[automationId] ?? {}; + }, + getTagNames(myTags: string[]): string[] { + return allTagNames.filter((n) => !myTags.includes(n)).sort(); + }, + getTagValues(tagName: string): string[] { + return allTags[tagName] + ? Array.from(allTags[tagName].values()).sort() + : []; + }, + isModified(aid: string) { + return changed.has(aid); + }, + update(aid: string, tags: Record) { + if (JSON.stringify(tags) !== JSON.stringify(automationTags[aid])) { + setState({ + changed: changed.add(aid), + automationTags: { + ...automationTags, + [aid]: tags, + }, + }); + } + }, + save(aid: string | null) { + if (isModified) { + if (aid) { + onUpdate(aid, automationTags[aid]); + } else { + for (const aid of changed.values()) { + onUpdate(aid, automationTags[aid]); + } + } + } + }, + }; +}; + +const convertAutoListToMap = ( + automations: Array<{ + id: string; + tags: Record; + }> +) => { + const automationTags: Record> = {}; + automations.forEach(({ id, tags }) => { + automationTags[id] = tags; + }); + return automationTags; +}; + +const computeAllTags = ( + automations: Record> +) => { + const allTags: Record> = {}; + Object.values(automations).forEach((tags) => { + Object.keys(tags).forEach((tagName) => { + const tagValue = tags[tagName]; + if (!allTags[tagName]) { + allTags[tagName] = new Set(); + } + allTags[tagName].add(tagValue); + }); + }); + return allTags; +}; diff --git a/webapp/src/components/AutomationListV2/automationGrouper.test.ts b/webapp/src/components/AutomationManager/automationGrouper.test.ts similarity index 96% rename from webapp/src/components/AutomationListV2/automationGrouper.test.ts rename to webapp/src/components/AutomationManager/automationGrouper.test.ts index 79911d9..994bbd5 100644 --- a/webapp/src/components/AutomationListV2/automationGrouper.test.ts +++ b/webapp/src/components/AutomationManager/automationGrouper.test.ts @@ -99,7 +99,7 @@ test("bigAutoList groupings has not duplicate ids", () => { test("convert grouper to items when no tags are selected", () => { const grouping = makeGrouping(automations, [], null); const items = grouping.top.map((i) => - convertGroupingToItems(i, automations, grouping) + convertGroupingToItems(i, "", automations, grouping) ); expect(items.filter((i) => i.type === "group")).toHaveLength(0); expect(items).toHaveLength(1); @@ -109,7 +109,7 @@ test("convert grouper to items when no tags are selected", () => { test("convert grouper to items when 1 tag is selected", () => { const grouping = makeGrouping(automations, ["Room"], null); const items = grouping.top.map((i) => - convertGroupingToItems(i, automations, grouping) + convertGroupingToItems(i, "", automations, grouping) ); expect(grouping.top).toHaveLength(3); expect(items.filter((i) => i.type === "group")).toHaveLength(0); @@ -125,7 +125,7 @@ test("convert grouper to items when 1 tag is selected", () => { test("convert grouper to items when 2 tag is selected", () => { const grouping = makeGrouping(automations, ["Room", "Type"], null); const items = grouping.top.map((i) => - convertGroupingToItems(i, automations, grouping) + convertGroupingToItems(i, "", automations, grouping) ); expect(grouping.top).toHaveLength(3); expect(items.filter((i) => i.type === "group")).toHaveLength(2); diff --git a/webapp/src/components/AutomationListV2/automationGrouper.tsx b/webapp/src/components/AutomationManager/automationGrouper.tsx similarity index 93% rename from webapp/src/components/AutomationListV2/automationGrouper.tsx rename to webapp/src/components/AutomationManager/automationGrouper.tsx index 620cb4b..98aa699 100644 --- a/webapp/src/components/AutomationListV2/automationGrouper.tsx +++ b/webapp/src/components/AutomationManager/automationGrouper.tsx @@ -149,6 +149,7 @@ export const makeGrouping = ( export const convertGroupingToItems = ( currentGroupIdx: number, + selectedAutomationId: string | null, autos: AutomationListAuto[], grouping: AutomationGrouping ): AutomationListItem => { @@ -159,7 +160,12 @@ export const convertGroupingToItems = ( return { type: "items", title: groupData.name, - data: automationIds.map((i) => autos[i]), + data: automationIds.map((i) => { + return { + ...autos[i], + isSelected: autos[i].id === selectedAutomationId, + }; + }), isSelected: groupData.selected, }; } @@ -167,7 +173,9 @@ export const convertGroupingToItems = ( return { type: "group", title: groupData.name, - data: subgroups.map((i) => convertGroupingToItems(i, autos, grouping)), + data: subgroups.map((i) => + convertGroupingToItems(i, selectedAutomationId, autos, grouping) + ), isSelected: groupData.selected, }; }; diff --git a/webapp/src/components/AutomationListV2/helpers.ts b/webapp/src/components/AutomationManager/helpers.ts similarity index 94% rename from webapp/src/components/AutomationListV2/helpers.ts rename to webapp/src/components/AutomationManager/helpers.ts index 253eba0..cd562e7 100644 --- a/webapp/src/components/AutomationListV2/helpers.ts +++ b/webapp/src/components/AutomationManager/helpers.ts @@ -6,7 +6,6 @@ import { AutomationListAuto } from "./types"; export const consolidateAutomations = ( haEntities: HassEntities, configAutomationMetadatas: AutomationMetadata[], - selectedAutomationId: string, tagsDB: TagDB ): AutomationListAuto[] => { const configData: Record = @@ -45,7 +44,6 @@ export const consolidateAutomations = ( state: entityData.state, tags: tagsDB.getTags(autoId), issue, - isSelected: selectedAutomationId === autoId, }; }); @@ -57,7 +55,6 @@ export const consolidateAutomations = ( description: autoMetadata.description ?? "", state: "unregistered", tags: tagsDB.getTags(autoMetadata.id), - isSelected: selectedAutomationId === autoMetadata.id, issue: "homeassistant did not load this automation, try to manually reload automations or restart homeassistant.", }); diff --git a/webapp/src/components/AutomationManager/index.tsx b/webapp/src/components/AutomationManager/index.tsx new file mode 100644 index 0000000..03e588d --- /dev/null +++ b/webapp/src/components/AutomationManager/index.tsx @@ -0,0 +1,50 @@ +import { ListData } from "apiService/types"; +import { HAEntitiesState } from "haService/HAEntities"; +import { FC } from "react"; +import { AutomationData } from "types/automations"; +import { consolidateAutomations } from "./helpers"; +import { AutomationListSidebar } from "./Sidebar"; +import { useAutomationManagerState } from "./state"; +import { useTagDB } from "./TagDB"; + +export type AutomationListProps = { + haEntites: HAEntitiesState; + configAutomations: ListData; + onUpdate: (i: number, auto: AutomationData) => void; + onUpdateTags: (id: string, tags: Record) => void; + onUpdateState: (id: string, state: string) => void; + onTrigger: (id: string, state: string) => void; + onAdd: () => void; + onRemove: (i: number) => void; +}; + +export const AutomationList: FC = (props) => { + const state = useAutomationManagerState(); + + if (!props.haEntites.ready) { + return
...
; + } + + const tagsDB = useTagDB( + props.configAutomations.data.map(({ metadata: { id }, tags }) => ({ + id, + tags, + })), + props.onUpdateTags + ); + const automations = consolidateAutomations( + props.haEntites.collection.state, + props.configAutomations.data.map(({ metadata }) => metadata), + tagsDB + ); + return ( +
+ {/* */} +
+ ); +}; diff --git a/webapp/src/components/AutomationManager/state.ts b/webapp/src/components/AutomationManager/state.ts new file mode 100644 index 0000000..c52862b --- /dev/null +++ b/webapp/src/components/AutomationManager/state.ts @@ -0,0 +1,25 @@ +import { useState } from "react"; +import { useCookies } from "react-cookie"; + +export const useAutomationManagerState = () => { + const [ + cookies, + setCookies, + // eslint-disable-next-line + _, + ] = useCookies(["selectedAutomation"]); + let initialCurrent = null; + try { + initialCurrent = cookies.selectedAutomation ?? null; + } catch (_) {} + + const [current, setCurrent] = useState(initialCurrent); + + return { + current, + setCurrent(i: string | null) { + setCurrent(i); + setCookies("selectedAutomation", i === null ? undefined : i); + }, + }; +}; diff --git a/webapp/src/components/AutomationListV2/types.ts b/webapp/src/components/AutomationManager/types.ts similarity index 87% rename from webapp/src/components/AutomationListV2/types.ts rename to webapp/src/components/AutomationManager/types.ts index e5f58c5..fcd45ab 100644 --- a/webapp/src/components/AutomationListV2/types.ts +++ b/webapp/src/components/AutomationManager/types.ts @@ -8,7 +8,6 @@ export type AutomationListAuto = AutomationListAutoUpdatable & { entityId: string; tags: Record; issue?: string; - isSelected: boolean; }; export type AutomationListItem = { @@ -21,6 +20,6 @@ export type AutomationListItem = { } | { type: "items"; - data: Array; + data: Array; } ); diff --git a/webapp/src/components/Inputs/InputAutoText.tsx b/webapp/src/components/Inputs/InputAutoText.tsx index 322f684..3bc000f 100644 --- a/webapp/src/components/Inputs/InputAutoText.tsx +++ b/webapp/src/components/Inputs/InputAutoText.tsx @@ -27,7 +27,7 @@ export default function InputAutoText({ freeSolo className={["input-autotext", className ?? ""].join(" ")} value={value} - options={options} + options={options.filter((opt) => opt !== value)} disableClearable onChange={(_e, v) => onChange(v === null ? "" : v)} renderInput={(params) => ( diff --git a/webapp/src/components/Inputs/InputMultiSelect.stories.tsx b/webapp/src/components/Inputs/InputMultiSelect.stories.tsx index 16cb8e4..182005c 100644 --- a/webapp/src/components/Inputs/InputMultiSelect.stories.tsx +++ b/webapp/src/components/Inputs/InputMultiSelect.stories.tsx @@ -5,36 +5,37 @@ import { useEffect, useState } from "react"; import InputMultiSelect from "./InputMultiSelect"; export default { - title: 'Inputs/InputMultiSelect', + title: "Inputs/InputMultiSelect", component: InputMultiSelect, - parameters: { actions: { argTypesRegex: '^on.*' } }, + parameters: { actions: { argTypesRegex: "^on.*" } }, } as ComponentMeta; - -const Template: ComponentStory = args => { - - const [value, setValue] = useState(args.selected) +const Template: ComponentStory = (args) => { + const [value, setValue] = useState(args.selected); useEffect(() => { setValue(args.selected); - }, [args.selected]) + }, [args.selected]); - return - { - setValue(a); - args.onChange(a); - }} options={args.options} selected={value} /> - -} + return ( + + { + setValue(a); + args.onChange(a); + }} + options={args.options} + selected={value} + /> + + ); +}; -export const Simple = Template.bind({}) +export const Simple = Template.bind({}); Simple.args = { label: "Room Tags", - options: [ - "Bears", - "Cats", - "Kitchen", - "Bathroom", - ], + options: ["Bears", "Cats", "Kitchen", "Bathroom"], selected: [1], -} + max: 2, +}; diff --git a/webapp/src/components/Inputs/InputMultiSelect.tsx b/webapp/src/components/Inputs/InputMultiSelect.tsx index 9806019..aa5df08 100644 --- a/webapp/src/components/Inputs/InputMultiSelect.tsx +++ b/webapp/src/components/Inputs/InputMultiSelect.tsx @@ -1,7 +1,13 @@ import { ArrowIcon } from "components/Icons"; import { useInputMultiSelectStyles } from "./styles"; -import { useState } from 'react'; +import { useState } from "react"; +import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank"; +import CheckBoxIcon from "@mui/icons-material/CheckBox"; +import Autocomplete from "@mui/material/Autocomplete"; +import TextField from "@mui/material/TextField"; +import Checkbox from "@mui/material/Checkbox"; +import { useSnackbar } from "notistack"; export interface Props { label: string; @@ -13,53 +19,86 @@ export interface Props { className?: string; } export default function InputMultiSelect({ - selected = [], options, onChange, label, max, + selected = [], + options, + onChange, + label, + max = 3, }: Props) { - // state - const [open, setOpen] = useState(false); - // alias - const maxedOut = max ? selected.length >= max : false; - const toggle = () => setOpen(!open); - + const snackbr = useSnackbar(); + return ( + options[i])} + onChange={(_, newValues: T[] = []) => { + if (newValues.length > max) { + snackbr.enqueueSnackbar("Can only select up to 3 tags", { + variant: "warning", + autoHideDuration: 1500, + }); + } + onChange( + newValues + .map((v) => options.indexOf(v)) + .filter((v) => v > -1) + .slice(0, max) + ); + }} + renderOption={(props, option, { selected }) => ( +
  • + } + checkedIcon={} + style={{ marginRight: 8 }} + checked={selected} + /> + {option} +
  • + )} + renderInput={(params) => ( + + )} + /> + ); // style - const { classes } = useInputMultiSelectStyles({ - open, - selected, - maxedOut, - }); + // const { classes } = useInputMultiSelectStyles({ + // open, + // selected, + // maxedOut, + // }); - - return
    -
    - - {selected.length} - -
    - {options.map((v, i) => { - const selectedCount = selected.indexOf(i); - const isSelected = selectedCount > -1; - return
    { - if (!isSelected) { - if (!maxedOut) { - onChange([...selected, i]) - } - } else { - onChange( - selected.slice(0, selectedCount).concat(selected.slice(selectedCount + 1)) - ) - } - }} - > - {v} - {selectedCount} -
    - })} -
    -
    -
    + // return
    + //
    + // + // {selected.length} + // + //
    + // {options.map((v, i) => { + // const selectedCount = selected.indexOf(i); + // const isSelected = selectedCount > -1; + // return
    { + // if (!isSelected) { + // if (!maxedOut) { + // onChange([...selected, i]) + // } + // } else { + // onChange( + // selected.slice(0, selectedCount).concat(selected.slice(selectedCount + 1)) + // ) + // } + // }} + // > + // {v} + // {selectedCount} + //
    + // })} + //
    + //
    + //
    }