From 2dca59fa3f84b5cde7c2996c0f5fd9b7f2c8c4a0 Mon Sep 17 00:00:00 2001 From: Ari Date: Tue, 6 Sep 2022 20:38:07 -0400 Subject: [PATCH] update notice --- webapp/src/components/BottomBar/index.tsx | 5 +- .../src/components/Inputs/Base/InputText.tsx | 2 +- webapp/src/components/Page/index.tsx | 92 +++++++++++-------- webapp/src/services/api/types.ts | 7 +- webapp/src/services/lang/eng.json | 4 + webapp/src/services/lang/fra.json | 4 + .../src/services/lang/{index.ts => index.tsx} | 46 +++++++++- webapp/src/services/lang/ita.json | 4 + webapp/src/services/versioner/index.test.ts | 56 +++++++++++ 9 files changed, 174 insertions(+), 46 deletions(-) rename webapp/src/services/lang/{index.ts => index.tsx} (62%) create mode 100644 webapp/src/services/versioner/index.test.ts diff --git a/webapp/src/components/BottomBar/index.tsx b/webapp/src/components/BottomBar/index.tsx index 864fec5..6599918 100644 --- a/webapp/src/components/BottomBar/index.tsx +++ b/webapp/src/components/BottomBar/index.tsx @@ -6,12 +6,13 @@ import SettingsSuggestOutlinedIcon from "@mui/icons-material/SettingsSuggestOutl import { useLang } from "services/lang"; import { Modal } from "components/Modal"; import { UserProfileEditor, UserProfileProps } from "./UserProfile"; +import { useVersioner } from "services/versioner"; export type BottomBarProps = UserProfileProps; export const BottomBar: FC = ({ api }) => { const lang = useLang(); const ha = useHAConnection(); - const version = process.env.REACT_APP_BUILD_VERSION ?? "n/a"; + const versionMgr = useVersioner(); const [isOpen, setOpen] = useState(false); return ( @@ -31,7 +32,7 @@ export const BottomBar: FC = ({ api }) => { 🟢 - version: {version} + version: {versionMgr.current} - )} - dense - preventDuplicate - > - + } + dense + preventDuplicate + > + + - - - + + + ); }; diff --git a/webapp/src/services/api/types.ts b/webapp/src/services/api/types.ts index 9b20357..c5c4d70 100644 --- a/webapp/src/services/api/types.ts +++ b/webapp/src/services/api/types.ts @@ -21,10 +21,11 @@ export type APIResponse = }; export type Waitable = | { ready: undefined } - | ({ ready: true } & APIResponse) + | ({ ready: true } & D) | { ready: false; }; +export type ApiWaitable = Waitable>; export interface ListData { params: ListParams; totalItems: number; @@ -32,8 +33,8 @@ export interface ListData { } export interface ApiState { - automations: Waitable>; - userProfile: Waitable; + automations: ApiWaitable>; + userProfile: ApiWaitable; } export type UserProfile = { diff --git a/webapp/src/services/lang/eng.json b/webapp/src/services/lang/eng.json index 11cea94..722930b 100644 --- a/webapp/src/services/lang/eng.json +++ b/webapp/src/services/lang/eng.json @@ -19,6 +19,7 @@ "TEMPLATE": "Template", "MODE": "Mode", "CLOSE": "Close", + "CONFIRM": "Confirm", "DESCRIPTION": "Description", "TRIGGER": "Trigger", "CONDITION": "Condition", @@ -43,6 +44,9 @@ "YES": "Yes", "NO": "No", + "NEW_VERSION_AVAILABLE": "New Version is Available!", + "NEW_VERSION_AVAILABLE_BODY": "Installed version: {{current}}\nLatest version: {{latest}}", + "SERVICE": "Service", "REPEAT": "Repeat", "WAIT": "Wait", diff --git a/webapp/src/services/lang/fra.json b/webapp/src/services/lang/fra.json index 589b725..75d36c1 100644 --- a/webapp/src/services/lang/fra.json +++ b/webapp/src/services/lang/fra.json @@ -20,6 +20,7 @@ "TEMPLATE": "Modèle", "MODE": "Mode", "CLOSE": "Fermer", + "CONFIRM": "Confirmer", "DESCRIPTION": "Description", "TRIGGER": "Déclencheur", "TRIGGERS": "Déclencheurs", @@ -46,6 +47,9 @@ "YES": "Oui", "NO": "Non", + "NEW_VERSION_AVAILABLE": "Une nouvelle version est disponible!", + "NEW_VERSION_AVAILABLE_BODY": "Version installée : {{current}}\nDernière version : {{latest}}", + "SERVICE": "Service", "REPEAT": "Répéter", "WAIT": "Attendre", diff --git a/webapp/src/services/lang/index.ts b/webapp/src/services/lang/index.tsx similarity index 62% rename from webapp/src/services/lang/index.ts rename to webapp/src/services/lang/index.tsx index 6603e2a..892367b 100644 --- a/webapp/src/services/lang/index.ts +++ b/webapp/src/services/lang/index.tsx @@ -1,11 +1,39 @@ 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 = "<>"; const LOADING_TEXT = "..."; -export type LangStore = ReturnType; -export const useLang = () => { +export type LangStore = { + get(langId: string, replacements?: Record): string; +}; +const LangContext = createContext>({ + 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 = ({ children }) => { const apiState = useApiState(); const [langStore, setLangStore] = useState | null>(null); @@ -37,7 +65,7 @@ export const useLang = () => { return text; }; - return { + const methods = { get: (langId: string, replacements: Record = {}) => { let out = LOADING_TEXT; if (langStore !== null) { @@ -54,4 +82,14 @@ export const useLang = () => { return updateParams(out, { ...replacements, langId }); }, }; + + const value: Waitable = + langStore === null && langEngStore === null + ? { ready: false } + : { + ready: true, + ...methods, + }; + + return {children}; }; diff --git a/webapp/src/services/lang/ita.json b/webapp/src/services/lang/ita.json index b596adf..facbd79 100644 --- a/webapp/src/services/lang/ita.json +++ b/webapp/src/services/lang/ita.json @@ -19,6 +19,7 @@ "TEMPLATE": "Modello", "MODE": "Modalità", "CLOSE": "Chiudi", + "CONFIRM": "Confermare", "DESCRIPTION": "Descrizione", "TRIGGER": "Attivazione", "CONDITION": "Condizione", @@ -43,6 +44,9 @@ "YES": "Sì", "NO": "No", + "NEW_VERSION_AVAILABLE": "È disponibile una nuova versione!", + "NEW_VERSION_AVAILABLE_BODY": "Versione installata: {{current}}\nUltima versione: {{latest}}", + "SERVICE": "Chiama Servizio", "REPEAT": "Ripeti", "WAIT": "Attesa", diff --git a/webapp/src/services/versioner/index.test.ts b/webapp/src/services/versioner/index.test.ts new file mode 100644 index 0000000..fcfecbc --- /dev/null +++ b/webapp/src/services/versioner/index.test.ts @@ -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); + });