update notice
This commit is contained in:
1 parent
df95265af0
commit
2dca59fa3f
9 files changed
+174
-46
No files matched your search
@@ -6,12 +6,13 @@ import SettingsSuggestOutlinedIcon from "@mui/icons-material/SettingsSuggestOutl
|
|||||||
import { useLang } from "services/lang";
|
import { useLang } from "services/lang";
|
||||||
import { Modal } from "components/Modal";
|
import { Modal } from "components/Modal";
|
||||||
import { UserProfileEditor, UserProfileProps } from "./UserProfile";
|
import { UserProfileEditor, UserProfileProps } from "./UserProfile";
|
||||||
|
import { useVersioner } from "services/versioner";
|
||||||
|
|
||||||
export type BottomBarProps = UserProfileProps;
|
export type BottomBarProps = UserProfileProps;
|
||||||
export const BottomBar: FC<BottomBarProps> = ({ api }) => {
|
export const BottomBar: FC<BottomBarProps> = ({ api }) => {
|
||||||
const lang = useLang();
|
const lang = useLang();
|
||||||
const ha = useHAConnection();
|
const ha = useHAConnection();
|
||||||
const version = process.env.REACT_APP_BUILD_VERSION ?? "n/a";
|
const versionMgr = useVersioner();
|
||||||
const [isOpen, setOpen] = useState(false);
|
const [isOpen, setOpen] = useState(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -31,7 +32,7 @@ export const BottomBar: FC<BottomBarProps> = ({ api }) => {
|
|||||||
🟢
|
🟢
|
||||||
</b>
|
</b>
|
||||||
</span>
|
</span>
|
||||||
<span>version: {version}</span>
|
<span>version: {versionMgr.current}</span>
|
||||||
<Button className="settings" onClick={() => setOpen(!isOpen)}>
|
<Button className="settings" onClick={() => setOpen(!isOpen)}>
|
||||||
<SettingsSuggestOutlinedIcon />
|
<SettingsSuggestOutlinedIcon />
|
||||||
{lang.get("USER_PRERENCES")}
|
{lang.get("USER_PRERENCES")}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { ReactNode, useState } from "react";
|
import { ReactNode, useState } from "react";
|
||||||
import TextField from "@mui/material/TextField";
|
import TextField from "@mui/material/TextField";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
|
|||||||
@@ -12,21 +12,26 @@ import { SnackbarKey, SnackbarProvider, useSnackbar } from "notistack";
|
|||||||
import Button from "@mui/material/Button";
|
import Button from "@mui/material/Button";
|
||||||
import { useHAConnection } from "services/ha/connection";
|
import { useHAConnection } from "services/ha/connection";
|
||||||
import { ConfirmProvider } from "material-ui-confirm";
|
import { ConfirmProvider } from "material-ui-confirm";
|
||||||
import { Color } from "@mui/material";
|
import { Color, Skeleton, Theme } from "@mui/material";
|
||||||
import useWindowSize from "utils/useWindowSize";
|
import useWindowSize from "utils/useWindowSize";
|
||||||
import { ApiService } from "services/api/core";
|
import { ApiService } from "services/api/core";
|
||||||
import { ApiStateProvider, useMockApiService } from "services/api";
|
import { ApiStateProvider, useMockApiService } from "services/api";
|
||||||
|
import { LangProvider, LangStore, useLang } from "services/lang";
|
||||||
|
|
||||||
export type PageProps = PropsWithChildren<{
|
export type PageProps = PropsWithChildren<{
|
||||||
api: ApiService;
|
api: ApiService;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
export const InternalPage: FC<PageProps> = ({ children, api }) => {
|
export const BareInternalPage: FC<
|
||||||
|
PageProps & {
|
||||||
|
isMobile: boolean;
|
||||||
|
theme: Theme;
|
||||||
|
lang: LangStore;
|
||||||
|
}
|
||||||
|
> = ({ children, api, isMobile, theme, lang }) => {
|
||||||
const conn = useHAConnection();
|
const conn = useHAConnection();
|
||||||
const theme = useTheme();
|
|
||||||
const snackbar = useSnackbar();
|
const snackbar = useSnackbar();
|
||||||
const snackbarKeyHAConKey = useRef<SnackbarKey | null>(null);
|
const snackbarKeyHAConKey = useRef<SnackbarKey | null>(null);
|
||||||
const { isMobile } = useWindowSize();
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (conn.status === "error") {
|
if (conn.status === "error") {
|
||||||
@@ -46,12 +51,6 @@ export const InternalPage: FC<PageProps> = ({ children, api }) => {
|
|||||||
if (snackbarKeyHAConKey.current) {
|
if (snackbarKeyHAConKey.current) {
|
||||||
snackbar.closeSnackbar(snackbarKeyHAConKey.current);
|
snackbar.closeSnackbar(snackbarKeyHAConKey.current);
|
||||||
}
|
}
|
||||||
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(
|
|
||||||
`Connecting to websocket...`,
|
|
||||||
{
|
|
||||||
variant: "info",
|
|
||||||
}
|
|
||||||
);
|
|
||||||
} else if (conn.status === "loaded") {
|
} else if (conn.status === "loaded") {
|
||||||
if (snackbarKeyHAConKey.current) {
|
if (snackbarKeyHAConKey.current) {
|
||||||
snackbar.closeSnackbar(snackbarKeyHAConKey.current);
|
snackbar.closeSnackbar(snackbarKeyHAConKey.current);
|
||||||
@@ -60,15 +59,38 @@ export const InternalPage: FC<PageProps> = ({ children, api }) => {
|
|||||||
}, [conn, snackbar]);
|
}, [conn, snackbar]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className={["page", "column", isMobile ? "mobile" : ""].join(" ")}>
|
<ConfirmProvider
|
||||||
<div className="page-contents column">{children}</div>
|
defaultOptions={{
|
||||||
<BottomBar api={api} />
|
cancellationText: lang.get("CLOSE"),
|
||||||
<style>
|
confirmationText: lang.get("CONFIRM"),
|
||||||
{`:root {
|
}}
|
||||||
${convertPaletteToCss(theme.palette)}
|
>
|
||||||
}`}
|
<main className={["page", "column", isMobile ? "mobile" : ""].join(" ")}>
|
||||||
</style>
|
<div className="page-contents column">{children}</div>
|
||||||
</main>
|
<BottomBar api={api} />
|
||||||
|
<style>
|
||||||
|
{`:root {
|
||||||
|
${convertPaletteToCss(theme.palette)}
|
||||||
|
}`}
|
||||||
|
</style>
|
||||||
|
</main>
|
||||||
|
</ConfirmProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const InternalPage: FC<PageProps> = ({ children, api }) => {
|
||||||
|
const theme = useTheme();
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
|
const lang = useLang();
|
||||||
|
|
||||||
|
if (!lang.ready) {
|
||||||
|
return <Skeleton />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BareInternalPage api={api} isMobile={isMobile} theme={theme} lang={lang}>
|
||||||
|
{children}
|
||||||
|
</BareInternalPage>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -85,24 +107,22 @@ export const Page: FC<PageProps> = (props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<ThemeProvider theme={theme}>
|
<ThemeProvider theme={theme}>
|
||||||
<ConfirmProvider>
|
<SnackbarProvider
|
||||||
<SnackbarProvider
|
anchorOrigin={{
|
||||||
anchorOrigin={{
|
vertical: "bottom",
|
||||||
vertical: "bottom",
|
horizontal: "center",
|
||||||
horizontal: "center",
|
}}
|
||||||
}}
|
ref={notistackRef}
|
||||||
ref={notistackRef}
|
action={(key) => <Button onClick={onClickDismiss(key)}>Dismiss</Button>}
|
||||||
action={(key) => (
|
dense
|
||||||
<Button onClick={onClickDismiss(key)}>Dismiss</Button>
|
preventDuplicate
|
||||||
)}
|
>
|
||||||
dense
|
<ApiStateProvider value={props.api.state}>
|
||||||
preventDuplicate
|
<LangProvider>
|
||||||
>
|
|
||||||
<ApiStateProvider value={props.api.state}>
|
|
||||||
<InternalPage {...props} />
|
<InternalPage {...props} />
|
||||||
</ApiStateProvider>
|
</LangProvider>
|
||||||
</SnackbarProvider>
|
</ApiStateProvider>
|
||||||
</ConfirmProvider>
|
</SnackbarProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,10 +21,11 @@ export type APIResponse<D> =
|
|||||||
};
|
};
|
||||||
export type Waitable<D> =
|
export type Waitable<D> =
|
||||||
| { ready: undefined }
|
| { ready: undefined }
|
||||||
| ({ ready: true } & APIResponse<D>)
|
| ({ ready: true } & D)
|
||||||
| {
|
| {
|
||||||
ready: false;
|
ready: false;
|
||||||
};
|
};
|
||||||
|
export type ApiWaitable<D> = Waitable<APIResponse<D>>;
|
||||||
export interface ListData<D> {
|
export interface ListData<D> {
|
||||||
params: ListParams;
|
params: ListParams;
|
||||||
totalItems: number;
|
totalItems: number;
|
||||||
@@ -32,8 +33,8 @@ export interface ListData<D> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface ApiState {
|
export interface ApiState {
|
||||||
automations: Waitable<ListData<AutomationData>>;
|
automations: ApiWaitable<ListData<AutomationData>>;
|
||||||
userProfile: Waitable<UserProfile>;
|
userProfile: ApiWaitable<UserProfile>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type UserProfile = {
|
export type UserProfile = {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
"TEMPLATE": "Template",
|
"TEMPLATE": "Template",
|
||||||
"MODE": "Mode",
|
"MODE": "Mode",
|
||||||
"CLOSE": "Close",
|
"CLOSE": "Close",
|
||||||
|
"CONFIRM": "Confirm",
|
||||||
"DESCRIPTION": "Description",
|
"DESCRIPTION": "Description",
|
||||||
"TRIGGER": "Trigger",
|
"TRIGGER": "Trigger",
|
||||||
"CONDITION": "Condition",
|
"CONDITION": "Condition",
|
||||||
@@ -43,6 +44,9 @@
|
|||||||
"YES": "Yes",
|
"YES": "Yes",
|
||||||
"NO": "No",
|
"NO": "No",
|
||||||
|
|
||||||
|
"NEW_VERSION_AVAILABLE": "New Version is Available!",
|
||||||
|
"NEW_VERSION_AVAILABLE_BODY": "Installed version: {{current}}\nLatest version: {{latest}}",
|
||||||
|
|
||||||
"SERVICE": "Service",
|
"SERVICE": "Service",
|
||||||
"REPEAT": "Repeat",
|
"REPEAT": "Repeat",
|
||||||
"WAIT": "Wait",
|
"WAIT": "Wait",
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
"TEMPLATE": "Modèle",
|
"TEMPLATE": "Modèle",
|
||||||
"MODE": "Mode",
|
"MODE": "Mode",
|
||||||
"CLOSE": "Fermer",
|
"CLOSE": "Fermer",
|
||||||
|
"CONFIRM": "Confirmer",
|
||||||
"DESCRIPTION": "Description",
|
"DESCRIPTION": "Description",
|
||||||
"TRIGGER": "Déclencheur",
|
"TRIGGER": "Déclencheur",
|
||||||
"TRIGGERS": "Déclencheurs",
|
"TRIGGERS": "Déclencheurs",
|
||||||
@@ -46,6 +47,9 @@
|
|||||||
"YES": "Oui",
|
"YES": "Oui",
|
||||||
"NO": "Non",
|
"NO": "Non",
|
||||||
|
|
||||||
|
"NEW_VERSION_AVAILABLE": "Une nouvelle version est disponible!",
|
||||||
|
"NEW_VERSION_AVAILABLE_BODY": "Version installée : {{current}}\nDernière version : {{latest}}",
|
||||||
|
|
||||||
"SERVICE": "Service",
|
"SERVICE": "Service",
|
||||||
"REPEAT": "Répéter",
|
"REPEAT": "Répéter",
|
||||||
"WAIT": "Attendre",
|
"WAIT": "Attendre",
|
||||||
|
|||||||
@@ -1,11 +1,39 @@
|
|||||||
import { useApiState } from "services/api";
|
import { useApiState } from "services/api";
|
||||||
import { useEffect, useState } from "react";
|
import {
|
||||||
|
FC,
|
||||||
|
useEffect,
|
||||||
|
useState,
|
||||||
|
createContext,
|
||||||
|
PropsWithChildren,
|
||||||
|
useContext,
|
||||||
|
} from "react";
|
||||||
|
import { Waitable } from "../api/types";
|
||||||
|
|
||||||
const MISSING_TEXT = "<<MISSING TEXT -- {{langId}}>>";
|
const MISSING_TEXT = "<<MISSING TEXT -- {{langId}}>>";
|
||||||
const LOADING_TEXT = "...";
|
const LOADING_TEXT = "...";
|
||||||
|
|
||||||
export type LangStore = ReturnType<typeof useLang>;
|
export type LangStore = {
|
||||||
export const useLang = () => {
|
get(langId: string, replacements?: Record<string, string>): string;
|
||||||
|
};
|
||||||
|
const LangContext = createContext<Waitable<LangStore>>({
|
||||||
|
ready: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const useLang = (): LangStore & { ready: boolean } => {
|
||||||
|
const langState = useContext(LangContext);
|
||||||
|
|
||||||
|
if (langState.ready) {
|
||||||
|
return langState;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
ready: false,
|
||||||
|
get() {
|
||||||
|
return LOADING_TEXT;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const LangProvider: FC<PropsWithChildren> = ({ children }) => {
|
||||||
const apiState = useApiState();
|
const apiState = useApiState();
|
||||||
const [langStore, setLangStore] =
|
const [langStore, setLangStore] =
|
||||||
useState<Record<string, string> | null>(null);
|
useState<Record<string, string> | null>(null);
|
||||||
@@ -37,7 +65,7 @@ export const useLang = () => {
|
|||||||
return text;
|
return text;
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
const methods = {
|
||||||
get: (langId: string, replacements: Record<string, string> = {}) => {
|
get: (langId: string, replacements: Record<string, string> = {}) => {
|
||||||
let out = LOADING_TEXT;
|
let out = LOADING_TEXT;
|
||||||
if (langStore !== null) {
|
if (langStore !== null) {
|
||||||
@@ -54,4 +82,14 @@ export const useLang = () => {
|
|||||||
return updateParams(out, { ...replacements, langId });
|
return updateParams(out, { ...replacements, langId });
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const value: Waitable<LangStore> =
|
||||||
|
langStore === null && langEngStore === null
|
||||||
|
? { ready: false }
|
||||||
|
: {
|
||||||
|
ready: true,
|
||||||
|
...methods,
|
||||||
|
};
|
||||||
|
|
||||||
|
return <LangContext.Provider value={value}>{children}</LangContext.Provider>;
|
||||||
};
|
};
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
"TEMPLATE": "Modello",
|
"TEMPLATE": "Modello",
|
||||||
"MODE": "Modalità",
|
"MODE": "Modalità",
|
||||||
"CLOSE": "Chiudi",
|
"CLOSE": "Chiudi",
|
||||||
|
"CONFIRM": "Confermare",
|
||||||
"DESCRIPTION": "Descrizione",
|
"DESCRIPTION": "Descrizione",
|
||||||
"TRIGGER": "Attivazione",
|
"TRIGGER": "Attivazione",
|
||||||
"CONDITION": "Condizione",
|
"CONDITION": "Condizione",
|
||||||
@@ -43,6 +44,9 @@
|
|||||||
"YES": "Sì",
|
"YES": "Sì",
|
||||||
"NO": "No",
|
"NO": "No",
|
||||||
|
|
||||||
|
"NEW_VERSION_AVAILABLE": "È disponibile una nuova versione!",
|
||||||
|
"NEW_VERSION_AVAILABLE_BODY": "Versione installata: {{current}}\nUltima versione: {{latest}}",
|
||||||
|
|
||||||
"SERVICE": "Chiama Servizio",
|
"SERVICE": "Chiama Servizio",
|
||||||
"REPEAT": "Ripeti",
|
"REPEAT": "Ripeti",
|
||||||
"WAIT": "Attesa",
|
"WAIT": "Attesa",
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import { parseVersion, Version } from ".";
|
||||||
|
import { VersionComp, compareVersions } from "./index";
|
||||||
|
|
||||||
|
for (const [verStr, expectedVer] of [
|
||||||
|
[
|
||||||
|
"1.2.3",
|
||||||
|
{
|
||||||
|
main: 1,
|
||||||
|
minor: 2,
|
||||||
|
patch: 3,
|
||||||
|
extra: "",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"20.1.10",
|
||||||
|
{
|
||||||
|
main: 20,
|
||||||
|
minor: 1,
|
||||||
|
patch: 10,
|
||||||
|
extra: "",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"20.1.10-g1234",
|
||||||
|
{
|
||||||
|
main: 20,
|
||||||
|
minor: 1,
|
||||||
|
patch: 10,
|
||||||
|
extra: "g1234",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
["x.1.10-g1234", null],
|
||||||
|
["2.x1.10-g1234", null],
|
||||||
|
["2.123x.10-g1234", null],
|
||||||
|
["2.123.10g1234", null],
|
||||||
|
] as [string, Version | null][]) {
|
||||||
|
test(`parse version - ${verStr} to be ${JSON.stringify(expectedVer)}`, () => {
|
||||||
|
const version = parseVersion(verStr);
|
||||||
|
expect(version).toEqual(expectedVer);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
for (const [lh, rh, comp] of [
|
||||||
|
[parseVersion("1.1.0"), parseVersion("1.1.0"), null],
|
||||||
|
[null, null, null],
|
||||||
|
[parseVersion("1.1.0"), parseVersion("1.1.0"), null],
|
||||||
|
[parseVersion("1.2.0"), parseVersion("1.1.0"), "left"],
|
||||||
|
[parseVersion("1.2.0"), parseVersion("1.3.0"), "right"],
|
||||||
|
[parseVersion("1.2.0"), parseVersion("2.2.0"), "right"],
|
||||||
|
[parseVersion("1.2.0"), parseVersion("1.2.1"), "right"],
|
||||||
|
[parseVersion("3.2.1"), parseVersion("1.2.1"), "right"],
|
||||||
|
[parseVersion("1.3.1"), parseVersion("1.2.1"), "right"],
|
||||||
|
[parseVersion("1.2.2"), parseVersion("1.2.1"), "right"],
|
||||||
|
] as Array<[Version | null, Version | null, VersionComp]>)
|
||||||
|
test(`compare versions ${lh} ? ${rh} = ${comp}`, () => {
|
||||||
|
expect(compareVersions(lh, rh) === comp);
|
||||||
|
});
|
||||||
Reference in new issue
Block a user