Merge branch 'feat/ldap-group-sync' into feat/124385-126902-make-granted-group-ref-dynamic

apps/app/src/features/external-user-group/client/stores/external-user-group.ts

@@ -1,4 +1,4 @@
-import { SWRResponseWithUtils, withUtils } from '@growi/core';
+import { type SWRResponseWithUtils, withUtils } from '@growi/core/dist/swr';
 import useSWR, { SWRResponse } from 'swr';
 import useSWRImmutable from 'swr/immutable';
 

apps/app/src/features/external-user-group/interfaces/external-user-group.ts

@@ -1,6 +1,7 @@
-import { HasObjectId, IUserGroupRelation, Ref } from '@growi/core';
+import type {
+  HasObjectId, IUserGroupRelation, Ref, IUserGroup,
+} from '@growi/core';
 
-import { IUserGroup } from '../../../interfaces/user';
 
 export const ExternalGroupProviderType = { ldap: 'ldap' } as const;
 export type ExternalGroupProviderType = typeof ExternalGroupProviderType[keyof typeof ExternalGroupProviderType];

apps/app/src/features/external-user-group/server/routes/apiv3/external-user-group-relation.ts

@@ -1,4 +1,4 @@
-import { ErrorV3 } from '@growi/core';
+import { ErrorV3 } from '@growi/core/dist/models';
 import { Router, Request } from 'express';
 
 import { IExternalUserGroupRelationHasId } from '~/features/external-user-group/interfaces/external-user-group';

apps/app/src/features/external-user-group/server/routes/apiv3/external-user-group.ts

@@ -1,4 +1,4 @@
-import { ErrorV3 } from '@growi/core';
+import { ErrorV3 } from '@growi/core/dist/models';
 import { Router, Request } from 'express';
 import {
   body, param, query, validationResult,

apps/app/src/features/external-user-group/server/service/external-user-group-sync.ts

@@ -1,4 +1,5 @@
-import { IUserHasId } from '~/interfaces/user';
+import type { IUserHasId } from '@growi/core';
+
 import ExternalAccount from '~/server/models/external-account';
 import { excludeTestIdsFromTargetIds } from '~/server/util/compare-objectId';
 import { batchProcessPromiseAll } from '~/utils/promise';

apps/app/src/stores/user-group.tsx

@@ -1,5 +1,5 @@
-import { SWRResponseWithUtils, withUtils } from '@growi/core';
 import type { IPageHasId, IUserGroupHasId, IUserGroupRelationHasId } from '@growi/core';
+import { type SWRResponseWithUtils, withUtils } from '@growi/core/dist/swr';
 import useSWR, { SWRResponse } from 'swr';
 import useSWRImmutable from 'swr/immutable';