adjust convert data method

lib/routes/admin.js

@@ -1224,7 +1224,7 @@ module.exports = function(crowi, app) {
     const user = req.user;
     const errors = await importer.importDataFromEsa(user);
 
-    if (errors) {
+    if (errors.length > 0) {
       return res.json({ status: false, message: `<br> - ${errors.join('<br> - ')}` });
     }
     return res.json({ status: true });
@@ -1240,7 +1240,7 @@ module.exports = function(crowi, app) {
     const user = req.user;
     const errors = await importer.importDataFromQiita(user);
 
-    if (errors) {
+    if (errors.length > 0) {
       return res.json({ status: false, message: `<br> - ${errors.join('<br> - ')}` });
     }
     return res.json({ status: true });

lib/util/importer.js

@@ -60,7 +60,7 @@ module.exports = crowi => {
     });
   };
 
-    /**
+  /**
    * Import page data from qiita to GROWI
    */
   importer.importDataFromQiita = user => {
@@ -77,17 +77,12 @@ module.exports = crowi => {
       restQiitaAPI.getQiitaPages()
       .then(function(res) {
         const postsReceived = res;
-        const data = convertEsaDataForGrowi(postsReceived, user);
-
+        const data = convertQiitaDataForGrowi(postsReceived, user);
         createGrowiPages(data)
         .then(function(newErrors) {
           errors.concat(newErrors);
         });
 
-        // if (nextPage) {
-        //   return resolve(importPostsFromQiita(nextPage, user, errors.concat(newErrors)));
-        // }
-
         resolve(errors);
       }).catch(function(err) {
         reject(err);
@@ -102,6 +97,7 @@ module.exports = crowi => {
     const data = pages.map(post => {
       const category = post.category;
       const name = post.name;
+
       let path = '';
 
       if (category && name) {
@@ -130,23 +126,12 @@ module.exports = crowi => {
   const convertQiitaDataForGrowi = (pages, user) => {
     const basePage = '';
     const data = pages.map(post => {
-      const category = post.category;
-      const name = post.name;
-      let path = '';
-
-      if (category && name) {
-        path = `${category}/${name}`;
-      }
-      else if (category) {
-        path = category;
-      }
-      else if (name) {
-        path = name;
-      }
+      const title = post.title;
+      let path = title;
 
       return {
         path: `${basePage}/${path}`,
-        body: post.body_md,
+        body: post.body,
         user: user,
       };
     });

lib/views/admin/importer.html

@@ -54,7 +54,7 @@
             <div class="form-group">
               <label for="settingForm[importer:esa:access_token]" class="col-xs-3 control-label">{{ t('importer_management.esa_settings.access_token') }}</label>
               <div class="col-xs-6">
-                <input class="form-control" type="text" name="settingForm[importer:esa:access_token]" value="{{ settingForm['importer:esa:access_token'] | default('') }}">
+                <input class="form-control" type="password" name="settingForm[importer:esa:access_token]" value="{{ settingForm['importer:esa:access_token'] | default('') }}">
               </div>
             </div>
           </div>
@@ -94,7 +94,7 @@
             <div class="form-group">
               <label for="settingForm[importer:qiita:access_token]" class="col-xs-3 control-label">{{ t('importer_management.qiita_settings.access_token') }}</label>
               <div class="col-xs-6">
-                <input class="form-control" type="text" name="settingForm[importer:qiita:access_token]" value="{{ settingForm['importer:qiita:access_token'] | default('') }}">
+                <input class="form-control" type="password" name="settingForm[importer:qiita:access_token]" value="{{ settingForm['importer:qiita:access_token'] | default('') }}">
               </div>
             </div>
           </div>