@abi-software/flatmapvuer 0.2.3-fixes-1 → 0.2.4-beta-0

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.2.3",
+  "version": "0.2.3-fixes-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2869,6 +2869,53 @@
         }
       }
     },
+    "base64-inline-loader": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/base64-inline-loader/-/base64-inline-loader-2.0.1.tgz",
+      "integrity": "sha512-PW2f2Xl2PDB+0ny7H81Ucxh3L0IcZVqbWdKrCf52OJhphy4lgv4G1KOLmhxRGwK9qVtPqqcEwvnemqOOFRSjOw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.32"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "mime-db": {
+          "version": "1.49.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+          "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.32",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+          "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.49.0"
+          }
+        }
+      }
+    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.2.3-fixes-1",
+  "version": "0.2.4-beta-0",
   "main": "./dist/flatmapvuer.common.js",
   "files": [
     "dist/*",
@@ -32,6 +32,7 @@
     "@vue/cli-service": "^4.5.13",
     "babel-eslint": "^10.0.3",
     "babel-plugin-component": "^1.1.1",
+    "base64-inline-loader": "^2.0.1",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "node-sass": "^4.14.1",

package/src/App.vue

@@ -83,7 +83,7 @@ export default {
       displayCloseButton: false,
       initial: "Rat",
       helpMode: false,
-      flatmapAPI: "https://mapcore-demo.org/devel/flatmap/v1/"
+      flatmapAPI: "https://mapcore-demo.org/fccb/flatmap/"
     }
   },
   mounted: function() {

package/src/components/FlatmapVuer.vue

@@ -211,6 +211,7 @@
         ref="tooltip"
         class="tooltip"
         :content="tooltipContent"
+        :flatmapAPI="flatmapAPI"
         @resource-selected="resourceSelected"
       />
     </div>
@@ -352,10 +353,8 @@ export default {
           eventType: eventType
         };
         // Disable the nueron pop up for now.
-        /*
         if (feature && feature.type !== "marker")
           this.checkAndCreatePopups(data);
-          */
         this.$emit("resource-selected", data);
       };
     },
@@ -635,7 +634,7 @@ export default {
     },
     warningMessage: {
       type: String,
-      default: "Beta feature - under active development"
+      default: "Beta feature - This map is based on the connectivity of a rat. New connectivity and species specificity will be added as the SPARC program progress."
     },
     /**
      * State containing state of the flatmap.

package/src/components/PubmedViewer.vue

@@ -43,6 +43,13 @@ export default {
       type: String,
       default: ''
     },
+    /**
+     * Specify the endpoint of the flatmap server.
+     */
+    flatmapAPI: {
+      type: String,
+      default: "https://mapcore-demo.org/flatmaps/"
+    }
   },
   watch: {
     'featureId': function (val){
@@ -85,8 +92,9 @@ export default {
     flatmapQuery: function(identifier){
       this.pubmeds = []
       this.loading.response = true
+      let endpoint = this.flatmapAPI + 'knowledge/query/';
       const data = { sql: 'select publication from publications where entity=?', "params": [identifier]};
-      fetch('https://mapcore-demo.org/devel/flatmap/v1/knowledge/query/', {
+      fetch(endpoint, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',

package/src/components/Tooltip.vue

@@ -9,7 +9,7 @@
       </div>
       
 
-      <pubmed-viewer v-if="content.featureId" class="block" :featureId="content.featureId" @pubmedSearchUrl="pubmedSearchUrlUpdate"/>
+      <pubmed-viewer v-if="content.featureId" class="block" :flatmapAPI=flatmapAPI :featureId="content.featureId" @pubmedSearchUrl="pubmedSearchUrlUpdate"/>
       <div v-if="content.components" class="block">
         <div class="attribute-title">Components</div>
         <span class="attribute-content">{{content.components}}</span>
@@ -71,6 +71,13 @@ export default {
     content: {
       type: Object,
       default: undefined
+    },
+        /**
+     * Specify the endpoint of the flatmap server.
+     */
+    flatmapAPI: {
+      type: String,
+      default: "https://mapcore-demo.org/flatmaps/"
     }
   },
   data: function() {
@@ -104,7 +111,6 @@ export default {
 @import "~element-ui/packages/theme-chalk/src/button";
 @import "~element-ui/packages/theme-chalk/src/container";
 @import "~element-ui/packages/theme-chalk/src/header";
-@import "~element-ui/packages/theme-chalk/src/icon";
 @import "~element-ui/packages/theme-chalk/src/main";
 
 .tooltip-container {

package/vue.config.js

@@ -6,6 +6,20 @@ module.exports = {
       config.externals = [nodeExternals({}) ];
     }
   },
+  chainWebpack: config => {
+    const fontsRule = config.module.rule('fonts')
+    fontsRule.uses.clear()
+    config.module
+      .rule('fonts')
+      .test(/\.(ttf|otf|eot|woff|woff2)$/)
+      .use('base64-inline-loader')
+      .loader('base64-inline-loader')
+      .tap(options => {
+        // modify the options...    
+        return options
+      })
+      .end()
+  },
   css: {
     //Import variables into all stylesheets.
     loaderOptions: {