Skip to content

armgit / memos

Public Imported from GitHub
0

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.

chore: upgrade version to `0.11.0` (#1143)

boojackcc23d5cafe9c
diff --git a/server/system.go b/server/system.go
index b59420283..5726c91af 100644
--- a/server/system.go
+++ b/server/system.go
@@ -157,6 +157,21 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
g.GET("/system/setting", func(c echo.Context) error {
ctx := c.Request().Context()
+ userID, ok := c.Get(getUserIDContextKey()).(int)
+ if !ok {
+ return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
+ }
+
+ user, err := s.Store.FindUser(ctx, &api.UserFind{
+ ID: &userID,
+ })
+ if err != nil {
+ return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user").SetInternal(err)
+ }
+ if user == nil || user.Role != api.Host {
+ return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+ }
+
systemSettingList, err := s.Store.FindSystemSettingList(ctx, &api.SystemSettingFind{})
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find system setting list").SetInternal(err)
@@ -170,6 +185,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
if !ok {
return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
}
+
user, err := s.Store.FindUser(ctx, &api.UserFind{
ID: &userID,
})
@@ -179,6 +195,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
if user == nil || user.Role != api.Host {
return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
}
+
if err := s.Store.Vacuum(ctx); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to vacuum database").SetInternal(err)
}
diff --git a/server/version/version.go b/server/version/version.go
index 2df704de9..ae071390a 100644
--- a/server/version/version.go
+++ b/server/version/version.go
@@ -9,10 +9,10 @@ import (
// Version is the service current released version.
// Semantic versioning: https://semver.org/
-var Version = "0.10.3"
+var Version = "0.11.0"
// DevVersion is the service current development version.
-var DevVersion = "0.10.3"
+var DevVersion = "0.11.0"
func GetCurrentVersion(mode string) string {
if mode == "dev" || mode == "demo" {
diff --git a/store/db/migration/prod/0.11/00__user_avatar.sql b/store/db/migration/prod/0.11/00__user_avatar.sql
new file mode 100644
index 000000000..11c63e950
--- /dev/null
+++ b/store/db/migration/prod/0.11/00__user_avatar.sql
@@ -0,0 +1,4 @@
+ALTER TABLE
+ user
+ADD
+ COLUMN avatar_url TEXT NOT NULL DEFAULT '';
\ No newline at end of file
diff --git a/store/db/migration/prod/0.11/01__idp.sql b/store/db/migration/prod/0.11/01__idp.sql
new file mode 100644
index 000000000..be5cf49fd
--- /dev/null
+++ b/store/db/migration/prod/0.11/01__idp.sql
@@ -0,0 +1,8 @@
+-- idp
+CREATE TABLE idp (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ type TEXT NOT NULL,
+ identifier_filter TEXT NOT NULL DEFAULT '',
+ config TEXT NOT NULL DEFAULT '{}'
+);
\ No newline at end of file
diff --git a/store/db/migration/prod/0.11/02__storage.sql b/store/db/migration/prod/0.11/02__storage.sql
new file mode 100644
index 000000000..8dbf56372
--- /dev/null
+++ b/store/db/migration/prod/0.11/02__storage.sql
@@ -0,0 +1,7 @@
+-- storage
+CREATE TABLE storage (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ type TEXT NOT NULL,
+ config TEXT NOT NULL DEFAULT '{}'
+);
\ No newline at end of file
diff --git a/store/db/migration/prod/LATEST__SCHEMA.sql b/store/db/migration/prod/LATEST__SCHEMA.sql
index fa10f0701..b2448a1e8 100644
--- a/store/db/migration/prod/LATEST__SCHEMA.sql
+++ b/store/db/migration/prod/LATEST__SCHEMA.sql
@@ -23,7 +23,8 @@ CREATE TABLE user (
email TEXT NOT NULL DEFAULT '',
nickname TEXT NOT NULL DEFAULT '',
password_hash TEXT NOT NULL,
- open_id TEXT NOT NULL UNIQUE
+ open_id TEXT NOT NULL UNIQUE,
+ avatar_url TEXT NOT NULL DEFAULT ''
);
-- user_setting
@@ -102,4 +103,21 @@ CREATE TABLE activity (
type TEXT NOT NULL DEFAULT '',
level TEXT NOT NULL CHECK (level IN ('INFO', 'WARN', 'ERROR')) DEFAULT 'INFO',
payload TEXT NOT NULL DEFAULT '{}'
+);
+
+-- storage
+CREATE TABLE storage (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ type TEXT NOT NULL,
+ config TEXT NOT NULL DEFAULT '{}'
+);
+
+-- idp
+CREATE TABLE idp (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ name TEXT NOT NULL,
+ type TEXT NOT NULL,
+ identifier_filter TEXT NOT NULL DEFAULT '',
+ config TEXT NOT NULL DEFAULT '{}'
);
\ No newline at end of file
diff --git a/web/src/components/CreateStorageServiceDialog.tsx b/web/src/components/CreateStorageServiceDialog.tsx
index 6d078a55f..92cd2b960 100644
--- a/web/src/components/CreateStorageServiceDialog.tsx
+++ b/web/src/components/CreateStorageServiceDialog.tsx
@@ -1,5 +1,4 @@
import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
import { Button, Input, Typography } from "@mui/joy";
import * as api from "../helpers/api";
import { generateDialog } from "./Dialog";
@@ -13,7 +12,6 @@ interface Props extends DialogProps {
const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
const { destroy, storage, confirmCallback } = props;
- const { t } = useTranslation();
const [basicInfo, setBasicInfo] = useState({
name: "",
});
@@ -95,9 +93,18 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
return (
<>
- <div className="dialog-header-container !w-64">
+ <div className="dialog-header-container">
<p className="title-text">
- {isCreating ? t("setting.storage-section.create-a-service") : t("setting.storage-section.update-a-service")}
+ {isCreating ? "Create storage" : "Update storage"}
+ <a
+ className="ml-2 text-sm text-blue-600 hover:opacity-80 hover:underline"
+ href="https://usememos.com/docs/storage"
+ target="_blank"
+ rel="noreferrer"
+ >
+ Learn more
+ <Icon.ExternalLink className="inline -mt-1 ml-1 w-4 h-auto opacity-80" />
+ </a>
</p>
<button className="btn close-btn" onClick={handleCloseBtnClick}>
<Icon.X />
@@ -106,7 +113,6 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
<div className="dialog-content-container">
<Typography className="!mb-1" level="body2">
Name
- <span className="text-sm text-gray-400 ml-1">(Unique identifier)</span>
</Typography>
<Input
className="mb-2"
diff --git a/web/src/components/SettingDialog.tsx b/web/src/components/SettingDialog.tsx
index 238bd5d2b..4cd8e88d8 100644
--- a/web/src/components/SettingDialog.tsx
+++ b/web/src/components/SettingDialog.tsx
@@ -1,7 +1,7 @@
import { Option, Select } from "@mui/joy";
import { useState } from "react";
import { useTranslation } from "react-i18next";
-import { useGlobalStore, useUserStore } from "../store/module";
+import { useUserStore } from "../store/module";
import Icon from "./Icon";
import { generateDialog } from "./Dialog";
import BetaBadge from "./BetaBadge";
@@ -24,7 +24,6 @@ interface State {
const SettingDialog: React.FC<Props> = (props: Props) => {
const { destroy } = props;
const { t } = useTranslation();
- const globalStore = useGlobalStore();
const userStore = useUserStore();
const user = userStore.state.user;
const [state, setState] = useState<State>({
@@ -83,22 +82,18 @@ const SettingDialog: React.FC<Props> = (props: Props) => {
>
<Icon.Settings2 className="w-4 h-auto mr-2 opacity-80" /> {t("setting.system")}
</span>
- {globalStore.isDev() && (
- <span
- onClick={() => handleSectionSelectorItemClick("storage")}
- className={`section-item ${state.selectedSection === "storage" ? "selected" : ""}`}
- >
- <Icon.Database className="w-4 h-auto mr-2 opacity-80" /> {t("setting.storage")} <BetaBadge />
- </span>
- )}
- {globalStore.isDev() && (
- <span
- onClick={() => handleSectionSelectorItemClick("sso")}
- className={`section-item ${state.selectedSection === "sso" ? "selected" : ""}`}
- >
- <Icon.Key className="w-4 h-auto mr-2 opacity-80" /> {t("setting.sso")} <BetaBadge />
- </span>
- )}
+ <span
+ onClick={() => handleSectionSelectorItemClick("storage")}
+ className={`section-item ${state.selectedSection === "storage" ? "selected" : ""}`}
+ >
+ <Icon.Database className="w-4 h-auto mr-2 opacity-80" /> {t("setting.storage")} <BetaBadge />
+ </span>
+ <span
+ onClick={() => handleSectionSelectorItemClick("sso")}
+ className={`section-item ${state.selectedSection === "sso" ? "selected" : ""}`}
+ >
+ <Icon.Key className="w-4 h-auto mr-2 opacity-80" /> {t("setting.sso")} <BetaBadge />
+ </span>
</div>
</>
) : null}