CCI-Tools · forman · Mar 8, 2023 · Mar 8, 2023 · Mar 18, 2023 · Mar 20, 2023
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,38 @@
-### Changes 3.1.5 (in development)
-
-
-
+### Changes 4.0.0 (in development)
+
+* Since Cate App is now designed to work inside of Jupyter Lab and standalone,
+  The user login action is no longer required because users already log into 
+  JupyterLab. Therefore, all code dealing with user login and Cate service 
+  provisioning in the cloud has been removed. Other changes include:
+  - Added a new user action to open Cate App in a browser tab available, if
+    Cate App is initially opened in a JupyterLab widget.
+  - Added a new user action to shut down the Cate server 
+    in order to release memory.
+  - Removed the top level **Files** menu, because file management can
+    be effectively done through JupyterLab.
+  - Removed the user action to install Cate App as a Desktop PWA.
+  - Removed proxy configuration from user preferences dialog.
+  - Rephrased filesystem info from "sandboxed / full access" to 
+    "restricted / unrestricted".
+
+* The following changes apply to the "local" data store because the server
+  now serves local files from the current working directory. This has been
+  done to let Cate integrated with Jupyter Lab pick up all datasets found 
+  in the Lab's workspace.
+  - Users can now refresh the list of files from the "local" data store.
+  - Users can no longer add/remove data sources to the "local" data store.
+    This is a temporary change. We may reassign add/remove actions to perform
+    a filtering on the local datasets.
+
+* Now using workspace identifiers instead of base directories in resource
+  URLs of the WebAPI. This way we no longer need to URL-encode workspace
+  directories in WebAPI URLs, which did not work with
+  [jupyter-server-proxy](https://jupyter-server-proxy.readthedocs.io/).
+
+
+* Slightly improved readability of dataset titles generated from identifiers
+  if titles are missing.
+
 ### Changes 3.1.4
 
 * Updated to new keycloak version

diff --git a/README.md b/README.md
@@ -47,7 +47,6 @@ To prepare a Cate App release, follow these steps:
 
 - [ ] `package.json`: Make sure `version` field is higher than the last release
   and compatible with [SemVer](https://semver.org/).
-- [ ] `src/serviceWorker.ts`: Make sure `CATE_PWA_VERSION` constant is the same version.
-- [ ] `src/config.ts`: Make sure `CATE_APP_VERSION` constant is the same version.
+- [ ] `src/version.ts`: Make sure `CATE_APP_VERSION` constant is the same version.
 - [ ] `appveyor.yml`: Make sure `version` label is the same version appended by `-{build}`.
 - [ ] `CHANGES.md`: Make sure latest changes are up-to-date and refer to the same version.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cate-app",
-  "version": "3.1.5-dev.0",
+  "version": "4.0.0-dev.6",
   "private": true,
   "homepage": ".",
   "dependencies": {
@@ -10,7 +10,6 @@
     "@blueprintjs/select": "^3.13.6",
     "@blueprintjs/table": "^3.8.12",
     "@datapunt/matomo-tracker-react": "^0.3.1",
-    "@react-keycloak/web": "^1.0.6",
     "@types/js-cookie": "^2.2.6",
     "cesium": "1.71.0",
     "classnames": "^2.2.6",
@@ -19,17 +18,15 @@
     "deep-equal": "^1.0.1",
     "deep-object-diff": "^1.1.0",
     "js-cookie": "^2.2.1",
-    "keycloak-js": "^8.0.2",
     "normalize.css": "^8.0.1",
-    "react": "^16.13.1",
+    "react": "^16.14.0",
     "react-ace": "^5.9.0",
     "react-addons-css-transition-group": "^15.6.2",
     "react-color": "^2.17.3",
-    "react-dom": "^16.13.1",
+    "react-dom": "^16.14.0",
     "react-dropzone": "^11.0.2",
     "react-markdown": "^6.0.2",
     "react-redux": "^5.1.2",
-    "react-router-dom": "^5.2.0",
     "react-transition-group": "^1.2.1",
     "redux": "^3.7.2",
     "redux-logger": "^3.0.6",
@@ -61,7 +58,6 @@
     "@types/react-dom": "^16.9.0",
     "@types/react-dropzone": "^5.1.0",
     "@types/react-redux": "^5.0.21",
-    "@types/react-router-dom": "^5.1.5",
     "@types/react-test-renderer": "^16.8.1",
     "@types/redux-logger": "^3.0.7",
     "@types/tether": "^1.4.4",

diff --git a/public/index.html b/public/index.html
@@ -12,7 +12,7 @@
 -->
 <head>
     <title>Cate App</title>
-    <base href="/">
+<!--    <base href="/">-->
     <meta charset="utf-8"/>
     <meta name="description" content="User interface for Cate, the ESA CCI Toolbox"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>

diff --git a/src/common/base16codec.spec.ts b/src/common/base16codec.spec.ts
@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import Base16 from './base16codec';
+
+describe('codec', function () {
+    it('works for empty string', function () {
+        expect(Base16.encode("")).to.equal("");
+        expect(Base16.decode("")).to.equal("");
+    });
+
+    it('works for a path string', function () {
+        expect(Base16.encode("/workspaces/bibo")).to.equal(
+            "2F776F726B7370616365732F6269626F"
+        );
+        expect(Base16.decode("2F776F726B7370616365732F6269626F")).to.equal(
+            "/workspaces/bibo"
+        );
+    });
+});
diff --git a/src/common/base16codec.ts b/src/common/base16codec.ts
@@ -0,0 +1,37 @@
+/**
+ * Encodes UTF-8 strings into lowercase hexadecimal representation and
+ * decodes hexadecimal representation into UTF-8.
+ */
+class Base16 {
+    static encode(value: string): string {
+        let result = '';
+        for (let i = 0; i < value.length; i++) {
+            let part = value.codePointAt(i).toString(16);
+            if (part.length === 1) {
+                result += '0' + part;
+            } else if (part.length === 2) {
+                result += part;
+            } else {
+                throw new Error('string value must comprise utf-8 values only');
+            }
+        }
+        return result.toUpperCase();
+    }
+
+    static decode(value: string): string {
+        if (value.length % 2 !== 0) {
+            throw new Error('string value length must be a multiple of two');
+        }
+        let result = '';
+        for (let i = 0; i < value.length; i += 2) {
+            let code = parseInt(value.substr(i, 2), 16);
+            if (Number.isNaN(code)) {
+                throw new Error('string value must comprise hexadecimal values only');
+            }
+            result += String.fromCharCode(code);
+        }
+        return result;
+    }
+}
+
+export default Base16;
diff --git a/src/config.ts b/src/config.ts
diff --git a/src/index.tsx b/src/index.tsx
@@ -1,6 +1,4 @@
 import { main } from './renderer/main';
-import { showToast } from './renderer/toast'
-import * as serviceWorker from './serviceWorker';
 
 import 'normalize.css/normalize.css';
 import '@blueprintjs/core/lib/css/blueprint.css';
@@ -21,31 +19,3 @@ declare global {
 window.CESIUM_BASE_URL = './cesium';
 
 main();
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.register(
-    {
-        onSuccess: () => {
-            showToast({
-                          type: 'notification',
-                          text: 'App is cached for offline use.'
-                      });
-        },
-        onUpdate: () => {
-            showToast({
-                          type: 'notification',
-                          text: 'New app version available. ' +
-                                'It will be used when all tabs for this page are closed.'
-                      });
-        },
-        onError: (error: Error) => {
-            showToast({
-                          type: 'error',
-                          text: 'Error during service worker registration: ' +
-                                error.message
-                      });
-        },
-    }
-);