#416 bulk curation

app/src/assets/css/modules/_utility.scss

@@ -294,7 +294,7 @@
             font-size: 3rem;
         }
         @include respond(phone){
-            top: -10px;
+            top: -10px !important;
             font-size: 2.3rem;
         }
         &_subtitle {
@@ -477,6 +477,14 @@
         background-color: rgba($primary-black, 0.7) !important;
         border: 1px solid $primary !important;
     }
+    &_icon_mobile { 
+        &_lg {
+            @include respond(phone){
+                height: 72px;
+                font-size: 72px!important;
+            }
+        }
+    }
 }
 
 .dialog-box {

app/src/components/TextEditor.vue

@@ -43,6 +43,7 @@ export default {
       document.execCommand('italic')
     },
     applyHeading () {
+      if (document.queryCommandValue('formatBlock') === 'h1') { return document.execCommand('formatBlock', false, 'div') }
       document.execCommand('formatBlock', false, '<h1>')
     },
     applyUl () {

app/src/components/nanomine/PageHeader.vue

@@ -87,7 +87,7 @@
                                     <router-link to="/nm/tools/simtools" class="nav_menu--siblings-lists"><a>Simulation Tools</a></router-link>
                                     <router-link to="/nm/tools/chemprops" class="nav_menu--siblings-lists"><a>ChemProps</a></router-link>
                                     <router-link to="/nm/tools/plot-curation" class="nav_menu--siblings-lists"><a>Easy CSV Plotter</a></router-link>
-                                    <router-link to="" @click.native="loadApiDocs" class="nav_menu--siblings-lists"><a>Api Docs</a></router-link>
+                                    <a href="/api/api-docs/" class="nav_menu--siblings-lists"><a>Api Docs</a></a>
                                 </div>
                             </div>
                         </li>
@@ -122,12 +122,6 @@ export default {
       isAuth: 'auth/isAuthenticated',
       displayName: 'auth/displayName'
     })
-  },
-  methods: {
-    loadApiDocs () {
-      const url = `${location.origin}/api/api-docs/`
-      return window.location.assign(url)
-    }
   }
 }
 </script>

app/src/pages/explorer/xml/XmlLoader.vue

@@ -9,7 +9,7 @@
       </md-drawer>
 
       <md-content class="u_width--max md-app-side-drawer md-app-container md-scrollbar" >
-        <div>
+        <div :class="[isSmallTabView ? 'u_margin-top-med' : '']">
           <h2 class="visualize_header-h1 u_margin-top-med u_centralize_text"> {{ optionalChaining(() => xmlViewer.title) }} </h2>
         </div>
         <!-- xml viewer  -->
@@ -22,14 +22,23 @@
         </div>
 
       </md-content>
-      <md-button @click="approveCuration" v-if="isAuth && isAdmin" class="md-fab md-fixed md-dense md-fab-bottom-right md-primary btn--primary u--margin-rightlg">
-        <md-tooltip md-direction="top">Approve</md-tooltip>
-          <md-icon>check</md-icon>
-      </md-button>
-      <md-button @click="showSidepanel = true" class="md-fab md-fixed md-dense md-fab-bottom-right md-primary btn--primary">
-        <md-tooltip md-direction="top">Comment</md-tooltip>
-          <md-icon>comment</md-icon>
-      </md-button>
+      <div :class="[isSmallTabView ? 'u_margin-top-small u_adjust-banner-text' : 'u--margin-neg','md-fab md-fab-top-right u_width--max u--shadow-none u--layout-flex u--layout-flex-justify-end u--b-rad']">
+        <md-button class="md-fab md-dense md-primary btn--primary" @click.native.prevent="navBack">
+          <md-tooltip> Go Back </md-tooltip>
+          <md-icon>arrow_back</md-icon>
+        </md-button>
+
+        <md-button @click="showSidepanel = true" class="md-fab md-dense md-primary btn--primary">
+          <md-tooltip md-direction="top">Comment</md-tooltip>
+            <md-icon>comment</md-icon>
+        </md-button>
+
+        <md-button @click="approveCuration" v-if="isAuth && isAdmin" class="md-fab md-dense md-primary btn--primary ">
+          <md-tooltip md-direction="top">Approve</md-tooltip>
+            <md-icon>check</md-icon>
+        </md-button>
+
+      </div>
     </section>
 
     <section class="section_loader u--margin-toplg" v-else-if="$apollo.loading">
