Przeglądaj źródła

move type definition files

kaori 3 lat temu
rodzic
commit
33c4ea642c

+ 1 - 1
packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -12,7 +12,7 @@ import {
   apiv3Get, apiv3Put, apiv3Delete, apiv3Post,
 } from '~/client/util/apiv3-client';
 import { IUserGroup, IUserGroupHasId } from '~/interfaces/user';
-import { SearchTypes, SearchType } from '~/interfaces/user-group-response';
+import { SearchTypes, SearchType } from '~/interfaces/user-group';
 import Xss from '~/services/xss';
 import { useIsAclEnabled } from '~/stores/context';
 import { useUpdateUserGroupConfirmModal } from '~/stores/modal';

+ 1 - 1
packages/app/src/components/Admin/UserGroupDetail/UserGroupUserModal.tsx

@@ -6,7 +6,7 @@ import {
 } from 'reactstrap';
 
 import { IUserGroupHasId } from '~/interfaces/user';
-import { SearchTypes, SearchType } from '~/interfaces/user-group-response';
+import { SearchTypes, SearchType } from '~/interfaces/user-group';
 
 import CheckBoxForSerchUserOption from './CheckBoxForSerchUserOption';
 import RadioButtonForSerchUserOption from './RadioButtonForSerchUserOption';

+ 10 - 8
packages/app/src/interfaces/user-group-response.ts

@@ -1,5 +1,9 @@
+import { HasObjectId, Ref } from '@growi/core';
+
 import { IPageHasId } from './page';
-import { IUserGroupHasId, IUserGroupRelationHasId, IUserGroupRelationHasIdPopulatedUser } from './user';
+import {
+  IUser, IUserGroup, IUserGroupHasId, IUserGroupRelationHasId,
+} from './user';
 
 export type UserGroupResult = {
   userGroup: IUserGroupHasId,
@@ -38,10 +42,8 @@ export type AncestorUserGroupsResult = {
   ancestorUserGroups: IUserGroupHasId[],
 }
 
-export const SearchTypes = {
-  FORWARD: 'forward',
-  PARTIAL: 'partial',
-  BACKWORD: 'backword',
-} as const;
-
-export type SearchType = typeof SearchTypes[keyof typeof SearchTypes];
+export type IUserGroupRelationHasIdPopulatedUser = {
+  relatedGroup: Ref<IUserGroup>,
+  relatedUser: IUser & HasObjectId,
+  createdAt: Date,
+} & HasObjectId;

+ 7 - 0
packages/app/src/interfaces/user-group.ts

@@ -0,0 +1,7 @@
+export const SearchTypes = {
+  FORWARD: 'forward',
+  PARTIAL: 'partial',
+  BACKWORD: 'backword',
+} as const;
+
+export type SearchType = typeof SearchTypes[keyof typeof SearchTypes];