From 8508578f9de240c8e9765aebfff3bc67a5a5e448 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Fri, 7 Jan 2022 14:35:38 +0100
Subject: [PATCH] fix csp issues fix favicons added build debug messages
---
angular.json | 7 +++++--
docs/releases/v2.6.2.md | 8 ++++++++
mkdocs.yml | 1 +
package-lock.json | 2 +-
package.json | 2 +-
src/{res => assets}/favicons/favicon-128-dark.svg | 0
src/{res => assets}/favicons/favicon-128-light.png | Bin
src/{res => assets}/favicons/favicon-128-light.svg | 0
src/environments/parseEnv.js | 12 ++++++++++++
src/index.html | 12 ++++--------
src/main-common.ts | 5 -----
src/util/pureConstant.service.ts | 2 +-
third_party/extra_js.js | 2 ++
13 files changed, 35 insertions(+), 18 deletions(-)
create mode 100644 docs/releases/v2.6.2.md
rename src/{res => assets}/favicons/favicon-128-dark.svg (100%)
rename src/{res => assets}/favicons/favicon-128-light.png (100%)
rename src/{res => assets}/favicons/favicon-128-light.svg (100%)
create mode 100644 third_party/extra_js.js
diff --git a/angular.json b/angular.json
index 68b6001b6..7d4fcb6a0 100644
--- a/angular.json
+++ b/angular.json
@@ -29,7 +29,6 @@
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "css",
"assets": [
- "src/favicon.ico",
"src/assets"
],
"styles": [
@@ -60,7 +59,11 @@
"inject": false,
"bundleName": "syntaxError"
},
-
+ {
+ "input": "third_party/extra_js.js",
+ "inject": false,
+ "bundleName": "extra_js"
+ },
{
"input": "third_party/vanilla_nehuba.js",
"inject": false,
diff --git a/docs/releases/v2.6.2.md b/docs/releases/v2.6.2.md
new file mode 100644
index 000000000..c4b6b480d
--- /dev/null
+++ b/docs/releases/v2.6.2.md
@@ -0,0 +1,8 @@
+# v2.6.2
+
+## Under the hood stuff
+
+- fixed some CSP issues
+- fixed favicons
+- added build debug messages
+- increment siibra-api version expectation
diff --git a/mkdocs.yml b/mkdocs.yml
index c241c4687..01b07eb3b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,7 @@ pages:
- Fetching datasets: 'advanced/datasets.md'
- Display non-atlas volumes: 'advanced/otherVolumes.md'
- Release notes:
+ - v2.6.2: 'releases/v2.6.2.md'
- v2.6.1: 'releases/v2.6.1.md'
- v2.6.0: 'releases/v2.6.0.md'
- v2.5.8: 'releases/v2.5.8.md'
diff --git a/package-lock.json b/package-lock.json
index 0d1051032..b2554cd88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "interactive-viewer",
- "version": "2.6.0",
+ "version": "2.6.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index ff98cdb21..70b5d8a08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "interactive-viewer",
- "version": "2.6.1",
+ "version": "2.6.2",
"description": "HBP interactive atlas viewer. Integrating KG query, dataset previews & more. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular",
"scripts": {
"build-aot": "ng build && node ./third_party/matomo/processMatomo.js",
diff --git a/src/res/favicons/favicon-128-dark.svg b/src/assets/favicons/favicon-128-dark.svg
similarity index 100%
rename from src/res/favicons/favicon-128-dark.svg
rename to src/assets/favicons/favicon-128-dark.svg
diff --git a/src/res/favicons/favicon-128-light.png b/src/assets/favicons/favicon-128-light.png
similarity index 100%
rename from src/res/favicons/favicon-128-light.png
rename to src/assets/favicons/favicon-128-light.png
diff --git a/src/res/favicons/favicon-128-light.svg b/src/assets/favicons/favicon-128-light.svg
similarity index 100%
rename from src/res/favicons/favicon-128-light.svg
rename to src/assets/favicons/favicon-128-light.svg
diff --git a/src/environments/parseEnv.js b/src/environments/parseEnv.js
index 84c95658b..dbd985314 100644
--- a/src/environments/parseEnv.js
+++ b/src/environments/parseEnv.js
@@ -16,6 +16,18 @@ const main = async () => {
GIT_HASH = 'unknown hash',
EXPERIMENTAL_FEATURE_FLAG
} = process.env
+
+ console.log(`[parseEnv.js] parse envvar:`, {
+ BACKEND_URL,
+ DATASET_PREVIEW_URL,
+ STRICT_LOCAL,
+ MATOMO_URL,
+ MATOMO_ID,
+ BS_REST_URL,
+ VERSION,
+ GIT_HASH,
+ EXPERIMENTAL_FEATURE_FLAG,
+ })
const version = JSON.stringify(
VERSION || 'unknown version'
)
diff --git a/src/index.html b/src/index.html
index 8fd23a5d9..0928ef9d4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -10,15 +10,11 @@
<link rel="stylesheet" href="icons/iav-icons.css">
<link rel="stylesheet" href="main.css">
<link rel="stylesheet" href="version.css">
- <link rel="icon" type="image/png" href="res/favicons/favicon-128-light.png"/>
- <script>
- // disable zone patching of raf. This hampers NG performance significantly
- window['__Zone_disable_requestAnimationFrame'] = true
- </script>
- <script src="https://unpkg.com/kg-dataset-previewer@1.2.0/dist/kg-dataset-previewer/kg-dataset-previewer.js" defer>
- </script>
+ <link rel="icon" type="image/png" href="assets/favicons/favicon-128-light.png"/>
+ <script src="extra_js.js"></script>
+ <script src="https://unpkg.com/kg-dataset-previewer@1.2.0/dist/kg-dataset-previewer/kg-dataset-previewer.js" defer></script>
<script src="https://unpkg.com/three-surfer@0.0.10/dist/bundle.js" defer></script>
- <script type="module" src="https://unpkg.com/ng-layer-tune@0.0.4/dist/ng-layer-tune/ng-layer-tune.esm.js"></script>
+ <script type="module" src="https://unpkg.com/ng-layer-tune@0.0.5/dist/ng-layer-tune/ng-layer-tune.esm.js"></script>
<title>Interactive Atlas Viewer</title>
</head>
diff --git a/src/main-common.ts b/src/main-common.ts
index c3f3f5ee2..3bfc08878 100644
--- a/src/main-common.ts
+++ b/src/main-common.ts
@@ -20,11 +20,6 @@ import '!!file-loader?context=src/res&name=icons/iav-icons.ttf!src/res/icons/iav
import '!!file-loader?context=src/res&name=icons/iav-icons.woff!src/res/icons/iav-icons.woff'
import '!!file-loader?context=src/res&name=icons/iav-icons.svg!src/res/icons/iav-icons.svg'
-/**
- * favicons
- */
-import '!!file-loader?context=src/res/favicons&name=favicon-128-light.png!src/res/favicons/favicon-128-light.png'
-
/**
* version css
*/
diff --git a/src/util/pureConstant.service.ts b/src/util/pureConstant.service.ts
index 5d69b1401..130ee0d1d 100644
--- a/src/util/pureConstant.service.ts
+++ b/src/util/pureConstant.service.ts
@@ -17,7 +17,7 @@ import { MatSnackBar } from "@angular/material/snack-bar";
import { TTemplateImage } from "./interfaces";
export const SIIBRA_API_VERSION_HEADER_KEY='x-siibra-api-version'
-export const SIIBRA_API_VERSION = '0.1.8'
+export const SIIBRA_API_VERSION = '0.1.9'
const validVolumeType = new Set([
'neuroglancer/precomputed',
diff --git a/third_party/extra_js.js b/third_party/extra_js.js
new file mode 100644
index 000000000..82febd16a
--- /dev/null
+++ b/third_party/extra_js.js
@@ -0,0 +1,2 @@
+// disable zone patching of raf. This hampers NG performance significantly
+window['__Zone_disable_requestAnimationFrame'] = true
\ No newline at end of file
--
GitLab