Collaborative Workspace Memos

docs/apidocs.swagger.yaml

@@ -2150,6 +2150,9 @@ definitions:
       enableLinkPreview:
         type: boolean
         description: enable_link_preview enables links preview.
+      enableMembersEdit:
+        type: boolean
+        title: enable_members_edit any member can edit workspace memos
   apiv1WorkspaceSetting:
     type: object
     properties:

proto/api/v1/workspace_setting_service.proto

@@ -94,6 +94,8 @@ message WorkspaceMemoRelatedSetting {
   bool enable_double_click_edit = 5;
   // enable_link_preview enables links preview.
   bool enable_link_preview = 6;
+  // enable_members_edit any member can edit workspace memos
+  bool enable_members_edit = 7;
 }
 
 message GetWorkspaceSettingRequest {

proto/store/workspace_setting.proto

@@ -90,4 +90,6 @@ message WorkspaceMemoRelatedSetting {
   bool enable_double_click_edit = 5;
   // enable_link_preview enables links preview.
   bool enable_link_preview = 6;
+  // enable_members_edit any member can edit workspace memos
+  bool enable_members_edit = 7;
 }

server/router/api/v1/memo_service.go

@@ -257,7 +257,14 @@ func (s *APIV1Service) UpdateMemo(ctx context.Context, request *v1pb.UpdateMemoR
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get current user")
 	}
-	if memo.CreatorID != user.ID {
+
+	workspaceMemoRelatedSetting, err := s.Store.GetWorkspaceMemoRelatedSetting(ctx)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to get workspace memo related setting")
+	}
+
+	membersCanEdit := memo.Visibility == store.Protected && workspaceMemoRelatedSetting.EnableMembersEdit
+	if !membersCanEdit && memo.CreatorID != user.ID {
 		return nil, status.Errorf(codes.PermissionDenied, "permission denied")
 	}
 

server/router/api/v1/workspace_setting_service.go

@@ -220,6 +220,7 @@ func convertWorkspaceMemoRelatedSettingFromStore(setting *storepb.WorkspaceMemoR
 		EnableAutoCompact:     setting.EnableAutoCompact,
 		EnableDoubleClickEdit: setting.EnableDoubleClickEdit,
 		EnableLinkPreview:     setting.EnableLinkPreview,
+		EnableMembersEdit:     setting.EnableMembersEdit,
 	}
 }
 
@@ -234,5 +235,6 @@ func convertWorkspaceMemoRelatedSettingToStore(setting *v1pb.WorkspaceMemoRelate
 		EnableAutoCompact:     setting.EnableAutoCompact,
 		EnableDoubleClickEdit: setting.EnableDoubleClickEdit,
 		EnableLinkPreview:     setting.EnableLinkPreview,
+		EnableMembersEdit:     setting.EnableMembersEdit,
 	}
 }

web/src/components/MemoContent/index.tsx

@@ -1,8 +1,9 @@
 import clsx from "clsx";
 import { memo, useEffect, useRef, useState } from "react";
 import useCurrentUser from "@/hooks/useCurrentUser";
-import { useMemoStore } from "@/store/v1";
+import { useMemoStore, useWorkspaceSettingStore } from "@/store/v1";
 import { Node, NodeType } from "@/types/proto/api/v1/markdown_service";
+import { WorkspaceMemoRelatedSetting, WorkspaceSettingKey } from "@/types/proto/store/workspace_setting";
 import { useTranslate } from "@/utils/i18n";
 import Renderer from "./Renderer";
 import { RendererContext } from "./types";
@@ -30,10 +31,15 @@ const MemoContent: React.FC<Props> = (props: Props) => {
   const t = useTranslate();
   const currentUser = useCurrentUser();
   const memoStore = useMemoStore();
+  const workspaceSettingStore = useWorkspaceSettingStore();
+  const workspaceMemoRelatedSetting =
+    workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.MEMO_RELATED).memoRelatedSetting ||
+    WorkspaceMemoRelatedSetting.fromPartial({});
   const memoContentContainerRef = useRef<HTMLDivElement>(null);
   const [showCompactMode, setShowCompactMode] = useState<boolean>(false);
   const memo = memoName ? memoStore.getMemoByName(memoName) : null;
-  const allowEdit = !props.readonly && memo && currentUser?.name === memo.creator;
+  const membersCanEdit = memo?.visibility === "PROTECTED" && workspaceMemoRelatedSetting.enableMembersEdit;
+  const allowEdit = !props.readonly && memo && (membersCanEdit || memo.creator === currentUser?.name);
 
   // Initial compact mode.
   useEffect(() => {

web/src/components/MemoView.tsx

@@ -52,7 +52,8 @@ const MemoView: React.FC<Props> = (props: Props) => {
     (relation) => relation.type === MemoRelation_Type.COMMENT && relation.relatedMemo === memo.name,
   ).length;
   const relativeTimeFormat = Date.now() - memo.displayTime!.getTime() > 1000 * 60 * 60 * 24 ? "datetime" : "auto";
-  const readonly = memo.creator !== user?.name;
+  const membersCanEdit = memo?.visibility === "PROTECTED" && workspaceMemoRelatedSetting.enableMembersEdit;
+  const readonly = !user || (!membersCanEdit && memo.creator !== user.name);
   const isInMemoDetailPage = location.pathname.startsWith(`/m/${memo.uid}`);
 
   // Initial related data: creator.

web/src/components/Settings/MemoRelatedSettings.tsx

@@ -67,6 +67,13 @@ const MemoRelatedSettings = () => {
           onChange={(event) => updatePartialSetting({ enableDoubleClickEdit: event.target.checked })}
         />
       </div>
+      <div className="w-full flex flex-row justify-between items-center">
+        <span>{t("setting.system-section.enable-members-edit")}</span>
+        <Switch
+          checked={memoRelatedSetting.enableMembersEdit}
+          onChange={(event) => updatePartialSetting({ enableMembersEdit: event.target.checked })}
+        />
+      </div>
       <div className="w-full flex flex-row justify-between items-center">
         <span>Content length limit(Byte)</span>
         <Input

web/src/locales/en.json

@@ -294,6 +294,7 @@
       "enable-double-click-to-edit": "Enable double click to edit",
       "enable-password-login": "Enable password login",
       "enable-password-login-warning": "This will enable password login for all users. Continue only if you want to users to be able to log in using both SSO and password",
+      "enable-members-edit": "Let members edit workspace's memos",
       "max-upload-size": "Maximum upload size (MiB)",
       "max-upload-size-hint": "Recommended value is 32 MiB.",
       "server-name": "Server Name"
@@ -311,4 +312,4 @@
   "timeline": {
     "title": "Timeline"
   }
-}
+}

web/src/locales/fr.json

@@ -295,6 +295,7 @@
       "enable-double-click-to-edit": "Activer le double-clic pour modifier",
       "enable-password-login": "Activer la connexion par mot de passe",
       "enable-password-login-warning": "Ceci activera la connexion par mot de passe pour tous les utilisateurs. Ne continuez que si vous souhaitez que les utilisateurs puissent se connecter à la fois par SSO et par mot de passe",
+      "enable-members-edit": "Permet aux membres de modifier les memos en Accès Membre",
       "max-upload-size": "Taille maximale du téléversement (MiB)",
       "max-upload-size-hint": "La valeur recommandée est 32 MiB.",
       "server-name": "Nom du serveur"
@@ -311,4 +312,4 @@
   "timeline": {
     "title": "Timeline"
   }
-}
+}