call generateImportSettings

packages/app/src/server/routes/apiv3/g2g-transfer.ts

@@ -197,7 +197,6 @@ module.exports = (crowi: Crowi): Router => {
         // instanciate GrowiArchiveImportOption
         const options = new GrowiArchiveImportOption(null, optionsMap[collectionName]);
 
-        let importSettings;
         // generate options
         if (collectionName === 'configs' && options.mode !== 'flushAndInsert') {
           throw Error('`flushAndInsert` is only available as an import setting for configs collection');
@@ -206,6 +205,8 @@ module.exports = (crowi: Crowi): Router => {
           throw Error('`insert` is not available as an import setting for pages collection');
         }
 
+        const importSettings = importService.generateImportSettings(options.mode);
+
         importSettings.jsonFileName = fileName;
 
         // generate overwrite params

packages/app/src/server/service/g2g-transfer.ts

@@ -92,11 +92,7 @@ export class G2GTransferPusherService implements Pusher {
     let toGROWIInfo: IDataGROWIInfo;
     try {
       const res = await axios.get('/_api/v3/g2g-transfer/growi-info', this.generateAxiosRequestConfig(tk));
-      toGROWIInfo = {
-        userUpperLimit: res.data.userUpperLimit,
-        version: res.data.version,
-        attachmentInfo: res.data.attachmentInfo,
-      };
+      toGROWIInfo = res.data.growiInfo;
     }
     catch (err) {
       logger.error(err);