diff --git a/web/src/router/index.tsx b/web/src/router/index.tsx
index 68f68d3187882..4dc2a42a84b73 100644
--- a/web/src/router/index.tsx
+++ b/web/src/router/index.tsx
@@ -27,6 +27,9 @@ export enum Routes {
INBOX = "/inbox",
ARCHIVED = "/archived",
SETTING = "/setting",
+ EXPLORE = "/explore",
+ ABOUT = "/about",
+ AUTH = "/auth",
}
const router = createBrowserRouter([
@@ -35,7 +38,7 @@ const router = createBrowserRouter([
element:
,
children: [
{
- path: "/auth",
+ path: Routes.AUTH,
element:
,
children: [
{
@@ -81,11 +84,11 @@ const router = createBrowserRouter([
element:
,
},
{
- path: "explore",
+ path: Routes.EXPLORE,
element:
,
},
{
- path: "m/:memoName",
+ path: "m/:uid",
element:
,
},
{
@@ -93,7 +96,7 @@ const router = createBrowserRouter([
element:
,
},
{
- path: "about",
+ path: Routes.ABOUT,
element:
,
},
{
diff --git a/web/src/store/module/filter.ts b/web/src/store/module/filter.ts
index e07d3ab091841..00f116fcbcaf2 100644
--- a/web/src/store/module/filter.ts
+++ b/web/src/store/module/filter.ts
@@ -1,3 +1,4 @@
+import { Visibility } from "@/types/proto/api/v2/memo_service";
import store, { useAppSelector } from "..";
import { setFilter } from "../reducer/filter";
diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.ts
index 0f20e18bb38d2..7614ebb65acfe 100644
--- a/web/src/store/module/global.ts
+++ b/web/src/store/module/global.ts
@@ -1,6 +1,8 @@
+import { workspaceServiceClient } from "@/grpcweb";
import * as api from "@/helpers/api";
import storage from "@/helpers/storage";
import i18n from "@/i18n";
+import { WorkspaceProfile } from "@/types/proto/api/v2/workspace_service";
import { findNearestMatchedLanguage } from "@/utils/i18n";
import store, { useAppSelector } from "../";
import { setAppearance, setGlobalState, setLocale } from "../reducer/global";
@@ -22,8 +24,14 @@ export const initialGlobalState = async () => {
appearance: "system",
},
} as SystemStatus,
+ workspaceProfile: WorkspaceProfile.fromPartial({}),
};
+ const { workspaceProfile } = await workspaceServiceClient.getWorkspaceProfile({});
+ if (workspaceProfile) {
+ defaultGlobalState.workspaceProfile = workspaceProfile;
+ }
+
const { data } = await api.getSystemStatus();
if (data) {
const customizedProfile = data.customizedProfile;
@@ -62,7 +70,7 @@ export const useGlobalStore = () => {
return store.getState().global.systemStatus.disablePublicMemos;
},
isDev: () => {
- return state.systemStatus.profile.mode !== "prod";
+ return state.workspaceProfile.mode !== "prod";
},
fetchSystemStatus: async () => {
const { data: systemStatus } = await api.getSystemStatus();
diff --git a/web/src/store/reducer/filter.ts b/web/src/store/reducer/filter.ts
index af8c2323877d9..287a1ddaffb27 100644
--- a/web/src/store/reducer/filter.ts
+++ b/web/src/store/reducer/filter.ts
@@ -1,4 +1,5 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { Visibility } from "@/types/proto/api/v2/memo_service";
interface State {
tag?: string;
diff --git a/web/src/store/reducer/global.ts b/web/src/store/reducer/global.ts
index a934f3cf5b007..1664e2a3f4d74 100644
--- a/web/src/store/reducer/global.ts
+++ b/web/src/store/reducer/global.ts
@@ -1,9 +1,11 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { WorkspaceProfile } from "@/types/proto/api/v2/workspace_service";
interface State {
locale: Locale;
appearance: Appearance;
systemStatus: SystemStatus;
+ workspaceProfile: WorkspaceProfile;
}
const globalSlice = createSlice({
@@ -12,11 +14,6 @@ const globalSlice = createSlice({
locale: "en",
appearance: "system",
systemStatus: {
- host: undefined,
- profile: {
- mode: "demo",
- version: "",
- },
disablePasswordLogin: false,
disablePublicMemos: false,
memoDisplayWithUpdatedTs: false,
@@ -28,6 +25,7 @@ const globalSlice = createSlice({
appearance: "system",
},
},
+ workspaceProfile: WorkspaceProfile.fromPartial({}),
} as State,
reducers: {
setGlobalState: (state, action: PayloadAction
>) => {
diff --git a/web/src/store/reducer/resource.ts b/web/src/store/reducer/resource.ts
index b1709952b8ffd..102b2b31edc7a 100644
--- a/web/src/store/reducer/resource.ts
+++ b/web/src/store/reducer/resource.ts
@@ -21,14 +21,14 @@ const resourceSlice = createSlice({
upsertResources: (state, action: PayloadAction) => {
return {
...state,
- resources: uniqBy([...action.payload, ...state.resources], "id"),
+ resources: uniqBy([...action.payload, ...state.resources], "name"),
};
},
patchResource: (state, action: PayloadAction>) => {
return {
...state,
resources: state.resources.map((resource) => {
- if (resource.id === action.payload.id) {
+ if (resource.name === action.payload.name) {
return {
...resource,
...action.payload,
diff --git a/web/src/store/v1/memo.ts b/web/src/store/v1/memo.ts
index bbbdfad561802..d3dc4109705fc 100644
--- a/web/src/store/v1/memo.ts
+++ b/web/src/store/v1/memo.ts
@@ -4,11 +4,11 @@ import { memoServiceClient } from "@/grpcweb";
import { CreateMemoRequest, ListMemosRequest, Memo } from "@/types/proto/api/v2/memo_service";
interface State {
- memoMapById: Record;
+ memoMapByName: Record;
}
const getDefaultState = (): State => ({
- memoMapById: {},
+ memoMapByName: {},
});
export const useMemoStore = create(
@@ -17,57 +17,50 @@ export const useMemoStore = create(
getState: () => get(),
fetchMemos: async (request: Partial) => {
const { memos, nextPageToken } = await memoServiceClient.listMemos(request);
- const memoMap = get().memoMapById;
+ const memoMap = get().memoMapByName;
for (const memo of memos) {
- memoMap[memo.id] = memo;
+ memoMap[memo.name] = memo;
}
- set({ memoMapById: memoMap });
+ set({ memoMapByName: memoMap });
return { memos, nextPageToken };
},
- getOrFetchMemoById: async (id: number, options?: { skipCache?: boolean; skipStore?: boolean }) => {
- const memoMap = get().memoMapById;
- const memo = memoMap[id];
+ getOrFetchMemoByName: async (name: string, options?: { skipCache?: boolean; skipStore?: boolean }) => {
+ const memoMap = get().memoMapByName;
+ const memo = memoMap[name];
if (memo && !options?.skipCache) {
return memo;
}
const res = await memoServiceClient.getMemo({
- id,
+ name,
});
if (!res.memo) {
throw new Error("Memo not found");
}
if (!options?.skipStore) {
- memoMap[id] = res.memo;
- set({ memoMapById: memoMap });
+ memoMap[name] = res.memo;
+ set({ memoMapByName: memoMap });
}
return res.memo;
},
- getMemoById: (id: number) => {
- return get().memoMapById[id];
+ getMemoByName: (name: string) => {
+ return get().memoMapByName[name];
},
- getOrFetchMemoByName: async (name: string) => {
- const memoMap = get().memoMapById;
- const memo = Object.values(memoMap).find((memo) => memo.name === name);
- if (memo) {
- return memo;
- }
-
- const res = await memoServiceClient.getMemoByName({
- name,
+ searchMemos: async (filter: string) => {
+ const { memos } = await memoServiceClient.searchMemos({
+ filter,
});
- if (!res.memo) {
- throw new Error("Memo not found");
+ const memoMap = get().memoMapByName;
+ for (const memo of memos) {
+ memoMap[memo.name] = memo;
}
-
- memoMap[res.memo.id] = res.memo;
- set({ memoMapById: memoMap });
- return res.memo;
+ set({ memoMapByName: memoMap });
+ return memos;
},
- getMemoByName: (name: string) => {
- const memoMap = get().memoMapById;
- return Object.values(memoMap).find((memo) => memo.name === name);
+ getMemoByUid: (uid: string) => {
+ const memoMap = get().memoMapByName;
+ return Object.values(memoMap).find((memo) => memo.uid === uid);
},
createMemo: async (request: CreateMemoRequest) => {
const { memo } = await memoServiceClient.createMemo(request);
@@ -75,9 +68,9 @@ export const useMemoStore = create(
throw new Error("Memo not found");
}
- const memoMap = get().memoMapById;
- memoMap[memo.id] = memo;
- set({ memoMapById: memoMap });
+ const memoMap = get().memoMapByName;
+ memoMap[memo.name] = memo;
+ set({ memoMapByName: memoMap });
return memo;
},
updateMemo: async (update: Partial, updateMask: string[]) => {
@@ -89,33 +82,33 @@ export const useMemoStore = create(
throw new Error("Memo not found");
}
- const memoMap = get().memoMapById;
- memoMap[memo.id] = memo;
- set({ memoMapById: memoMap });
+ const memoMap = get().memoMapByName;
+ memoMap[memo.name] = memo;
+ set({ memoMapByName: memoMap });
return memo;
},
- deleteMemo: async (id: number) => {
+ deleteMemo: async (name: string) => {
await memoServiceClient.deleteMemo({
- id: id,
+ name,
});
- const memoMap = get().memoMapById;
- delete memoMap[id];
- set({ memoMapById: memoMap });
+ const memoMap = get().memoMapByName;
+ delete memoMap[name];
+ set({ memoMapByName: memoMap });
},
})),
);
export const useMemoList = () => {
const memoStore = useMemoStore();
- const memos = Object.values(memoStore.getState().memoMapById);
+ const memos = Object.values(memoStore.getState().memoMapByName);
const reset = () => {
- memoStore.setState({ memoMapById: {} });
+ memoStore.setState({ memoMapByName: {} });
};
const size = () => {
- return Object.keys(memoStore.getState().memoMapById).length;
+ return Object.keys(memoStore.getState().memoMapByName).length;
};
return {
diff --git a/web/src/store/v1/resource.ts b/web/src/store/v1/resource.ts
index e4aacbbc5f42e..91a79a8958ada 100644
--- a/web/src/store/v1/resource.ts
+++ b/web/src/store/v1/resource.ts
@@ -4,62 +4,30 @@ import { resourceServiceClient } from "@/grpcweb";
import { Resource } from "@/types/proto/api/v2/resource_service";
interface State {
- resourceMapById: Record;
+ resourceMapByName: Record;
}
const getDefaultState = (): State => ({
- resourceMapById: {},
+ resourceMapByName: {},
});
export const useResourceStore = create(
combine(getDefaultState(), (set, get) => ({
setState: (state: State) => set(state),
getState: () => get(),
- getOrFetchResourceById: async (id: number, options?: { skipCache?: boolean; skipStore?: boolean }) => {
- const resourceMap = get().resourceMapById;
- const resource = resourceMap[id];
- if (resource && !options?.skipCache) {
- return resource;
- }
-
- const res = await resourceServiceClient.getResource({
- id,
- });
- if (!res.resource) {
- throw new Error("Resource not found");
- }
-
- if (!options?.skipStore) {
- resourceMap[id] = res.resource;
- set({ resourceMapById: resourceMap });
- }
- return res.resource;
- },
- getResourceById: (id: number) => {
- return get().resourceMapById[id];
- },
- getOrFetchResourceByName: async (name: string, options?: { skipCache?: boolean; skipStore?: boolean }) => {
- const resourceMap = get().resourceMapById;
- const cachedResource = Object.values(resourceMap).find((r) => r.name === name);
- if (cachedResource && !options?.skipCache) {
- return cachedResource;
- }
-
- const { resource } = await resourceServiceClient.getResourceByName({
- name,
+ searchResources: async (filter: string) => {
+ const { resources } = await resourceServiceClient.searchResources({
+ filter,
});
- if (!resource) {
- throw new Error("Resource not found");
- }
-
- if (!options?.skipStore) {
- resourceMap[resource.id] = resource;
- set({ resourceMapById: resourceMap });
+ const resourceMap = get().resourceMapByName;
+ for (const resource of resources) {
+ resourceMap[resource.name] = resource;
}
- return resource;
+ set({ resourceMapByName: resourceMap });
+ return resources;
},
getResourceByName: (name: string) => {
- const resourceMap = get().resourceMapById;
+ const resourceMap = get().resourceMapByName;
return Object.values(resourceMap).find((r) => r.name === name);
},
})),
diff --git a/web/src/store/v1/resourceName.ts b/web/src/store/v1/resourceName.ts
index b1ac00a416ff4..9bc4684099457 100644
--- a/web/src/store/v1/resourceName.ts
+++ b/web/src/store/v1/resourceName.ts
@@ -2,6 +2,6 @@ export const WorkspaceSettingPrefix = "settings/";
export const UserNamePrefix = "users/";
export const MemoNamePrefix = "memos/";
-export const extractUsernameFromName = (name: string = "") => {
- return name.slice(UserNamePrefix.length);
+export const extractMemoIdFromName = (name: string) => {
+ return parseInt(name.split(MemoNamePrefix).pop() || "", 10);
};
diff --git a/web/src/store/v1/user.ts b/web/src/store/v1/user.ts
index 12d4c7dec4311..a826993fd50b7 100644
--- a/web/src/store/v1/user.ts
+++ b/web/src/store/v1/user.ts
@@ -2,17 +2,16 @@ import { create } from "zustand";
import { combine } from "zustand/middleware";
import { authServiceClient, userServiceClient } from "@/grpcweb";
import { User, UserSetting, User_Role } from "@/types/proto/api/v2/user_service";
-import { UserNamePrefix, extractUsernameFromName } from "./resourceName";
interface State {
- userMapByUsername: Record;
- // The name of current user. Format: `users/${username}`
+ userMapByName: Record;
+ // The name of current user. Format: `users/${uid}`
currentUser?: string;
userSetting?: UserSetting;
}
const getDefaultState = (): State => ({
- userMapByUsername: {},
+ userMapByName: {},
currentUser: undefined,
userSetting: undefined,
});
@@ -32,40 +31,60 @@ export const useUserStore = create(
combine(getDefaultState(), (set, get) => ({
fetchUsers: async () => {
const { users } = await userServiceClient.listUsers({});
- const userMap = get().userMapByUsername;
+ const userMap = get().userMapByName;
for (const user of users) {
- userMap[user.username] = user;
+ userMap[user.name] = user;
}
- set({ userMapByUsername: userMap });
+ set({ userMapByName: userMap });
return users;
},
- getOrFetchUserByUsername: async (username: string) => {
- const userMap = get().userMapByUsername;
- if (userMap[username]) {
- return userMap[username] as User;
+ getOrFetchUserByName: async (name: string) => {
+ const userMap = get().userMapByName;
+ if (userMap[name]) {
+ return userMap[name] as User;
}
- if (requestCache.has(username)) {
- return await requestCache.get(username);
+ if (requestCache.has(name)) {
+ return await requestCache.get(name);
}
const promisedUser = userServiceClient
.getUser({
- name: `${UserNamePrefix}${username}`,
+ name: name,
})
.then(({ user }) => user);
- requestCache.set(username, promisedUser);
+ requestCache.set(name, promisedUser);
const user = await promisedUser;
if (!user) {
throw new Error("User not found");
}
- requestCache.delete(username);
- userMap[username] = user;
- set({ userMapByUsername: userMap });
+ requestCache.delete(name);
+ userMap[name] = user;
+ set({ userMapByName: userMap });
return user;
},
- getUserByUsername: (username: string) => {
- const userMap = get().userMapByUsername;
- return userMap[username];
+ listUsers: async () => {
+ const { users } = await userServiceClient.listUsers({});
+ const userMap = get().userMapByName;
+ for (const user of users) {
+ userMap[user.name] = user;
+ }
+ set({ userMapByName: userMap });
+ return users;
+ },
+ searchUsers: async (filter: string) => {
+ const { users } = await userServiceClient.searchUsers({
+ filter,
+ });
+ const userMap = get().userMapByName;
+ for (const user of users) {
+ userMap[user.name] = user;
+ }
+ set({ userMapByName: userMap });
+ return users;
+ },
+ getUserByName: (name: string) => {
+ const userMap = get().userMapByName;
+ return userMap[name];
},
updateUser: async (user: Partial, updateMask: string[]) => {
const { user: updatedUser } = await userServiceClient.updateUser({
@@ -75,12 +94,12 @@ export const useUserStore = create(
if (!updatedUser) {
throw new Error("User not found");
}
- const userMap = get().userMapByUsername;
- if (user.name !== updatedUser.name) {
- delete userMap[extractUsernameFromName(user.name)];
+ const userMap = get().userMapByName;
+ if (user.name && user.name !== updatedUser.name) {
+ delete userMap[user.name];
}
- userMap[updatedUser.username] = updatedUser;
- set({ userMapByUsername: userMap });
+ userMap[updatedUser.name] = updatedUser;
+ set({ userMapByName: userMap });
if (user.name === get().currentUser) {
set({ currentUser: updatedUser.name });
}
@@ -90,19 +109,18 @@ export const useUserStore = create(
await userServiceClient.deleteUser({
name,
});
- const username = extractUsernameFromName(name);
- const userMap = get().userMapByUsername;
- delete userMap[username];
- set({ userMapByUsername: userMap });
+ const userMap = get().userMapByName;
+ delete userMap[name];
+ set({ userMapByName: userMap });
},
fetchCurrentUser: async () => {
const { user } = await authServiceClient.getAuthStatus({});
if (!user) {
throw new Error("User not found");
}
- const userMap = get().userMapByUsername;
- userMap[user.username] = user;
- set({ currentUser: user.name, userMapByUsername: userMap });
+ const userMap = get().userMapByName;
+ userMap[user.name] = user;
+ set({ currentUser: user.name, userMapByName: userMap });
const { setting } = await userServiceClient.getUserSetting({});
set({
userSetting: UserSetting.fromPartial({
diff --git a/web/src/types/common.d.ts b/web/src/types/common.d.ts
index f1d2f1062a724..03ae447b79d49 100644
--- a/web/src/types/common.d.ts
+++ b/web/src/types/common.d.ts
@@ -1,9 +1 @@
-type BasicType = undefined | null | boolean | number | string | Record | Array;
-
type FunctionType = (...args: unknown[]) => unknown;
-
-interface KVObject {
- [key: string]: T;
-}
-
-type Option = T | undefined;
diff --git a/web/src/types/modules/common.d.ts b/web/src/types/modules/common.d.ts
deleted file mode 100644
index 1d6373bc9567f..0000000000000
--- a/web/src/types/modules/common.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-type RowStatus = "NORMAL" | "ARCHIVED";
-
-type Visibility = "PUBLIC" | "PROTECTED" | "PRIVATE";
diff --git a/web/src/types/modules/resource.d.ts b/web/src/types/modules/resource.d.ts
deleted file mode 100644
index dc80ed8474f08..0000000000000
--- a/web/src/types/modules/resource.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type ResourceId = number;
-
-interface ResourceCreate {
- filename: string;
- externalLink: string;
- type: string;
-}
diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.ts
index 0254240015afd..784b92c1218a1 100644
--- a/web/src/types/modules/setting.d.ts
+++ b/web/src/types/modules/setting.d.ts
@@ -1,43 +1 @@
type Appearance = "system" | "light" | "dark";
-
-interface BasicSetting {
- locale: Locale;
- appearance: Appearance;
-}
-interface Setting {
- locale: Locale;
- appearance: Appearance;
- memoVisibility: Visibility;
- telegramUserId: string;
-}
-
-interface LocalSetting {
- enableDoubleClickEditing: boolean;
-}
-
-interface UserLocaleSetting {
- key: "locale";
- value: Locale;
-}
-
-interface UserAppearanceSetting {
- key: "appearance";
- value: Appearance;
-}
-
-interface UserMemoVisibilitySetting {
- key: "memo-visibility";
- value: Visibility;
-}
-
-interface UserTelegramUserIdSetting {
- key: "telegram-user-id";
- value: string;
-}
-
-type UserSetting = UserLocaleSetting | UserAppearanceSetting | UserMemoVisibilitySetting | UserTelegramUserIdSetting;
-
-interface UserSettingUpsert {
- key: keyof Setting;
- value: string;
-}
diff --git a/web/src/types/modules/system.d.ts b/web/src/types/modules/system.d.ts
index ed4ebf0d81702..debecd26f66dc 100644
--- a/web/src/types/modules/system.d.ts
+++ b/web/src/types/modules/system.d.ts
@@ -1,8 +1,3 @@
-interface Profile {
- mode: string;
- version: string;
-}
-
interface CustomizedProfile {
name: string;
logoUrl: string;
@@ -12,8 +7,6 @@ interface CustomizedProfile {
}
interface SystemStatus {
- host?: User;
- profile: Profile;
// System settings
disablePasswordLogin: boolean;
disablePublicMemos: boolean;
diff --git a/web/src/types/modules/user.d.ts b/web/src/types/modules/user.d.ts
deleted file mode 100644
index 8b331e2842bac..0000000000000
--- a/web/src/types/modules/user.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-type UserId = number;
-type UserRole = "HOST" | "USER";
-
-interface User {
- id: UserId;
-
- createdTs: number;
- updatedTs: number;
- rowStatus: RowStatus;
-
- username: string;
- role: UserRole;
- email: string;
- nickname: string;
- avatarUrl: string;
- userSettingList: UserSetting[];
-
- setting: Setting;
- localSetting: LocalSetting;
-}
-
-interface UserCreate {
- username: string;
- password: string;
- role: UserRole;
-}
-
-interface UserPatch {
- id: UserId;
- rowStatus?: RowStatus;
- username?: string;
- email?: string;
- nickname?: string;
- avatarUrl?: string;
- password?: string;
-}
-
-interface UserDelete {
- id: UserId;
-}
diff --git a/web/src/utils/i18n.ts b/web/src/utils/i18n.ts
index 29020c2cc2769..ca94343932f54 100644
--- a/web/src/utils/i18n.ts
+++ b/web/src/utils/i18n.ts
@@ -22,7 +22,7 @@ export const findNearestMatchedLanguage = (language: string): Locale => {
}
// Try to match "xx-YY" to existing translation for "xx-ZZ" as a last resort
- // If some match is undesired, it can be overriden in src/i18n.ts `fallbacks` option
+ // If some match is undesired, it can be overridden in src/i18n.ts `fallbacks` option
for (const existing of locales) {
if (shortCode == existing.substring(0, 2)) {
return existing as Locale;
diff --git a/web/src/utils/resource.ts b/web/src/utils/resource.ts
index 32bcbf8da31f0..67fdf579aa552 100644
--- a/web/src/utils/resource.ts
+++ b/web/src/utils/resource.ts
@@ -5,7 +5,7 @@ export const getResourceUrl = (resource: Resource) => {
return resource.externalLink;
}
- return `${import.meta.env.VITE_API_BASE_URL || window.location.origin}/o/r/${resource.name}`;
+ return `${import.meta.env.VITE_API_BASE_URL || window.location.origin}/o/r/${resource.uid}`;
};
export const getResourceType = (resource: Resource) => {