@@ -69,14 +78,20 @@ export default {
     ...mapGetters({
       isAuth: 'auth/isAuthenticated',
       isAdmin: 'auth/isAdmin'
-    })
+    }),
+    isSmallTabView () {
+      return screen.width < 760
+    }
   },
   methods: {
     approveCuration () {
       this.$store.commit('setSnackbar', {
         message: 'Something went wrong',
         action: () => this.approveCuration()
       })
+    },
+    navBack () {
+      this.$router.back()
     }
   },
   mounted () {

app/src/pages/portal/curation/ViewCuration.vue

@@ -27,8 +27,7 @@
             <md-card-media-cover md-solid>
               <div class="u_gridicon">
                 <div>
-                  <md-tooltip md-direction="left">Last updated</md-tooltip>
-                  <p class="u--color-primary u_margin-none u--padding-zero u_content__result"> {{ new Date().toLocaleDateString() }}</p>
+                  <p class="u--color-primary u_margin-none u--padding-zero u_content__result"><strong>Last updated: </strong>{{ new Date().toLocaleDateString() }}</p>
                 </div>
 
               </div>
@@ -37,12 +36,12 @@
                   <div class="viz-u-postion__rel u--layout-flex md-layout u_centralize_content u_width--max">
                     <template v-if="xml.samples > 8">
                       <div v-for="n in 8" :key="n" class="u_margin-top-small md-layout-item md-size-25 viz-u-postion__rel CodeMirror">
-                        <md-icon class="u--color-primary media-icon-mod viz-u-postion__rel md-small-size-3x ">description</md-icon>
+                        <md-icon class="u--color-primary media-icon-mod viz-u-postion__rel u_icon_mobile_lg ">description</md-icon>
                       </div>
                     </template>
                     <template v-else>
                       <div v-for="n in xml.samples" :key="n" class="u_margin-top-small md-layout-item md-size-25 viz-u-postion__rel CodeMirror">
-                        <md-icon class="u--color-primary media-icon-mod viz-u-postion__rel md-small-size-3x">description</md-icon>
+                        <md-icon class="u--color-primary media-icon-mod viz-u-postion__rel u_icon_mobile_lg">description</md-icon>
                       </div>
                     </template>
                   </div>

resfulservice/config/constant.js

@@ -26,5 +26,6 @@ module.exports = {
     'CHARACTERIZATION METHODS': 'CHARACTERIZATION',
     MICROSTRUCTURE: 'MICROSTRUCTURE'
   },
-  ContactPagePurposeOpt: ['QUESTION', 'TICKET', 'SUGGESTION', 'COMMENT']
+  ContactPagePurposeOpt: ['QUESTION', 'TICKET', 'SUGGESTION', 'COMMENT'],
+  SupportedFileTypes: ['png', 'jpg', 'jpeg', 'tiff', 'tif', 'csv', 'zip', 'xls', 'xlsx']
 };

resfulservice/package.json

@@ -17,6 +17,7 @@
         "axios": "^0.26.1",
         "bcryptjs": "^2.4.3",
         "csv-parser": "^3.0.0",
+        "decompress": "^4.2.1",
         "express": "^4.17.1",
         "express-validator": "^6.14.0",
         "graphql": "^15.3.0",

resfulservice/spec/controllers/adminController.spec.js

@@ -2,7 +2,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const DatasetProperty = require('../../src/models/datasetProperty');
 const { getDatasetProperties } = require('../../src/controllers/adminController');
-
+const { next } = require('../mocks');
 const { expect } = chai;
 
 const mockDatasetProperties =  [
@@ -53,9 +53,6 @@ describe('Admin Controllers Unit Tests:', function() {
 
   context('getDatasetProperties', () => {
     it('should return a 400 error if no search query params', async function() {
-      const next = function (fn) {
-        return fn;
-      };
       sinon.stub(res, 'status').returnsThis();
       sinon.stub(res, 'json').returnsThis();
       const result = await getDatasetProperties(req, res, next);
@@ -66,9 +63,6 @@ describe('Admin Controllers Unit Tests:', function() {
 
     it('should return a list of filtered dataset properties', async function() {
       req.query = { search: 'Loss' }
-      const next = function (fn) {
-        return fn;
-      };
       sinon.stub(res, 'status').returnsThis();
       sinon.stub(res, 'json').returns({data: mockDatasetProperties});
       sinon.stub(DatasetProperty, 'find').returns(fetchedDatasetProperties)
@@ -79,9 +73,7 @@ describe('Admin Controllers Unit Tests:', function() {
 
     it.skip('should return a 500 server error', async function() {
       req.query = { search: 'Loss' }
-      const next = function (fn) {
-        return fn;
-      };
+
       sinon.stub(res, 'status').returnsThis();
       sinon.stub(res, 'json').returns({message: 'Server Error'});
       sinon.stub(DatasetProperty, 'find').throws('Error connecting to database');