Просмотр исходного кода

refs 126149: fix UserGroup parent type

Futa Arai 2 лет назад
Родитель
Сommit
0c0338ccb5

+ 1 - 1
apps/app/src/components/Admin/UserGroup/UserGroupModal.tsx

@@ -32,7 +32,7 @@ export const UserGroupModal: FC<Props> = (props: Props) => {
    */
   const [currentName, setName] = useState('');
   const [currentDescription, setDescription] = useState('');
-  const [currentParent, setParent] = useState<Ref<IUserGroup> | null>(null);
+  const [currentParent, setParent] = useState<Ref<IUserGroup> | undefined>();
 
   /*
    * Function

+ 1 - 1
apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx

@@ -107,7 +107,7 @@ export const UserGroupTable: FC<Props> = ({
 
     try {
       await onRemove(userGroup);
-      userGroup.parent = null;
+      userGroup.parent = undefined;
     }
     catch {
       //

+ 1 - 1
apps/app/src/server/service/user-group.ts

@@ -61,7 +61,7 @@ class UserGroupService {
 
     // set parent to null and return when parentId is null
     if (parentId == null) {
-      userGroup.parent = null;
+      userGroup.parent = undefined;
       return userGroup.save();
     }
 

+ 3 - 3
apps/app/test/integration/service/external-user-group-sync.test.ts

@@ -2,9 +2,9 @@ import { IUserHasId } from '@growi/core';
 import mongoose, { Types } from 'mongoose';
 
 import {
-  ExternalGroupProviderType, ExternalUserGroupTreeNode, IExternalUserGroup,
+  ExternalGroupProviderType, ExternalUserGroupTreeNode, IExternalUserGroup, IExternalUserGroupHasId,
 } from '../../../src/features/external-user-group/interfaces/external-user-group';
-import ExternalUserGroup, { ExternalUserGroupDocument } from '../../../src/features/external-user-group/server/models/external-user-group';
+import ExternalUserGroup from '../../../src/features/external-user-group/server/models/external-user-group';
 import ExternalUserGroupRelation from '../../../src/features/external-user-group/server/models/external-user-group-relation';
 import ExternalUserGroupSyncService from '../../../src/features/external-user-group/server/service/external-user-group-sync';
 import ExternalAccount from '../../../src/server/models/external-account';
@@ -79,7 +79,7 @@ class TestExternalUserGroupSyncService extends ExternalUserGroupSyncService {
 
 const testService = new TestExternalUserGroupSyncService();
 
-const checkGroup = (group: ExternalUserGroupDocument, expected: Omit<IExternalUserGroup, 'createdAt'>) => {
+const checkGroup = (group: IExternalUserGroupHasId, expected: Omit<IExternalUserGroup, 'createdAt'>) => {
   const actual = {
     name: group.name,
     parent: group.parent,