Jelajahi Sumber

132486 able to change tags

soumaeda 2 tahun lalu
induk
melakukan
ac26d61118

+ 2 - 2
apps/app/src/components/PageControls/PageControls.tsx

@@ -42,7 +42,7 @@ type TagsProps = {
 }
 
 const Tags = (props: TagsProps): JSX.Element => {
-  const { pageId } = props;
+  const { pageId, revisionId } = props;
 
   const { data: tagsInfoData } = useSWRxTagsInfo(pageId);
 
@@ -58,7 +58,7 @@ const Tags = (props: TagsProps): JSX.Element => {
     <div className="grw-taglabels-container d-flex align-items-center">
       <a
         className="btn btn-link btn-edit-tags text-muted border border-secondary p-1 d-flex align-items-center"
-        onClick={() => openTagEditModal(tagsInfoData?.tags)}
+        onClick={() => openTagEditModal(tagsInfoData?.tags, pageId, revisionId)}
       >
         <i className="icon-tag me-2" />
         Tags

+ 1 - 0
apps/app/src/components/PageSideContents/PageSideContents.tsx

@@ -62,6 +62,7 @@ const Tags = (props: TagsProps): JSX.Element => {
             tags={tagsInfoData.tags}
             isTagLabelsDisabled={isTagLabelsDisabled ?? false}
             pageId={pageId}
+            revisionId={revisionId}
           />
         )
         : <PageTagsSkeleton />

+ 3 - 1
apps/app/src/components/PageTags/PageTags.tsx

@@ -12,6 +12,7 @@ type Props = {
   isTagLabelsDisabled: boolean,
   tagsUpdateInvoked?: (tags: string[]) => Promise<void> | void,
   pageId: string,
+  revisionId,
 }
 
 export const PageTagsSkeleton = (): JSX.Element => {
@@ -20,7 +21,7 @@ export const PageTagsSkeleton = (): JSX.Element => {
 
 export const PageTags:FC<Props> = (props: Props) => {
   const {
-    tags, isTagLabelsDisabled, pageId,
+    tags, isTagLabelsDisabled, pageId, revisionId,
   } = props;
 
   if (tags == null) {
@@ -34,6 +35,7 @@ export const PageTags:FC<Props> = (props: Props) => {
           tags={tags}
           isTagLabelsDisabled={isTagLabelsDisabled}
           pageId={pageId}
+          revisionId={revisionId}
         />
       </div>
     </>

+ 3 - 2
apps/app/src/components/PageTags/RenderTagLabels.tsx

@@ -13,11 +13,12 @@ type RenderTagLabelsProps = {
   tags: string[],
   isTagLabelsDisabled: boolean,
   pageId: string,
+  revisionId: string,
 }
 
 const RenderTagLabels = React.memo((props: RenderTagLabelsProps) => {
   const {
-    tags, isTagLabelsDisabled, pageId,
+    tags, isTagLabelsDisabled, pageId, revisionId,
   } = props;
   const { t } = useTranslation();
 
@@ -48,7 +49,7 @@ const RenderTagLabels = React.memo((props: RenderTagLabelsProps) => {
                 ${isTagsEmpty && 'no-tags'}
                 ${isTagLabelsDisabled && 'disabled'}`
               }
-              onClick={() => openTagEditModal(tagsInfoData?.tags)}
+              onClick={() => openTagEditModal(tagsInfoData?.tags, pageId, revisionId)}
             >
               {isTagsEmpty && <> {t('Add tags for this page')}</>}
               <i className={`icon-plus ${isTagsEmpty && 'ms-1'}`} />

+ 4 - 2
apps/app/src/stores/modal.tsx

@@ -785,7 +785,7 @@ type TagEditModalStatus = {
 }
 
 type TagEditModalUtils = {
-  open(tags): Promise<void>
+  open(tags, pageId, revisionId): Promise<void>
   close(): Promise<void>,
 }
 
@@ -801,10 +801,12 @@ export const useTagEditModal = (): SWRResponse<TagEditModalStatus, Error> & TagE
   const swrResponse = useStaticSWR<TagEditModalStatus, Error>('TagEditModal', undefined, { fallbackData: initialStatus });
   const { mutate } = swrResponse;
 
-  const open = async(tags) => {
+  const open = async(tags, pageId, revisionId) => {
     mutate({
       isOpen: true,
       tags,
+      pageId,
+      revisionId,
     });
   };