Przeglądaj źródła

fix mutateGrant args

kaori 3 lat temu
rodzic
commit
b71bdef495

+ 4 - 14
packages/app/src/components/SavePageControls.tsx

@@ -1,9 +1,6 @@
 import React from 'react';
 import React from 'react';
 
 
-import EventEmitter from 'events';
-
 import { pagePathUtils } from '@growi/core';
 import { pagePathUtils } from '@growi/core';
-import { NullableBoolean } from 'aws-sdk/clients/synthetics';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 import {
 import {
   UncontrolledButtonDropdown, Button,
   UncontrolledButtonDropdown, Button,
@@ -20,6 +17,7 @@ import { usePageTagsForEditors, useIsEnabledUnsavedWarning } from '~/stores/edit
 import { useSWRxCurrentPage } from '~/stores/page';
 import { useSWRxCurrentPage } from '~/stores/page';
 import { useSelectedGrant } from '~/stores/ui';
 import { useSelectedGrant } from '~/stores/ui';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
+import { IPageGrantData } from '~/interfaces/page';
 
 
 import GrantSelector from './SavePageControls/GrantSelector';
 import GrantSelector from './SavePageControls/GrantSelector';
 
 
@@ -31,13 +29,8 @@ type Props = {
   // pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
   // pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
 
 
   // TODO: remove this when omitting unstated is completed
   // TODO: remove this when omitting unstated is completed
-  // editorMode?: string,
   isSlackEnabled: boolean,
   isSlackEnabled: boolean,
   slackChannels: string,
   slackChannels: string,
-  // mutateGrant?: () => void,
-  // mutateGrantGroupId?: () => void,
-  // mutateGrantGroupName:() => void,
-  // mutateIsEnabledUnsavedWarning?: () => void,
 }
 }
 
 
 const { isTopPage } = pagePathUtils;
 const { isTopPage } = pagePathUtils;
@@ -66,14 +59,11 @@ export const SavePageControls = (props: Props): JSX.Element | null => {
 
 
   const {
   const {
     isSlackEnabled, slackChannels,
     isSlackEnabled, slackChannels,
-    // pageContainer, mutateGrantGroupId, mutateGrantGroupName,
+    // pageContainer,
   } = props;
   } = props;
 
 
-  const updateGrantHandler = (data): void => {
-    console.log({ data });
-    mutateGrant(data.grant);
-    // mutateGrantGroupId(data.grantGroupId);
-    // mutateGrantGroupName(data.grantGroupName);
+  const updateGrantHandler = (grantData: IPageGrantData): void => {
+    mutateGrant(grantData);
   };
   };
 
 
   const save = async(): Promise<void> => {
   const save = async(): Promise<void> => {

+ 4 - 1
packages/app/src/components/SavePageControls/GrantSelector.tsx

@@ -50,6 +50,8 @@ const GrantSelector = (props: Props): JSX.Element => {
     disabled,
     disabled,
     grantGroupName,
     grantGroupName,
     onUpdateGrant,
     onUpdateGrant,
+    grant: currentGrant,
+    grantGroupId
   } = props;
   } = props;
 
 
 
 
@@ -93,7 +95,8 @@ const GrantSelector = (props: Props): JSX.Element => {
    * Render grant selector DOM.
    * Render grant selector DOM.
    */
    */
   const renderGrantSelector = useCallback(() => {
   const renderGrantSelector = useCallback(() => {
-    const { grant: currentGrant, grantGroupId } = props;
+    // const { grant: currentGrant, grantGroupId } = props;
+    console.log({currentGrant});
 
 
     let dropdownToggleBtnColor;
     let dropdownToggleBtnColor;
     let dropdownToggleLabelElm;
     let dropdownToggleLabelElm;