Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: add ignore version upgrade setting (#1491)
boojack3eac19d2584c
diff --git a/api/system.go b/api/system.goindex 4d3669bc6..82e886586 100644--- a/api/system.go+++ b/api/system.go@@ -10,6 +10,8 @@ type SystemStatus struct {// System settings// Allow sign up.AllowSignUp bool `json:"allowSignUp"`+ // Ignore upgrade+ IgnoreUpgrade bool `json:"ignoreUpgrade"`// Disable public memos.DisablePublicMemos bool `json:"disablePublicMemos"`// Additional style.diff --git a/api/system_setting.go b/api/system_setting.goindex 7f61281f3..398ec92ad 100644--- a/api/system_setting.go+++ b/api/system_setting.go@@ -17,6 +17,8 @@ const (SystemSettingSecretSessionName SystemSettingName = "secret-session"// SystemSettingAllowSignUpName is the name of allow signup setting.SystemSettingAllowSignUpName SystemSettingName = "allow-signup"+ // SystemSettingIgnoreUpgradeName is the name of ignore upgrade.+ SystemSettingIgnoreUpgradeName SystemSettingName = "ignore-upgrade"// SystemSettingDisablePublicMemosName is the name of disable public memos setting.SystemSettingDisablePublicMemosName SystemSettingName = "disable-public-memos"// SystemSettingAdditionalStyleName is the name of additional style.@@ -62,6 +64,8 @@ func (key SystemSettingName) String() string {return "secret-session"case SystemSettingAllowSignUpName:return "allow-signup"+ case SystemSettingIgnoreUpgradeName:+ return "ignore-upgrade"case SystemSettingDisablePublicMemosName:return "disable-public-memos"case SystemSettingAdditionalStyleName:@@ -102,6 +106,12 @@ func (upsert SystemSettingUpsert) Validate() error {if err != nil {return fmt.Errorf("failed to unmarshal system setting allow signup value")}+ } else if upsert.Name == SystemSettingIgnoreUpgradeName {+ value := false+ err := json.Unmarshal([]byte(upsert.Value), &value)+ if err != nil {+ return fmt.Errorf("failed to unmarshal system setting ignore upgrade value")+ }} else if upsert.Name == SystemSettingDisablePublicMemosName {value := falseerr := json.Unmarshal([]byte(upsert.Value), &value)diff --git a/server/system.go b/server/system.goindex a047e90c5..ac5214571 100644--- a/server/system.go+++ b/server/system.go@@ -42,6 +42,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {Profile: *s.Profile,DBSize: 0,AllowSignUp: false,+ IgnoreUpgrade: false,DisablePublicMemos: false,AdditionalStyle: "",AdditionalScript: "",@@ -75,6 +76,8 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {if systemSetting.Name == api.SystemSettingAllowSignUpName {systemStatus.AllowSignUp = baseValue.(bool)+ } else if systemSetting.Name == api.SystemSettingIgnoreUpgradeName {+ systemStatus.IgnoreUpgrade = baseValue.(bool)} else if systemSetting.Name == api.SystemSettingDisablePublicMemosName {systemStatus.DisablePublicMemos = baseValue.(bool)} else if systemSetting.Name == api.SystemSettingAdditionalStyleName {diff --git a/web/src/components/Settings/SystemSection.tsx b/web/src/components/Settings/SystemSection.tsxindex f3a290e9f..545f60b88 100644--- a/web/src/components/Settings/SystemSection.tsx+++ b/web/src/components/Settings/SystemSection.tsx@@ -10,6 +10,7 @@ import "@/less/settings/system-section.less";interface State {dbSize: number;allowSignUp: boolean;+ ignoreUpgrade: boolean;disablePublicMemos: boolean;additionalStyle: string;additionalScript: string;@@ -31,6 +32,7 @@ const SystemSection = () => {const [state, setState] = useState<State>({dbSize: systemStatus.dbSize,allowSignUp: systemStatus.allowSignUp,+ ignoreUpgrade: systemStatus.ignoreUpgrade,additionalStyle: systemStatus.additionalStyle,additionalScript: systemStatus.additionalScript,disablePublicMemos: systemStatus.disablePublicMemos,@@ -75,6 +77,17 @@ const SystemSection = () => {});};+ const handleIgnoreUpgradeChanged = async (value: boolean) => {+ setState({+ ...state,+ ignoreUpgrade: value,+ });+ await api.upsertSystemSetting({+ name: "ignore-upgrade",+ value: JSON.stringify(value),+ });+ };+const handleUpdateCustomizedProfileButtonClick = () => {showUpdateCustomizedProfileDialog();};@@ -189,6 +202,10 @@ const SystemSection = () => {<span className="normal-text">{t("setting.system-section.allow-user-signup")}</span><Switch checked={state.allowSignUp} onChange={(event) => handleAllowSignUpChanged(event.target.checked)} /></div>+ <div className="form-label">+ <span className="normal-text">Ignore version upgrade</span>+ <Switch checked={state.ignoreUpgrade} onChange={(event) => handleIgnoreUpgradeChanged(event.target.checked)} />+ </div><div className="form-label"><span className="normal-text">{t("setting.system-section.disable-public-memos")}</span><Switch checked={state.disablePublicMemos} onChange={(event) => handleDisablePublicMemosChanged(event.target.checked)} />diff --git a/web/src/components/UpdateVersionBanner.tsx b/web/src/components/UpgradeVersionBanner.tsxsimilarity index 91%rename from web/src/components/UpdateVersionBanner.tsxrename to web/src/components/UpgradeVersionBanner.tsxindex fbd081bd6..7c72ad5d5 100644--- a/web/src/components/UpdateVersionBanner.tsx+++ b/web/src/components/UpgradeVersionBanner.tsx@@ -10,7 +10,7 @@ interface State {show: boolean;}-const UpdateVersionBanner: React.FC = () => {+const UpgradeVersionBanner: React.FC = () => {const globalStore = useGlobalStore();const profile = globalStore.state.systemStatus.profile;const [state, setState] = useState<State>({@@ -19,6 +19,10 @@ const UpdateVersionBanner: React.FC = () => {});useEffect(() => {+ if (globalStore.state.systemStatus.ignoreUpgrade) {+ return;+ }+api.getRepoLatestTag().then((latestTag) => {const { skippedVersion } = storage.get(["skippedVersion"]);const latestVersion = latestTag.slice(1) || "0.0.0";@@ -58,4 +62,4 @@ const UpdateVersionBanner: React.FC = () => {);};-export default UpdateVersionBanner;+export default UpgradeVersionBanner;diff --git a/web/src/layouts/Root.tsx b/web/src/layouts/Root.tsxindex 331021223..76b3b12aa 100644--- a/web/src/layouts/Root.tsx+++ b/web/src/layouts/Root.tsx@@ -1,12 +1,12 @@import { Outlet } from "react-router-dom";import Header from "@/components/Header";-import UpdateVersionBanner from "@/components/UpdateVersionBanner";+import UpgradeVersionBanner from "@/components/UpgradeVersionBanner";function Root() {return (<div className="w-full min-h-full bg-zinc-100 dark:bg-zinc-800"><div className="w-full h-auto flex flex-col justify-start items-center">- <UpdateVersionBanner />+ <UpgradeVersionBanner /></div><div className="w-full max-w-6xl mx-auto flex flex-row justify-center items-start"><Header />diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.tsindex ed5f18edc..311feb34b 100644--- a/web/src/store/module/global.ts+++ b/web/src/store/module/global.ts@@ -11,6 +11,7 @@ export const initialGlobalState = async () => {appearance: "system" as Appearance,systemStatus: {allowSignUp: false,+ ignoreUpgrade: false,disablePublicMemos: false,additionalStyle: "",additionalScript: "",diff --git a/web/src/store/reducer/global.ts b/web/src/store/reducer/global.tsindex 72b2514a4..bd201f781 100644--- a/web/src/store/reducer/global.ts+++ b/web/src/store/reducer/global.ts@@ -19,6 +19,7 @@ const globalSlice = createSlice({},dbSize: 0,allowSignUp: false,+ ignoreUpgrade: false,disablePublicMemos: false,additionalStyle: "",additionalScript: "",diff --git a/web/src/types/modules/system.d.ts b/web/src/types/modules/system.d.tsindex 3e7de52df..7142bf58d 100644--- a/web/src/types/modules/system.d.ts+++ b/web/src/types/modules/system.d.ts@@ -23,6 +23,7 @@ interface SystemStatus {dbSize: number;// System settingsallowSignUp: boolean;+ ignoreUpgrade: boolean;disablePublicMemos: boolean;additionalStyle: string;additionalScript: string;