Compare commits

...
Author SHA1 Message Date
renovate[bot] 6cd055c6bc Update dependency webpack-dev-server to v5 [SECURITY] 2026-04-08 21:31:58 +00:00
renovate[bot] f061894430 Update dependency types-PyYAML to v6.0.12.20240311 (#185) 2024-05-02 14:08:40 -04:00
renovate[bot] 7769ba00c3 Update dependency fastapi to v0.109.1 [SECURITY] (#188) 2024-05-02 14:07:19 -04:00
renovate[bot] 18241c2057 Update dependency pydantic to v1.10.13 [SECURITY] (#189) 2024-05-02 09:47:50 -04:00
Ari Sosnovsky 8b516d958c Update README.md 2023-12-20 17:51:32 -05:00
Ari Sosnovsky 6422b8d974 Update README.md 2023-12-20 17:50:31 -05:00
dependabot[bot] ee77edea78 Bump deep-object-diff from 1.1.7 to 1.1.9 in /webapp (#171) 2022-11-16 23:52:14 -05:00
dependabot[bot] 4d667d1432 Bump loader-utils from 1.4.0 to 1.4.2 in /webapp (#170) 2022-11-16 23:51:46 -05:00
renovate[bot]andAri Sosnovsky 3df79c17d6 Update dependency @types/react to v18.0.25 (#167)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ari Sosnovsky <asosnovsky@users.noreply.github.com>
2022-11-06 19:56:18 -05:00
renovate[bot] 5b920d366e Update dependency @types/react-dom to v18.0.8 (#168)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-11-06 19:55:45 -05:00
renovate[bot] 201912f471 Update dependency material-ui-confirm to v3.0.6 (#165) 2022-10-11 23:42:58 +03:00
renovate[bot] 117595f63f Update dependency @types/react to v18.0.21 (#164) 2022-10-11 23:38:39 +03:00
ari a5aec24686 fix 2022-09-24 15:15:54 -04:00
ari 8a6415a58b linting fix 2022-09-24 15:15:44 -04:00
ari d7ca62afa7 fixed visual bugs 2022-09-24 15:12:22 -04:00
ari 8fea6f1082 Hidable triggers/conditions 2022-09-24 14:24:03 -04:00
ari 51bac6f0e9 v0.7.6 2022-09-07 12:22:44 -04:00
38 changed files with 1740 additions and 470 deletions

No files matched your search

+5
View File
@@ -1,5 +1,10 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.7.6] Bugfixes
- Less deadly error for invalid packages with better logs
- Update notification
## [0.7.4] Bugfixes ## [0.7.4] Bugfixes
- Backend now correctly returns unset alias + description - Backend now correctly returns unset alias + description
+3
View File
@@ -1,3 +1,6 @@
:no_entry: [DEPRECATED] Due to lack of time on my part, this project is no longer being worked on. :( :no_entry: [DEPRECATED]
----
# <img src="logo.png" height="40x"/> Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic) # <img src="logo.png" height="40x"/> Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
+5 -4
View File
@@ -1,8 +1,8 @@
get_index # unused function (src/api/app.py:41) get_index # unused function (src/api/app.py:41)
list_autos # unused function (src/api/routes/automations.py:14) list_autos # unused function (src/api/routes/automations.py:14)
insert_auto # unused function (src/api/routes/automations.py:30) insert_auto # unused function (src/api/routes/automations.py:30)
update_auto # unused function (src/api/routes/automations.py:35) update_auto # unused function (src/api/routes/automations.py:37)
delete_auto # unused function (src/api/routes/automations.py:45) delete_auto # unused function (src/api/routes/automations.py:49)
read_details # unused function (src/api/routes/details.py:12) read_details # unused function (src/api/routes/details.py:12)
read_profile # unused function (src/api/routes/details.py:24) read_profile # unused function (src/api/routes/details.py:24)
save_profile # unused function (src/api/routes/details.py:28) save_profile # unused function (src/api/routes/details.py:28)
@@ -26,5 +26,6 @@ _.automation_tags # unused property (src/hass_config/loader.py:28)
json_dumps # unused function (src/json_serializer.py:5) json_dumps # unused function (src/json_serializer.py:5)
theme # unused variable (src/user_profile.py:10) theme # unused variable (src/user_profile.py:10)
lang # unused variable (src/user_profile.py:11) lang # unused variable (src/user_profile.py:11)
SecretValue # unused class (src/yaml_serializer/__init__.py:48) flags # unused variable (src/user_profile.py:12)
EnvVar # unused class (src/yaml_serializer/__init__.py:186) SecretValue # unused class (src/yaml_serializer/__init__.py:55)
EnvVar # unused class (src/yaml_serializer/__init__.py:193)
+3 -3
View File
@@ -5,8 +5,8 @@ setuptools.setup(
python_requires=">=3.10", python_requires=">=3.10",
install_requires=[ install_requires=[
"PyYAML==6.0", "PyYAML==6.0",
"fastapi==0.78.0", "fastapi==0.109.1",
"pydantic==1.9.1", "pydantic==1.10.13",
"hypercorn==0.13.2", "hypercorn==0.13.2",
"python-decouple==3.6", "python-decouple==3.6",
"websockets==10.3", "websockets==10.3",
@@ -22,7 +22,7 @@ setuptools.setup(
"pre-commit==2.20.0", "pre-commit==2.20.0",
"vulture==2.5", "vulture==2.5",
"types-requests==2.28.4", "types-requests==2.28.4",
"types-PyYAML==6.0.11", "types-PyYAML==6.0.12.20240311",
"requests==2.28.1", "requests==2.28.1",
], ],
}, },
+3 -2
View File
@@ -1,6 +1,6 @@
from typing import Literal from typing import Dict, Literal
from pydantic import BaseModel from pydantic import BaseModel, Field
from src.hass_config import HassConfig from src.hass_config import HassConfig
from src.yaml_serializer import dump_yaml, load_yaml from src.yaml_serializer import dump_yaml, load_yaml
@@ -9,6 +9,7 @@ from src.yaml_serializer import dump_yaml, load_yaml
class UserProfile(BaseModel): class UserProfile(BaseModel):
theme: Literal["dark", "light"] = "dark" theme: Literal["dark", "light"] = "dark"
lang: str = "eng" lang: str = "eng"
flags: Dict[str, bool] = Field(default_factory=dict)
@classmethod @classmethod
def from_hass_config(cls, hass_config: HassConfig): def from_hass_config(cls, hass_config: HassConfig):
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: v0.7.4 version: v0.7.6
slug: shortumation slug: shortumation
image: "asosnovsky/shortumation-{arch}" image: "asosnovsky/shortumation-{arch}"
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
+6 -6
View File
@@ -6,19 +6,19 @@
"dependencies": { "dependencies": {
"@emotion/react": "11.9.3", "@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3", "@emotion/styled": "11.9.3",
"@mui/icons-material": "5.8.4", "@mui/icons-material": "5.10.6",
"@mui/material": "5.8.6", "@mui/material": "5.10.6",
"@mui/styles": "5.8.6", "@mui/styles": "5.8.6",
"@types/jest": "28.1.8", "@types/jest": "28.1.8",
"@types/node": "17.0.36", "@types/node": "17.0.36",
"@types/react": "18.0.18", "@types/react": "18.0.25",
"@types/react-dom": "18.0.6", "@types/react-dom": "18.0.8",
"@types/ws": "8.5.3", "@types/ws": "8.5.3",
"@uiw/react-codemirror": "4.10.4", "@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "3.3.4", "autosuggest-highlight": "3.3.4",
"home-assistant-js-websocket": "7.1.0", "home-assistant-js-websocket": "7.1.0",
"jss": "10.9.2", "jss": "10.9.2",
"material-ui-confirm": "3.0.4", "material-ui-confirm": "3.0.6",
"notistack": "2.0.5", "notistack": "2.0.5",
"react": "18.2.0", "react": "18.2.0",
"react-cookie": "4.1.1", "react-cookie": "4.1.1",
@@ -94,7 +94,7 @@
"jest-environment-jsdom": "28.1.3", "jest-environment-jsdom": "28.1.3",
"ts-node": "10.9.1", "ts-node": "10.9.1",
"webpack": "5.74.0", "webpack": "5.74.0",
"webpack-dev-server": "4.9.3" "webpack-dev-server": "5.2.1"
}, },
"moduleDirectories": [ "moduleDirectories": [
"node_modules", "node_modules",
@@ -1,9 +0,0 @@
.automation-editor--nodes-row .collection-nodes--wrap {
--node-height: 12em !important;
--node-width: 100% !important;
}
.automation-editor--nodes-row .collection-nodes--wrap .collection-nodes {
min-width: 90%;
min-height: 10em;
}
@@ -1,40 +0,0 @@
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { makeStory } from "devUtils";
import { useState } from "react";
import { NodesRow } from ".";
const { make, componentMeta } = makeStory({
Component: NodesRow,
BaseTemplate: (props) => {
const [data, setData] = useState(props.data);
return (
<NodesRow
{...props}
data={data}
onUpdate={(up) => {
setData(up);
props.onUpdate(up);
}}
/>
);
},
meta: {
title: "App/AutomationEditor/NodesRow",
args: {
data: [],
sequenceNodeDims: DEFAULT_DIMS.node,
},
},
});
export default componentMeta;
export const Empty = make({});
export const One = make({
type: "trigger",
data: [
{
platform: "calendar",
event: "test",
},
],
});
@@ -1,42 +0,0 @@
import "./index.css";
import { AutomationNode, AutomationNodeMapping } from "types/automations";
import { useHA } from "services/ha";
import { CollectionNodeElement } from "components/DAGGraph/nodes/CollectionNode/CollectionNodeElement";
import { getDescriptionFromAutomationNode } from "utils/formatting";
import { Size } from "components/DAGGraph/elements/types";
export type NodesRowProps<
K extends keyof AutomationNodeMapping,
T extends AutomationNode<K>
> = {
type: K;
data: T[];
onUpdate: (d: T[]) => void;
sequenceNodeDims: Size;
};
export function NodesRow<
K extends keyof AutomationNodeMapping,
T extends AutomationNode<K>
>({ type: collectionType, data, sequenceNodeDims }: NodesRowProps<K, T>) {
const { namer } = useHA();
return (
<div className="automation-editor--nodes-row">
<CollectionNodeElement
width={0}
height={0}
nodes={data.map((node) => ({
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
onXClick: () => {},
}))}
onAddNode={() => {}}
collectionType={collectionType}
title="if"
sequenceNode={sequenceNodeDims}
flipped
/>
</div>
);
}
@@ -128,3 +128,12 @@
display: flex; display: flex;
gap: 1em; gap: 1em;
} }
.automation-editor.fullscreen .automation-editor--flow-wrapper--toolbar--title {
display: none;
}
.automation-editor.fullscreen .automation-editor--flow-wrapper--toolbar {
justify-content: flex-end;
margin-top: 0.5em;
}
@@ -2,7 +2,6 @@ import "./index.css";
import "./index.mobile.css"; import "./index.mobile.css";
import { FC, useState } from "react"; import { FC, useState } from "react";
import { useCookies } from "react-cookie";
import Skeleton from "@mui/material/Skeleton"; import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
@@ -11,7 +10,6 @@ import SpeedDialAction from "@mui/material/SpeedDialAction";
import SpeedDialIcon from "@mui/icons-material/SettingsRounded"; import SpeedDialIcon from "@mui/icons-material/SettingsRounded";
import UndoIcon from "@mui/icons-material/UndoSharp"; import UndoIcon from "@mui/icons-material/UndoSharp";
import Icon from "@mui/material/Icon";
import EditIcon from "@mui/icons-material/ModeEditOutlineTwoTone"; import EditIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
import DeleteIcon from "@mui/icons-material/DeleteForever"; import DeleteIcon from "@mui/icons-material/DeleteForever";
import { CheckMarkIcon } from "components/Icons"; import { CheckMarkIcon } from "components/Icons";
@@ -34,7 +32,16 @@ import { useAutomatioEditorState, EditorData } from "./state";
import { useLang } from "services/lang"; import { useLang } from "services/lang";
import { useSnackbar } from "notistack"; import { useSnackbar } from "notistack";
import { Alert } from "@mui/material"; import { Alert } from "@mui/material";
import { useUserProfile } from "services/api";
import {
ControlButton,
ReactFlowProvider,
useReactFlow,
} from "react-flow-renderer";
import FitInIcon from "@mui/icons-material/FitScreenRounded";
import FullscreenIcon from "@mui/icons-material/FullscreenRounded";
import FullscreenExitIcon from "@mui/icons-material/FullscreenExitRounded";
import { useEffect } from "react";
interface Props { interface Props {
automation?: AutomationData | BareAutomationData; automation?: AutomationData | BareAutomationData;
dims: DAGDims; dims: DAGDims;
@@ -46,7 +53,14 @@ interface Props {
readonly: boolean; readonly: boolean;
issue?: string; issue?: string;
} }
export const AutomationEditor: FC<Props> = ({ export const AutomationEditor: FC<Props> = (props) => {
return (
<ReactFlowProvider>
<AutomationEditorInner {...props} />
</ReactFlowProvider>
);
};
export const AutomationEditorInner: FC<Props> = ({
dims, dims,
automation: propsAutos, automation: propsAutos,
onUpdate: propsOnUpdate, onUpdate: propsOnUpdate,
@@ -57,6 +71,8 @@ export const AutomationEditor: FC<Props> = ({
issue, issue,
}) => { }) => {
// state // state
const reactFlow = useReactFlow();
const userProfile = useUserProfile();
const langStore = useLang(); const langStore = useLang();
const snackbr = useSnackbar(); const snackbr = useSnackbar();
const { const {
@@ -79,15 +95,18 @@ export const AutomationEditor: FC<Props> = ({
} }
}); });
const [infoBoxOpen, setInfoBox] = useState(false); const [infoBoxOpen, setInfoBox] = useState(false);
const [ const [fullScreenMode, setFullScreenMode] = useState(false);
{ ckFlipped },
setCookies,
// eslint-disable-next-line
_,
] = useCookies(["ckFlipped"]);
// alias // alias
const flipped = dims.flipped ? true : ckFlipped === "1"; const flipped = userProfile.flags.flipped ?? !dims.flipped;
const setFlipped = (v: boolean) => setCookies("ckFlipped", v ? "1" : "0"); const useNodesRow = userProfile.flags.useNodesRow !== false;
// effect
useEffect(() => {
if (reactFlow) {
setTimeout(() => {
reactFlow.fitView();
}, 500);
}
}, [flipped, fullScreenMode, reactFlow]);
// render // render
if (state.status === "loading") { if (state.status === "loading") {
return ( return (
@@ -114,6 +133,7 @@ export const AutomationEditor: FC<Props> = ({
"automation-editor", "automation-editor",
state.status, state.status,
readonly ? "readonly" : "", readonly ? "readonly" : "",
fullScreenMode ? "fullscreen" : "",
].join(" ")} ].join(" ")}
> >
{state.status === "saving" && ( {state.status === "saving" && (
@@ -220,15 +240,6 @@ export const AutomationEditor: FC<Props> = ({
} }
/> />
</div> </div>
{!dims.flipped && (
<Button
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
onClick={() => setFlipped(!flipped)}
>
<Icon>{flipped ? "flip_to_front" : "flip_to_back"}</Icon>
{langStore.get("FLIPP")}
</Button>
)}
{state.status === "changed" && ( {state.status === "changed" && (
<Button onClick={undo}> <Button onClick={undo}>
<UndoIcon /> <UndoIcon />
@@ -255,6 +266,17 @@ export const AutomationEditor: FC<Props> = ({
onTriggerUpdate={updateTrigger} onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition} onConditionUpdate={updateCondition}
isFlipped={flipped} isFlipped={flipped}
useNodesRow={useNodesRow}
additionalControls={
<>
<ControlButton onClick={() => setFullScreenMode(!fullScreenMode)}>
{fullScreenMode ? <FullscreenExitIcon /> : <FullscreenIcon />}
</ControlButton>
<ControlButton onClick={() => reactFlow.fitView()}>
<FitInIcon />
</ControlButton>
</>
}
/> />
<SpeedDial <SpeedDial
ariaLabel="options label" ariaLabel="options label"
@@ -6,6 +6,11 @@
position: relative; position: relative;
height: 100%; height: 100%;
min-width: calc(min(max(25vw, 35em), 50vw)); min-width: calc(min(max(25vw, 35em), 50vw));
transition: min-width ease-in-out 500ms,
min-height ease-in-out 500ms,
height ease-in-out 500ms,
width ease-in-out 500ms,
opacity ease-in-out 500ms;
} }
.automation-manager--sidebar-box--nav { .automation-manager--sidebar-box--nav {
@@ -35,10 +40,14 @@
} }
.automation-manager--sidebar.hidden { .automation-manager--sidebar.hidden {
width: 2.5em; width: 3em;
min-width: 0; min-width: 0;
} }
.automation-manager--sidebar.hidden .add-btn {
display: none;
}
.automation-manager--sidebar.hidden .automation-manager--sidebar-box--nav, .automation-manager--sidebar.hidden .automation-manager--sidebar-box--nav,
.automation-manager--sidebar.hidden .automation-manager--sidebar-box--list, .automation-manager--sidebar.hidden .automation-manager--sidebar-box--list,
.automation-manager--sidebar.hidden .automation-manager--sidebar-box--bottom-buttons .add-btn { .automation-manager--sidebar.hidden .automation-manager--sidebar-box--bottom-buttons .add-btn {
@@ -6,6 +6,7 @@ import { InputList } from "components/Inputs/InputList";
import { useLang } from "services/lang"; import { useLang } from "services/lang";
import { FC, useState } from "react"; import { FC, useState } from "react";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
import InputBoolean from "components/Inputs/Base/InputBoolean";
export type UserProfileProps = { export type UserProfileProps = {
api: ApiService; api: ApiService;
@@ -43,6 +44,26 @@ export const UserProfileEditor: FC<UserProfileProps> = ({ api }) => {
}); });
} }
}; };
const updateFlag =
<K extends keyof UserProfile["flags"], D extends UserProfile["flags"][K]>(
key: K
) =>
(data: D) => {
if (profile.ready) {
setIsSaving(true);
api
.setProfile({
...profile.data,
flags: {
...profile.data.flags,
[key]: data,
},
})
.then(() => {
setIsSaving(false);
});
}
};
return ( return (
<div className="user-profile"> <div className="user-profile">
<InputList <InputList
@@ -57,6 +78,16 @@ export const UserProfileEditor: FC<UserProfileProps> = ({ api }) => {
current={profile.data.lang} current={profile.data.lang}
onChange={update("lang")} onChange={update("lang")}
/> />
<InputBoolean
label={lang.get("FLIPP_GRAPH")}
value={profile.data.flags.flipped ?? false}
onChange={updateFlag("flipped")}
/>
<InputBoolean
label={lang.get("NODES_ROW")}
value={profile.data.flags.useNodesRow ?? true}
onChange={updateFlag("useNodesRow")}
/>
{saving && <LinearProgress />} {saving && <LinearProgress />}
</div> </div>
); );
@@ -0,0 +1,92 @@
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { makeStory } from "devUtils";
import { NodesRow } from ".";
import { createUpdater } from "../updater/index";
const { make, componentMeta } = makeStory({
Component: NodesRow,
BaseTemplate: (props) => {
const updater = createUpdater({
openModal: () => {},
action: {
data: [],
onUpdate: () => {},
},
condition: {
data: [],
onUpdate: () => {},
},
trigger: {
data: [],
onUpdate: () => {},
},
});
return <NodesRow {...props} stateUpdater={updater} />;
},
meta: {
title: "DAGGraph/NodesRow/Single",
args: {
type: "trigger",
data: [],
sequenceNodeDims: DEFAULT_DIMS.node,
},
},
});
export default componentMeta;
export const Empty = make({});
export const One = make({
data: [
{
platform: "calendar",
event: "start",
},
],
});
export const Many = make({
data: [
{
platform: "calendar",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
].map((n, id) => ({
...n,
id: `Trigger ${id}`,
})),
});
@@ -0,0 +1,95 @@
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
import { makeStory } from "devUtils";
import { createUpdater } from "../updater";
import { TriggerConditionNodeRow } from ".";
const { make, componentMeta } = makeStory({
Component: TriggerConditionNodeRow,
BaseTemplate: (props) => {
const updater = createUpdater({
openModal: () => {},
action: {
data: [],
onUpdate: () => {},
},
condition: {
data: [],
onUpdate: () => {},
},
trigger: {
data: [],
onUpdate: () => {},
},
});
return <TriggerConditionNodeRow {...props} stateUpdater={updater} />;
},
meta: {
title: "DAGGraph/NodesRow/TriggerAndConditions",
args: {
condition: [],
trigger: [],
sequenceNodeDims: DEFAULT_DIMS.node,
},
},
});
export default componentMeta;
export const Empty = make({});
export const One = make({
trigger: [
{
platform: "calendar",
event: "start",
},
],
condition: [
{
condition: "and",
conditions: [],
},
],
});
export const Many = make({
trigger: [
{
platform: "calendar",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
{
platform: "homeassistant",
event: "start",
},
],
});
@@ -0,0 +1,87 @@
/* .nodes-row--outer {
--nodes-row-height: 10em;
min-width: 100%;
width: 100%;
max-width: 100%;
min-height: var(--nodes-row-height);
height: var(--nodes-row-height);
max-height: var(--nodes-row-height);
overflow: auto;
}
.nodes-row--inner {
max-width: calc(100% - 4em);
width: calc(100% - 4em);
min-height: calc(var(--nodes-row-height) - 2em);
max-height: calc(var(--nodes-row-height) - 2em);
gap: 2em;
padding-left: 1em;
padding-right: 1em;
border-style: solid;
border-top-width: 0.125em;
border-left-width: 1px;
border-right-width: 1px;
border-radius: 10px;
border-bottom-color: var(--mui-grey-500);
border-left-color: var(--mui-grey-700);
border-right-color: var(--mui-grey-700);
border-top-color: var(--sequence-node-color);
overflow: auto;
} */
.nodes-row--inner.collection-nodes--wrap {
--node-height: none !important;
--node-width: 100% !important;
margin: 0;
display: flex;
flex: 1;
min-width: 95%;
max-width: 95%;
}
.nodes-row--inner.collection-nodes--wrap .collection-nodes {
min-width: 90%;
min-height: 8em;
max-height: 8em;
overflow: hidden;
}
.trigger-condition-nodes-row {
gap: 0.25em;
}
.fullscreen .trigger-condition-nodes-row .nodes-row--inner {
opacity: 0;
height: 0;
z-index: -10;
}
.nodes-row--inner.collection-nodes--wrap .collection-nodes .collection-nodes--inner {
min-width: inherit;
width: inherit;
max-width: inherit;
padding-bottom: 0 !important;
padding-left: 0 !important;
min-height: 5em;
max-height: 7em;
}
.mobile .trigger-condition-nodes-row {
flex-direction: column;
}
.mobile .nodes-row.collection-nodes--wrap .collection-nodes {
width: 80%;
}
@@ -0,0 +1,85 @@
import "./index.css";
import { AutomationNode, AutomationNodeMapping } from "types/automations";
import { useHA } from "services/ha";
import { CollectionNodeElement } from "components/DAGGraph/nodes/CollectionNode/CollectionNodeElement";
import { Size } from "components/DAGGraph/elements/types";
import { DAGGraphUpdater } from "components/DAGGraph/updater";
import { makeCollectionNodeMakerChildProps } from "components/DAGGraph/elements/helpers";
import { AutomationCondition } from "types/automations/conditions";
import { AutomationTrigger } from "types/automations/triggers";
import { FC } from "react";
export type NodesRowProps<
K extends keyof AutomationNodeMapping,
T extends AutomationNode<K>
> = {
type: K;
data: T[];
stateUpdater: DAGGraphUpdater;
sequenceNodeDims: Size;
};
export function NodesRow<
K extends keyof AutomationNodeMapping,
T extends AutomationNode<K>
>({
type: collectionType,
data,
sequenceNodeDims,
stateUpdater,
}: NodesRowProps<K, T>) {
const { namer } = useHA();
return (
<div className="nodes-row--outer center row">
<CollectionNodeElement
className="nodes-row--inner"
width={0}
height={0}
nodes={data.map((node, i) =>
makeCollectionNodeMakerChildProps(
collectionType,
node,
i,
stateUpdater,
namer
)
)}
onAddNode={() => stateUpdater.basic[collectionType].addNode(null)}
collectionType={collectionType}
sequenceNode={sequenceNodeDims}
flipped
/>
</div>
);
}
export type TriggerConditionNodeRowProps = {
condition: AutomationCondition[];
trigger: AutomationTrigger[];
stateUpdater: DAGGraphUpdater;
sequenceNodeDims: Size;
};
export const TriggerConditionNodeRow: FC<TriggerConditionNodeRowProps> = ({
condition,
trigger,
stateUpdater,
sequenceNodeDims,
}) => {
return (
<div className={["trigger-condition-nodes-row column"].join(" ")}>
<NodesRow
data={trigger}
type="trigger"
stateUpdater={stateUpdater}
sequenceNodeDims={sequenceNodeDims}
/>
<NodesRow
data={condition}
type="condition"
stateUpdater={stateUpdater}
sequenceNodeDims={sequenceNodeDims}
/>
</div>
);
};
@@ -11,7 +11,6 @@ const { make, componentMeta } = makeStory({
}); });
export default componentMeta; export default componentMeta;
export const Example = make({});
export const Loading = make({ export const Loading = make({
state: { state: {
+9 -11
View File
@@ -2,7 +2,7 @@ import "./index.css";
import { FC } from "react"; import { FC } from "react";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import ReactFlow, { Controls, ReactFlowProvider } from "react-flow-renderer"; import ReactFlow, { Controls } from "react-flow-renderer";
import { NodeEditor } from "components/NodeEditor"; import { NodeEditor } from "components/NodeEditor";
import { Modal } from "components/Modal"; import { Modal } from "components/Modal";
@@ -10,15 +10,7 @@ import { Modal } from "components/Modal";
import { nodeTypes } from "../nodes"; import { nodeTypes } from "../nodes";
import { DAGGraphBoardProps } from "./types"; import { DAGGraphBoardProps } from "./types";
export const DAGGraphBoard: FC<DAGGraphBoardProps> = (props) => { export const DAGGraphBoard: FC<DAGGraphBoardProps> = ({
return (
<ReactFlowProvider>
<DAGGraphBoardInner {...props} />
</ReactFlowProvider>
);
};
export const DAGGraphBoardInner: FC<DAGGraphBoardProps> = ({
modalState, modalState,
state, state,
closeModal, closeModal,
@@ -37,6 +29,12 @@ export const DAGGraphBoardInner: FC<DAGGraphBoardProps> = ({
return <div className="dag-graphboard errored">{state.data.error}</div>; return <div className="dag-graphboard errored">{state.data.error}</div>;
} }
// useEffect(() => {
// if (state.ready) {
// reactFlow.fitView();
// }
// }, [state.ready, reactFlow]);
// modal // modal
let modalBody = <></>; let modalBody = <></>;
if (modalState) { if (modalState) {
@@ -70,7 +68,7 @@ export const DAGGraphBoardInner: FC<DAGGraphBoardProps> = ({
nodesDraggable={false} nodesDraggable={false}
{...elements} {...elements}
> >
<Controls showInteractive={false} showFitView> <Controls showInteractive={false} showFitView={false}>
{additionalControls} {additionalControls}
</Controls> </Controls>
</ReactFlow> </ReactFlow>
@@ -2,7 +2,7 @@ import { XYPosition } from "react-flow-renderer";
import AddBox from "@mui/icons-material/AddBox"; import AddBox from "@mui/icons-material/AddBox";
import { getDescriptionFromAutomationNode } from "utils/formatting"; import { getDescriptionFromAutomationNode, Namer } from "utils/formatting";
import { validateNode } from "utils/automations"; import { validateNode } from "utils/automations";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { AutomationTrigger } from "types/automations/triggers"; import { AutomationTrigger } from "types/automations/triggers";
@@ -13,6 +13,35 @@ import { convertFailuresToSequenceNodeDataProps } from "./util";
import { ButtonNodeMaker } from "../nodes/ButtonNode"; import { ButtonNodeMaker } from "../nodes/ButtonNode";
import { CollectionNodeMaker } from "../nodes/CollectionNode"; import { CollectionNodeMaker } from "../nodes/CollectionNode";
import { DAGGraphUpdater } from "../updater/index";
import { AutomationActionData } from "types/automations";
export function makeCollectionNodeMakerChildProps<
NodeType extends keyof AutomationActionData,
Node extends AutomationActionData[NodeType][0]
>(
nodeType: NodeType,
node: Node,
index: number,
stateUpdater: DAGGraphUpdater,
namer: Namer
) {
const failures = validateNode(node, [nodeType]);
if (failures) {
return {
enabled: node.enabled ?? true,
...stateUpdater.createNodeActions(nodeType, index, {}),
...convertFailuresToSequenceNodeDataProps(failures),
};
}
return {
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
...stateUpdater.createNodeActions(nodeType, index, {}),
};
}
export const makeTriggerNodes: ElementMaker<AutomationTrigger> = ( export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
nodes, nodes,
@@ -24,23 +53,15 @@ export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
...dims.collection, ...dims.collection,
collectionType: "trigger", collectionType: "trigger",
onAddNode: () => stateUpdater.basic.trigger.addNode(null), onAddNode: () => stateUpdater.basic.trigger.addNode(null),
nodes: nodes.map((node, index) => { nodes: nodes.map((node, index) =>
const failures = validateNode(node, ["trigger"]); makeCollectionNodeMakerChildProps(
"trigger",
if (failures) { node,
return { index,
enabled: node.enabled ?? true, stateUpdater,
...stateUpdater.createNodeActions("trigger", index, {}), namer
...convertFailuresToSequenceNodeDataProps(failures), )
}; ),
}
return {
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
...stateUpdater.createNodeActions("trigger", index, {}),
};
}),
}) })
); );
return outputState; return outputState;
@@ -57,23 +78,15 @@ export const makeConditionNodes: ElementMaker<AutomationCondition> = (
collectionType: "condition", collectionType: "condition",
hasInput: !!lastNodeId, hasInput: !!lastNodeId,
onAddNode: () => stateUpdater.basic.condition.addNode(null), onAddNode: () => stateUpdater.basic.condition.addNode(null),
nodes: nodes.map((node, index) => { nodes: nodes.map((node, index) =>
const failures = validateNode(node, ["condition"]); makeCollectionNodeMakerChildProps(
"condition",
if (failures) { node,
return { index,
enabled: node.enabled ?? true, stateUpdater,
...stateUpdater.createNodeActions("condition", index, {}), namer
...convertFailuresToSequenceNodeDataProps(failures), )
}; ),
}
return {
enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true),
...stateUpdater.createNodeActions("condition", index, {}),
};
}),
}) })
); );
if (lastNodeId && outputState.lastNodeId) { if (lastNodeId && outputState.lastNodeId) {
@@ -24,15 +24,19 @@ const { make, componentMeta } = makeStory({
state, state,
setState setState
); );
const elementData = useAutomationNodes(state, { const elementData = useAutomationNodes(
dims: { state,
...DEFAULT_DIMS, {
flipped: props.flipped, dims: {
...DEFAULT_DIMS,
flipped: props.flipped,
},
namer,
openModal: setModalState,
stateUpdater: updater,
}, },
namer, false
openModal: setModalState, );
stateUpdater: updater,
});
return ( return (
<DAGGraphBoard <DAGGraphBoard
modalState={modalState} modalState={modalState}
@@ -28,52 +28,57 @@ import * as helpers from "./helpers";
export const useAutomationNodes = ( export const useAutomationNodes = (
automation: AutomationActionData, automation: AutomationActionData,
args: ElementMakerBaseProps args: ElementMakerBaseProps,
hideConditionAndTriggers: boolean
) => { ) => {
const dims: DAGDims = { const dims: DAGDims = {
...args.dims, ...args.dims,
}; };
const state = useDAGElementsState(); const state = useDAGElementsState();
const outputState = new DAGElementsOutputState(dims.position, dims); const outputState = new DAGElementsOutputState(dims.position, dims);
outputState.extend( let actionStartPos = dims.position;
helpers.makeTriggerNodes(automation.trigger, { if (!hideConditionAndTriggers) {
...args, outputState.extend(
state, helpers.makeTriggerNodes(automation.trigger, {
...args,
state,
dims,
position: dims.position,
nodeId: `${dims.flipped}-trigger`,
nodeIndex: 0,
})
);
outputState.extend(
helpers.makeConditionNodes(automation.condition, {
...args,
state,
dims,
position: distance.moveFromTo(
"collection",
"collection",
outputState.getLastNodePos(),
dims
),
nodeId: `${dims.flipped}-condition`,
nodeIndex: 1,
lastNodeId: outputState.lastNodeId,
})
);
actionStartPos = distance.moveFromTo(
"collection",
"node",
outputState.getLastNodePos(),
dims, dims,
position: dims.position, true
nodeId: `${dims.flipped}-trigger`, );
nodeIndex: 0, }
})
);
outputState.extend(
helpers.makeConditionNodes(automation.condition, {
...args,
state,
dims,
position: distance.moveFromTo(
"collection",
"collection",
outputState.getLastNodePos(),
dims
),
nodeId: `${dims.flipped}-condition`,
nodeIndex: 1,
lastNodeId: outputState.lastNodeId,
})
);
outputState.extend( outputState.extend(
makeSequenceNodes(automation.action, { makeSequenceNodes(automation.action, {
...args, ...args,
state, state,
dims, dims,
position: distance.moveFromTo( position: actionStartPos,
"collection",
"node",
outputState.getLastNodePos(),
dims,
true
),
nodeId: `${dims.flipped}-action`, nodeId: `${dims.flipped}-action`,
nodeIndex: 2, nodeIndex: 2,
lastNodeId: outputState.lastNodeId, lastNodeId: outputState.lastNodeId,
+30 -16
View File
@@ -8,6 +8,7 @@ import { DEFAULT_DIMS } from "./elements/constants";
import { DAGGraphBoard } from "./board"; import { DAGGraphBoard } from "./board";
import { AutomationTrigger } from "types/automations/triggers"; import { AutomationTrigger } from "types/automations/triggers";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
import { TriggerConditionNodeRow } from "./NodesRow";
export const DAGAutomationGraph: FC<{ export const DAGAutomationGraph: FC<{
action: AutomationSequenceNode[]; action: AutomationSequenceNode[];
@@ -17,6 +18,7 @@ export const DAGAutomationGraph: FC<{
onTriggerUpdate: (t: AutomationTrigger[]) => void; onTriggerUpdate: (t: AutomationTrigger[]) => void;
onConditionUpdate: (c: AutomationCondition[]) => void; onConditionUpdate: (c: AutomationCondition[]) => void;
isFlipped: boolean; isFlipped: boolean;
useNodesRow: boolean;
additionalControls?: ReactNode; additionalControls?: ReactNode;
}> = (props) => { }> = (props) => {
const { namer } = useHA(); const { namer } = useHA();
@@ -37,6 +39,10 @@ export const DAGAutomationGraph: FC<{
onUpdate: props.onTriggerUpdate as any, onUpdate: props.onTriggerUpdate as any,
}, },
}); });
const dims = {
...DEFAULT_DIMS,
flipped: props.isFlipped,
};
const elementData = useAutomationNodes( const elementData = useAutomationNodes(
{ {
action: props.action, action: props.action,
@@ -44,26 +50,34 @@ export const DAGAutomationGraph: FC<{
trigger: props.trigger, trigger: props.trigger,
}, },
{ {
dims: { dims,
...DEFAULT_DIMS,
flipped: props.isFlipped,
},
namer, namer,
openModal: setModalState, openModal: setModalState,
stateUpdater: updater, stateUpdater: updater,
} },
props.useNodesRow
); );
return ( return (
<DAGGraphBoard <>
modalState={modalState} {props.useNodesRow && (
closeModal={() => setModalState(undefined)} <TriggerConditionNodeRow
state={{ trigger={props.trigger}
ready: true, condition={props.condition}
data: { stateUpdater={updater}
elements: elementData, sequenceNodeDims={dims.node}
}, />
}} )}
additionalControls={props.additionalControls} <DAGGraphBoard
/> modalState={modalState}
closeModal={() => setModalState(undefined)}
state={{
ready: true,
data: {
elements: elementData,
},
}}
additionalControls={props.additionalControls}
/>
</>
); );
}; };
@@ -15,87 +15,89 @@ import { useConfirm } from "material-ui-confirm";
import { useSnackbar } from "notistack"; import { useSnackbar } from "notistack";
import { useLang } from "services/lang"; import { useLang } from "services/lang";
export const CollectionNodeElement: FC<PropsWithChildren<CollectionNodeProps>> = export const CollectionNodeElement: FC<
({ PropsWithChildren<CollectionNodeProps & { className?: string }>
onAddNode, > = ({
nodes, onAddNode,
sequenceNode, nodes,
height, sequenceNode,
width, height,
flipped, width,
collectionType, flipped,
onDelete, collectionType,
title, onDelete,
children, title,
}) => { children,
const lang = useLang(); className,
const color = convertNodeTypeToSequenceNodeColor(collectionType); }) => {
const nodeColor = useSequenceNodeColor(color); const lang = useLang();
const confirm = useConfirm(); const color = convertNodeTypeToSequenceNodeColor(collectionType);
const snackbr = useSnackbar(); const nodeColor = useSequenceNodeColor(color);
const trueTile = title ?? collectionType; const confirm = useConfirm();
const snackbr = useSnackbar();
const trueTile = title ?? collectionType;
return ( return (
<div <div
className="collection-nodes--wrap" className={["collection-nodes--wrap", className ?? ""].join(" ")}
style={ style={
{ {
"--node-color": nodeColor, "--node-color": nodeColor,
"--node-height": `${height}px`, "--node-height": `${height}px`,
"--node-width": `${width}px`, "--node-width": `${width}px`,
} as any } as any
} }
> >
<div className="collection-nodes"> <div className="collection-nodes">
{!!onDelete && ( {!!onDelete && (
<ButtonIcon <ButtonIcon
className="delete-icon" className="delete-icon"
icon={<DeleteForeverIcon />} icon={<DeleteForeverIcon />}
onClick={() => { onClick={() => {
confirm({ confirm({
description: `Are you sure you want to delete ${trueTile}?`, description: `Are you sure you want to delete ${trueTile}?`,
})
.then(() => {
onDelete();
snackbr.enqueueSnackbar(lang.get("DELETED"), {
variant: "info",
});
}) })
.then(() => { .catch(() =>
onDelete(); snackbr.enqueueSnackbar(
snackbr.enqueueSnackbar(lang.get("DELETED"), { lang.get("NOT_DELETED_THING", {
item: trueTile,
}),
{
variant: "info", variant: "info",
}); }
}) )
.catch(() => );
snackbr.enqueueSnackbar( }}
lang.get("NOT_DELETED_THING", { borderless
item: trueTile, color="secondary"
}), />
{ )}
variant: "info", <span className="collection-nodes--title">
} {prettyName(collectionType)}s
) </span>
); <div className="collection-nodes--inner">
}} {nodes.map((n, i) => (
borderless <SequenceNodeElement
color="secondary" key={i}
color={color}
flipped={flipped}
{...n}
{...sequenceNode}
/> />
)} ))}
<span className="collection-nodes--title">
{prettyName(collectionType)}s
</span>
<div className="collection-nodes--inner">
{nodes.map((n, i) => (
<SequenceNodeElement
key={i}
color={color}
flipped={flipped}
{...n}
{...sequenceNode}
/>
))}
</div>
<ButtonIcon className="add" icon={<Add />} onClick={onAddNode} />
{children}
<span className="collection-nodes--total">
{nodes.length} node{nodes.length !== 1 ? "s" : ""}
</span>
</div> </div>
<ButtonIcon className="add" icon={<Add />} onClick={onAddNode} />
{children}
<span className="collection-nodes--total">
{nodes.length} node{nodes.length !== 1 ? "s" : ""}
</span>
</div> </div>
); </div>
}; );
};
@@ -11,8 +11,6 @@
width: var(--sequence-node-width); width: var(--sequence-node-width);
min-height: var(--sequence-node-height); min-height: var(--sequence-node-height);
min-width: var(--sequence-node-width); min-width: var(--sequence-node-width);
/* outline: 1px dotted white; */
} }
.sequence-node.disabled .sequence-node--inner { .sequence-node.disabled .sequence-node--inner {
@@ -86,7 +86,6 @@ export const createDummyUpdater = (): DAGUpdaterInput<any> => ({
data: [], data: [],
onUpdate: console.warn, onUpdate: console.warn,
}); });
// export const createScriptConditionFieldUpdater = (f: ScriptConditionField, )
export type DAGGraphUpdater = ReturnType<typeof createUpdater>; export type DAGGraphUpdater = ReturnType<typeof createUpdater>;
export type DAGGraphChooseUpdater = ReturnType< export type DAGGraphChooseUpdater = ReturnType<
@@ -188,16 +188,14 @@ export function InputAutoComplete<T extends Option>(
const id = getID(option); const id = getID(option);
return ( return (
<> <SearchItem
<SearchItem key={label + id}
key={label + id} listProps={listProps}
listProps={listProps} id={id}
id={id} label={label}
label={label} searchTerm={inputValue}
searchTerm={inputValue} onlyShowLabel={props.onlyShowLabel}
onlyShowLabel={props.onlyShowLabel} />
/>
</>
); );
}} }}
renderInput={(params) => ( renderInput={(params) => (
@@ -225,12 +223,13 @@ export function InputAutoComplete<T extends Option>(
)} )}
renderTags={(tagValue, getTagProps) => { renderTags={(tagValue, getTagProps) => {
const inner = ( const inner = (
<div className="input-autocomplete--tags"> <div className="input-autocomplete--tags" key={"inner"}>
{tagValue.map((option, index) => { {tagValue.map((option, index) => {
const label = getLabel(option); const label = getLabel(option);
const id = getID(option); const id = getID(option);
const tagProps = getTagProps({ index }); const tagProps = getTagProps({ index });
tagProps.className += " input-autocomplete--chip"; tagProps.className += " input-autocomplete--chip";
tagProps.key = tagProps.key ?? index;
return ( return (
<Chip <Chip
size="medium" size="medium"
@@ -258,7 +257,11 @@ export function InputAutoComplete<T extends Option>(
} }
if (props.multiple) { if (props.multiple) {
return ( return (
<Badge badgeContent={tagValue.length} color="info"> <Badge
badgeContent={tagValue.length}
color="info"
key="badge-wrapper"
>
{inner} {inner}
</Badge> </Badge>
); );
@@ -15,6 +15,7 @@ const { make, componentMeta } = makeStory({
<div <div
style={{ style={{
maxWidth: 200, maxWidth: 200,
margin: "5em",
}} }}
> >
<InputEntity <InputEntity
@@ -127,18 +127,16 @@ export const InputTime: FC<InputTimeProps> = (props) => {
return ( return (
<div className={["input-time", props.className ?? ""].join(" ")}> <div className={["input-time", props.className ?? ""].join(" ")}>
{/* <InputLabel >{props.label}</InputLabel> */}
<div className="input-time--inner"> <div className="input-time--inner">
{fields.map((name) => { {fields.map((name, index) => {
const label = prettyName( const label = prettyName(
lang.get(`TIME_UNITS_${name}`.toUpperCase()) lang.get(`TIME_UNITS_${name}`.toUpperCase())
); );
return ( return (
<TextField <TextField
key={name} key={`${name}-${index}`}
variant="filled" variant="filled"
label={label} label={label}
defaultValue="00"
InputProps={{ InputProps={{
disabled, disabled,
type: "number", type: "number",
@@ -151,6 +149,7 @@ export const InputTime: FC<InputTimeProps> = (props) => {
})} })}
{!props.restrictEmpty && ( {!props.restrictEmpty && (
<ButtonIcon <ButtonIcon
key="disable-btn"
onClick={() => setDisabled(!disabled)} onClick={() => setDisabled(!disabled)}
icon={disabled ? <EditIcon /> : <CloseIcon />} icon={disabled ? <EditIcon /> : <CloseIcon />}
/> />
+13
View File
@@ -6,6 +6,7 @@ import { useAutoMockAPI, useProfileMockAPI } from "./mock";
import { createContext, useContext, useRef } from "react"; import { createContext, useContext, useRef } from "react";
import { makeProfileAPI } from "./profile"; import { makeProfileAPI } from "./profile";
import { ApiState } from "./types"; import { ApiState } from "./types";
import { UserProfile } from "services/api/types";
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i); const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
const baseURL = new URL( const baseURL = new URL(
@@ -33,3 +34,15 @@ const ApiStateContext = createContext<ApiState>({
}); });
export const ApiStateProvider = ApiStateContext.Provider; export const ApiStateProvider = ApiStateContext.Provider;
export const useApiState = () => useContext(ApiStateContext); export const useApiState = () => useContext(ApiStateContext);
export const useUserProfile = (): UserProfile => {
const apiUserProfile = useApiState().userProfile;
if (apiUserProfile.ready && apiUserProfile.ok) {
return apiUserProfile.data;
} else {
return {
lang: "eng",
theme: "dark",
flags: {},
};
}
};
+1
View File
@@ -112,6 +112,7 @@ export const useProfileMockAPI = (
initialProfile: UserProfile = { initialProfile: UserProfile = {
lang: "eng", lang: "eng",
theme: "dark", theme: "dark",
flags: {},
}, },
makeRef = useRef, makeRef = useRef,
returnErrors: boolean = false returnErrors: boolean = false
+4
View File
@@ -40,4 +40,8 @@ export interface ApiState {
export type UserProfile = { export type UserProfile = {
theme: string; theme: string;
lang: string; lang: string;
flags: Partial<{
useNodesRow: boolean;
flipped: boolean;
}>;
}; };
+5 -2
View File
@@ -31,6 +31,7 @@
"STATE": "State", "STATE": "State",
"SEARCH": "Search", "SEARCH": "Search",
"FLIPP": "Flip", "FLIPP": "Flip",
"FLIPP_GRAPH": "Flip Graph",
"CANCEL": "Cancel", "CANCEL": "Cancel",
"CREATE": "Create", "CREATE": "Create",
"OR": "Or", "OR": "Or",
@@ -60,7 +61,7 @@
"TIME_UNITS_HOURS": "hours", "TIME_UNITS_HOURS": "hours",
"TIME_UNITS_MINUTES": "minutes", "TIME_UNITS_MINUTES": "minutes",
"TIME_UNITS_SECONDS": "seconds", "TIME_UNITS_SECONDS": "seconds",
"TIME_UNITS_MILISECONDS": "milliseconds", "TIME_UNITS_MILLISECONDS": "milliseconds",
"TIMEOUT": "Timeout", "TIMEOUT": "Timeout",
"CONTINUTE_ON_TIMEOUT": "Continue on Timeout", "CONTINUTE_ON_TIMEOUT": "Continue on Timeout",
@@ -179,5 +180,7 @@
"HOW_MANY_TIMES": "How many times?", "HOW_MANY_TIMES": "How many times?",
"READONLY_MODE": "Read Only Mode", "READONLY_MODE": "Read Only Mode",
"READONLY_CANNOT_UPDATE": "Cannot update in readonly mode" "READONLY_CANNOT_UPDATE": "Cannot update in readonly mode",
"NODES_ROW": "Do not inlcude automation triggers & conditions in graph."
} }
+2 -1
View File
@@ -34,6 +34,7 @@
"STATE": "Statut", "STATE": "Statut",
"SEARCH": "Chercher", "SEARCH": "Chercher",
"FLIPP": "Retourner", "FLIPP": "Retourner",
"FLIPP_GRAPH": "Inverser le graphique",
"CANCEL": "Annuler", "CANCEL": "Annuler",
"CREATE": "Créer", "CREATE": "Créer",
"OR": "Ou", "OR": "Ou",
@@ -70,7 +71,7 @@
"TIME_UNITS_HOURS": "heures", "TIME_UNITS_HOURS": "heures",
"TIME_UNITS_MINUTES": "minutes", "TIME_UNITS_MINUTES": "minutes",
"TIME_UNITS_SECONDS": "secondes", "TIME_UNITS_SECONDS": "secondes",
"TIME_UNITS_MILISECONDS": "millisecondes", "TIME_UNITS_MILLISECONDS": "millisecondes",
"TIMEOUT": "Temps libre", "TIMEOUT": "Temps libre",
"CONTINUTE_ON_TIMEOUT": "Continuer sur Timeout", "CONTINUTE_ON_TIMEOUT": "Continuer sur Timeout",
+2 -1
View File
@@ -31,6 +31,7 @@
"STATE": "Stato", "STATE": "Stato",
"SEARCH": "Cerca", "SEARCH": "Cerca",
"FLIPP": "Flip", "FLIPP": "Flip",
"FLIPP_GRAPH": "Capovolgi il grafico",
"CANCEL": "Cancella", "CANCEL": "Cancella",
"CREATE": "Crea", "CREATE": "Crea",
"OR": "Oppure", "OR": "Oppure",
@@ -60,7 +61,7 @@
"TIME_UNITS_HOURS": "ore", "TIME_UNITS_HOURS": "ore",
"TIME_UNITS_MINUTES": "minuti", "TIME_UNITS_MINUTES": "minuti",
"TIME_UNITS_SECONDS": "secondi", "TIME_UNITS_SECONDS": "secondi",
"TIME_UNITS_MILISECONDS": "millisecondi", "TIME_UNITS_MILLISECONDS": "millisecondi",
"TIMEOUT": "Tempo scaduto", "TIMEOUT": "Tempo scaduto",
"CONTINUTE_ON_TIMEOUT": "Continua su Timeout", "CONTINUTE_ON_TIMEOUT": "Continua su Timeout",
-4
View File
@@ -43,10 +43,6 @@ body,
background: var(--mui-grey-400); background: var(--mui-grey-400);
} }
* {
transition: all 200ms ease-out;
}
.column { .column {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
+999 -132
View File
File diff suppressed because it is too large. Load diff