#393: Added style and text setup for errors.

qcif · Mar 28, 2018 · a0f1ec1 · a0f1ec1
1 parent 5625d93
commit a0f1ec1
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git a/src/renderer/components/Home.vue b/src/renderer/components/Home.vue
@@ -99,7 +99,7 @@
                     </li>
                     <component is="tooltipOpenErrorsWindow" />
                     <li>
-                      <a href="#" v-tooltip.top="tooltip('tooltip-write-errors-provenance')">
+                      <a href="#" v-tooltip.top="tooltip('tooltip-write-errors-provenance')" @click="writeErrorsToProvenance()">
                         <object data="static/img/validation-results.svg" type="image/svg+xml" />
                         <!-- <span class="btn-default fas fa-file-alt"  /> -->
                       </a>
@@ -367,7 +367,8 @@ export default {
       'resetColumnPropertiesToObject',
       'pushTableProperty',
       'pushPackageProperty',
-      'pushHotSelection'
+      'pushHotSelection',
+      'pushProvenanceErrors'
     ]),
     saveHotPanelDimensions: function() {
       this.widthInner1 = document.querySelector('.ht_master .wtHolder').offsetWidth
@@ -869,6 +870,11 @@ export default {
       if (selection) {
         hot.selectCell(selection[0], selection[1], selection[2], selection[3])
       }
+    },
+    writeErrorsToProvenance: function() {
+      this.pushProvenanceErrors(this.messages)
+      this.updateToolbarMenu(3)
+      document.querySelector('#provenance-errors').focus()
     }
   },
   components: {

diff --git a/src/renderer/partials/ProvenanceProperties.vue b/src/renderer/partials/ProvenanceProperties.vue
@@ -20,7 +20,7 @@
       </template>
       <template v-else>
         <textarea v-model="provenance" :placeholder="placeholder" rows="25" cols="55" class="form-control input-sm col-sm-9" id="provenance-description" />
-        <textarea v-model="provenanceErrors" rows="10" cols="55" class="form-control input-sm col-sm-9" id="provenance-errors" />
+        <textarea readonly="readonly" v-model="provenanceErrors" rows="10" cols="55" class="form-control input-sm col-sm-9" id="provenance-errors" />
       </template>
     </div>
   </div>
@@ -35,6 +35,7 @@ import {
   mapState,
   mapGetters
 } from 'vuex'
+import os from 'os'
 export default {
   extends: SideNav,
   name: 'provenance',
@@ -63,9 +64,26 @@ export default {
     togglePreview: function() {
       this.isPreview = !this.isPreview
     },
+    resetProvenanceErrors: function() {
+      this.provenanceErrors = ''
+    },
     addErrorsToProvenance: function() {
-      // this.pushProvenanceErrors(errors)
-      this.provenanceErrors = this.getProvenance.errors
+      this.resetProvenanceErrors()
+      this.provenanceErrors = this.compileErrors()
+    },
+    compileErrors: function() {
+      let compiled = _.template(`### Known Data Errors
+
+This data is published with the following data errors:
+
+<%= errorsList %>`
+      )
+      return compiled({ 'errorsList': this.errorsListToString() })
+    },
+    errorsListToString: function() {
+      return _.map(this.getProvenance.errors, function(error) {
+        return `${error.message}${os.EOL}`
+      })
     }
   },
   watch: {
@@ -75,6 +93,8 @@ export default {
   },
   mounted: function() {
     this.provenance = this.getProvenance.markdown
+    this.addErrorsToProvenance()
+    document.querySelector('#provenance-errors').focus()
   },
   data() {
     return {

diff --git a/src/renderer/rxSubject.js b/src/renderer/rxSubject.js
@@ -9,7 +9,7 @@ let allTablesAllColumnsFromSchema$ = new Subject()
 let activeTab$ = new Subject()
 let hotIdFromTab$ = new Subject()
 let allTabsTitles$ = new Subject()
-let selectedForeignTable$ = new Subject()
+// let selectedForeignTable$ = new Subject()
 // let getSelectedLocalKeys$ = new Subject()
 
 export function onNextHotIdFromTabRx(asyncFunction) {
@@ -34,6 +34,5 @@ export {
   activeTab$,
   allTablesAllColumnNames$,
   allTablesAllColumnsFromSchema$,
-  allTabsTitles$,
-  selectedForeignTable$
+  allTabsTitles$
 }
diff --git a/static/css/provenanceprops.styl b/static/css/provenanceprops.styl
@@ -1,9 +1,12 @@
 #provenanceProperties
   #provenance-description
-  #provenance-errors
     background-color #fff
     width 100%
     border 1px solid #ccc
+  #provenance-errors
+    @extend #provenanceProperties #provenance-description
+    cursor not-allowed
+
   #provenance-preview
   #provenance-errors-preview
     @extend #provenanceProperties #provenance-description