{auto,fibo}/vue.config.js fixes

Signed-off-by: Przemysław Grądzki <przemek.gradzki@gmail.com>
edmcouncil · Apr 8, 2020 · 51d6847 · 51d6847
1 parent 55db3f4
commit 51d6847
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/auto/vue.config.js b/auto/vue.config.js
@@ -1,11 +1,12 @@
-process.env.VUE_APP_TIMESTAMP = '2019Q4.1'
-process.env.VUE_APP_BRANCH    = process.env.product_branch_tag && process.env.product_branch_tag.split('/',3)[1] || 'master'
-process.env.VUE_APP_TAG       = process.env.product_branch_tag && process.env.product_branch_tag.split('/',3)[2] || 'latest'
+process.env.VUE_APP_PRODUCT   = process.env.PRODUCT || process.env.ontology_publisher_current_product || 'htmlpages'
+process.env.VUE_APP_BRANCH    = (process.env.BRANCH || ( process.env.BRANCH_NAME === process.env.TAG_NAME ? 'master' : process.env.BRANCH_NAME || 'master')).toLowerCase()
+process.env.VUE_APP_TAG       = process.env.TAG || process.env.TAG_NAME || 'latest'
+process.env.VUE_APP_TIMESTAMP = process.env.TIMESTAMP || '2020Q1'
 
 module.exports = {
   publicPath: `/${process.env.ONTPUB_FAMILY || 'auto'}/`,
-  assetsDir: process.env.product_branch_tag || 'htmlpages/master/latest',
-  indexPath: `${process.env.product_branch_tag || 'htmlpages/master/latest'}/index.html`,
+  assetsDir: `${process.env.VUE_APP_PRODUCT}/${process.env.VUE_APP_BRANCH}/${process.env.VUE_APP_TAG}`,
+  indexPath: `${process.env.VUE_APP_PRODUCT}/${process.env.VUE_APP_BRANCH}/${process.env.VUE_APP_TAG}/index.html`,
   css: {
     loaderOptions: {
       sass: {

diff --git a/fibo/vue.config.js b/fibo/vue.config.js
@@ -1,5 +1,5 @@
 process.env.VUE_APP_PRODUCT   = process.env.PRODUCT || process.env.ontology_publisher_current_product || 'htmlpages'
-process.env.VUE_APP_BRANCH    = process.env.BRANCH || ( process.env.BRANCH_NAME === process.env.TAG_NAME ? 'master' : process.env.BRANCH_NAME || 'master')
+process.env.VUE_APP_BRANCH    = (process.env.BRANCH || ( process.env.BRANCH_NAME === process.env.TAG_NAME ? 'master' : process.env.BRANCH_NAME || 'master')).toLowerCase()
 process.env.VUE_APP_TAG       = process.env.TAG || process.env.TAG_NAME || 'latest'
 process.env.VUE_APP_TIMESTAMP = process.env.TIMESTAMP || '2020Q1'
 
@@ -18,13 +18,13 @@ module.exports = {
   devServer: {
     proxy: {
       '^/search/json': {
-        target: 'http://172.30.1.116:9000',
+        target: 'https://spec.edmcouncil.org',
       },
       '^/module/json$': {
-        target: 'http://172.30.1.116:9000',
+        target: 'https://spec.edmcouncil.org',
       },
       '^/hint': {
-        target: 'http://172.30.1.116:9000',
+        target: 'https://spec.edmcouncil.org',
       },
     },
   },