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

move IUserGroupRelationHasIdPopulatedUser to user-group-response file

kaori 3 лет назад
Родитель
Сommit
3114b0f538

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

@@ -22,6 +22,12 @@ export type UserGroupRelationListResult = {
   userGroupRelations: IUserGroupRelationHasId[],
 };
 
+export type IUserGroupRelationHasIdPopulatedUser = {
+  relatedGroup: Ref<IUserGroup>,
+  relatedUser: IUser & HasObjectId,
+  createdAt: Date,
+} & HasObjectId;
+
 export type UserGroupRelationsResult = {
   userGroupRelations: IUserGroupRelationHasIdPopulatedUser[],
 };
@@ -41,9 +47,3 @@ export type SelectableUserChildGroupsResult = {
 export type AncestorUserGroupsResult = {
   ancestorUserGroups: IUserGroupHasId[],
 }
-
-export type IUserGroupRelationHasIdPopulatedUser = {
-  relatedGroup: Ref<IUserGroup>,
-  relatedUser: IUser & HasObjectId,
-  createdAt: Date,
-} & HasObjectId;

+ 1 - 1
packages/app/src/interfaces/user.ts

@@ -1,3 +1,3 @@
 export type {
-  IUser, IUserGroupRelation, IUserGroup, IUserHasId, IUserGroupHasId, IUserGroupRelationHasId, IUserGroupRelationHasIdPopulatedUser,
+  IUser, IUserGroupRelation, IUserGroup, IUserHasId, IUserGroupHasId, IUserGroupRelationHasId,
 } from '@growi/core';

+ 2 - 1
packages/app/src/stores/user-group.tsx

@@ -4,8 +4,9 @@ import useSWRImmutable from 'swr/immutable';
 import { apiGet } from '~/client/util/apiv1-client';
 import { apiv3Get } from '~/client/util/apiv3-client';
 import { IPageHasId } from '~/interfaces/page';
-import { IUserGroupHasId, IUserGroupRelationHasId, IUserGroupRelationHasIdPopulatedUser } from '~/interfaces/user';
+import { IUserGroupHasId, IUserGroupRelationHasId } from '~/interfaces/user';
 import {
+  IUserGroupRelationHasIdPopulatedUser,
   UserGroupResult, UserGroupListResult, ChildUserGroupListResult, UserGroupRelationListResult, UserGroupRelationsResult,
   UserGroupPagesResult, SelectableParentUserGroupsResult, SelectableUserChildGroupsResult, AncestorUserGroupsResult,
 } from '~/interfaces/user-group-response';

+ 0 - 7
packages/core/src/interfaces/user.ts

@@ -37,10 +37,3 @@ export type IUserGroup = {
 export type IUserHasId = IUser & HasObjectId;
 export type IUserGroupHasId = IUserGroup & HasObjectId;
 export type IUserGroupRelationHasId = IUserGroupRelation & HasObjectId;
-
-
-export type IUserGroupRelationHasIdPopulatedUser = {
-  relatedGroup: Ref<IUserGroup>,
-  relatedUser: IUser & HasObjectId,
-  createdAt: Date,
-} & HasObjectId;