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

make ImportMode const universal

Yuki Takei 1 год назад
Родитель
Сommit
e573ffb82d

+ 1 - 1
apps/app/src/models/admin/growi-archive-import-option.ts

@@ -1,4 +1,4 @@
-import { ImportMode } from '~/server/service/import';
+import { ImportMode } from './import-mode';
 
 export class GrowiArchiveImportOption {
 

+ 0 - 0
apps/app/src/server/service/import/import-mode.ts → apps/app/src/models/admin/import-mode.ts


+ 1 - 1
apps/app/src/models/admin/import-option-for-pages.ts

@@ -1,4 +1,4 @@
-import { ImportMode } from '~/server/service/import';
+import { ImportMode } from '~/models/admin/import-mode';
 
 import { GrowiArchiveImportOption } from './growi-archive-import-option';
 

+ 1 - 1
apps/app/src/models/admin/import-option-for-revisions.ts

@@ -1,4 +1,4 @@
-import { ImportMode } from '~/server/service/import';
+import { ImportMode } from '~/models/admin/import-mode';
 
 import { GrowiArchiveImportOption } from './growi-archive-import-option';
 

+ 2 - 1
apps/app/src/server/service/g2g-transfer.ts

@@ -11,8 +11,9 @@ import mongoose, { Types as MongooseTypes } from 'mongoose';
 
 import { G2G_PROGRESS_STATUS } from '~/interfaces/g2g-transfer';
 import { GrowiArchiveImportOption } from '~/models/admin/growi-archive-import-option';
+import { ImportMode } from '~/models/admin/import-mode';
 import TransferKeyModel from '~/server/models/transfer-key';
-import { getImportService, ImportMode, type ImportSettings } from '~/server/service/import';
+import { getImportService, type ImportSettings } from '~/server/service/import';
 import { createBatchStream } from '~/server/util/batch-stream';
 import axios from '~/utils/axios';
 import loggerFactory from '~/utils/logger';

+ 2 - 1
apps/app/src/server/service/import/import-settings.ts

@@ -1,4 +1,5 @@
-import type { ImportMode } from './import-mode';
+import type { ImportMode } from '~/models/admin/import-mode';
+
 import type { OverwriteFunction } from './overwrite-function';
 
 export type OverwriteParams = { [propertyName: string]: OverwriteFunction | unknown }

+ 1 - 1
apps/app/src/server/service/import/import.ts

@@ -13,6 +13,7 @@ import mongoose from 'mongoose';
 import streamToPromise from 'stream-to-promise';
 import unzipStream from 'unzip-stream';
 
+import { ImportMode } from '~/models/admin/import-mode';
 import type Crowi from '~/server/crowi';
 import { setupIndependentModels } from '~/server/crowi/setup-models';
 import type CollectionProgress from '~/server/models/vo/collection-progress';
@@ -25,7 +26,6 @@ import { configManager } from '../config-manager';
 import type { ConvertMap } from './construct-convert-map';
 import { constructConvertMap } from './construct-convert-map';
 import { getModelFromCollectionName } from './get-model-from-collection-name';
-import { ImportMode } from './import-mode';
 import type { ImportSettings, OverwriteParams } from './import-settings';
 import { keepOriginal } from './overwrite-function';
 

+ 0 - 2
apps/app/src/server/service/import/index.ts

@@ -18,6 +18,4 @@ export const getImportService = (): ImportService => {
   return instance;
 };
 
-
-export * from './import-mode';
 export * from './import-settings';