From 4414fe2d012ef76e407ed1d2de8b7afd5e63d822 Mon Sep 17 00:00:00 2001 From: raiiasingh19 <103555897+raiiasingh19@users.noreply.github.com> Date: Sat, 27 Jan 2024 19:39:52 +0530 Subject: [PATCH] Removes terminal icon (#459) - Removes the terminal icon from workbench page - Updates docker image name of client and bumps up the client version --- .github/workflows/client.yml | 2 +- client/README.md | 2 - client/config/dev.js | 1 - client/config/prod.js | 1 - client/config/test.js | 1 - client/env.d.ts | 1 - client/package.json | 4 +- client/src/components/LinkIconsLib.tsx | 5 - client/test/README.md | 2 - .../unitTests/Components/Linkbuttons.test.tsx | 9 +- client/test/unitTests/Util/envUtil.test.ts | 17 +--- client/yarn.lock | 95 +++++++++++++++++-- deploy/README.md | 1 - deploy/config/client/env.js | 1 - deploy/config/client/env.local.js | 1 - deploy/config/client/env.trial.js | 1 - docs/admin/client/CLIENT.md | 3 - docs/admin/host.md | 1 - 18 files changed, 101 insertions(+), 47 deletions(-) diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml index a2a6a752f..22499c1de 100644 --- a/.github/workflows/client.yml +++ b/.github/workflows/client.yml @@ -76,6 +76,6 @@ jobs: uses: ./.github/workflows/docker.yml with: registry: ghcr.io - image-name: into-cps-association/dtaas-client + image-name: into-cps-association/dtaas-web version: ${{ needs.get_version.outputs.version }} dockerfile: client.dockerfile \ No newline at end of file diff --git a/client/README.md b/client/README.md index d79e1597f..d45ac2f40 100644 --- a/client/README.md +++ b/client/README.md @@ -94,7 +94,6 @@ window.env = { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', @@ -121,7 +120,6 @@ window.env = { REACT_APP_URL_BASENAME: 'au', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/config/dev.js b/client/config/dev.js index a6f2ccc8d..19ba626e8 100644 --- a/client/config/dev.js +++ b/client/config/dev.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: 'dtaas', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/config/prod.js b/client/config/prod.js index 8b9957232..7a0d0e687 100644 --- a/client/config/prod.js +++ b/client/config/prod.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: 'dtaas', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/config/test.js b/client/config/test.js index d241e082a..93d8aa70e 100644 --- a/client/config/test.js +++ b/client/config/test.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/env.d.ts b/client/env.d.ts index 8b77ac590..0a5485157 100644 --- a/client/env.d.ts +++ b/client/env.d.ts @@ -8,7 +8,6 @@ declare global { REACT_APP_URL_BASENAME: string; REACT_APP_URL_DTLINK: string; REACT_APP_URL_LIBLINK: string; - REACT_APP_WORKBENCHLINK_TERMINAL: string; REACT_APP_WORKBENCHLINK_VNCDESKTOP: string; REACT_APP_WORKBENCHLINK_VSCODE: string; REACT_APP_WORKBENCHLINK_JUPYTERLAB: string; diff --git a/client/package.json b/client/package.json index 2852c2a15..7a664a7c2 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@into-cps-association/dtaas-web", - "version": "0.3.1", + "version": "0.3.2", "description": "Web client for Digital Twin as a Service (DTaaS)", "main": "index.tsx", "author": "prasadtalasila (http://prasad.talasila.in/)", @@ -89,7 +89,7 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "playwright": "^1.32.1", - "prettier": "3.1.0", + "prettier": "^3.2.4", "shx": "^0.3.4", "ts-jest": "^29.1.1" }, diff --git a/client/src/components/LinkIconsLib.tsx b/client/src/components/LinkIconsLib.tsx index d6e42df6f..bd93e10e4 100644 --- a/client/src/components/LinkIconsLib.tsx +++ b/client/src/components/LinkIconsLib.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import TerminalOutlinedIcon from '@mui/icons-material/TerminalOutlined'; import DesktopWindowsOutlinedIcon from '@mui/icons-material/DesktopWindowsOutlined'; import CodeOutlinedIcon from '@mui/icons-material/CodeOutlined'; import ScienceOutlinedIcon from '@mui/icons-material/ScienceOutlined'; @@ -11,10 +10,6 @@ type LinkIconsType = { }; const LinkIcons: LinkIconsType = { - TERMINAL: { - icon: , - name: 'Terminal', - }, VNCDESKTOP: { icon: , name: 'Desktop', diff --git a/client/test/README.md b/client/test/README.md index 757a98621..e77f3ec9c 100644 --- a/client/test/README.md +++ b/client/test/README.md @@ -100,7 +100,6 @@ window.env = { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', @@ -142,7 +141,6 @@ window.env = { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/test/unitTests/Components/Linkbuttons.test.tsx b/client/test/unitTests/Components/Linkbuttons.test.tsx index 27952ee2c..8191df336 100644 --- a/client/test/unitTests/Components/Linkbuttons.test.tsx +++ b/client/test/unitTests/Components/Linkbuttons.test.tsx @@ -7,19 +7,18 @@ import userEvent from '@testing-library/user-event'; jest.deepUnmock('components/LinkButtons'); const buttons: KeyLinkPair[] = [ - { key: 'TERMINAL', link: 'https://example.com/terminal' }, { key: 'VNCDESKTOP', link: 'https://example.com/desktop' }, { key: 'NO_ICON', link: 'https://example.com/noicon' }, ]; const getButton = (key: string) => - screen.getByRole('link', { name: `${LinkIcons[key].name ?? key}-btn` }); + screen.getByRole('link', { name: `${LinkIcons[key]?.name ?? key}-btn` }); const getLabel = (key: string) => - screen.getByRole('heading', { level: 6, name: LinkIcons[key].name ?? key }); + screen.getByRole('heading', { level: 6, name: LinkIcons[key]?.name ?? key }); const getButtonIcon = (key: string) => - screen.getByTitle(`${LinkIcons[key].name ?? key}-btn`).children[0]; + screen.getByTitle(`${LinkIcons[key]?.name ?? key}-btn`).children[0]; const evaluateButtonSize = (expectedSize: number) => { buttons.forEach((button) => { @@ -66,7 +65,7 @@ describe('LinkButtons component default size', () => { it('should use name from iconLib as label when avaiable', () => { expect(getLabel(buttons[0].key).textContent).toBe( - LinkIcons[buttons[0].key].name, + LinkIcons[buttons[0].key]?.name, ); }); }); diff --git a/client/test/unitTests/Util/envUtil.test.ts b/client/test/unitTests/Util/envUtil.test.ts index 1c0edf925..883b08af4 100644 --- a/client/test/unitTests/Util/envUtil.test.ts +++ b/client/test/unitTests/Util/envUtil.test.ts @@ -14,13 +14,7 @@ describe('envUtil', () => { const testLIB = ''; const testAppURL = 'https://example.com'; const testBasename = 'testBasename'; - const testWorkbenchEndpoints = [ - 'one', - '/two', - 'three/', - '/four/', - '/five/guy/', - ]; + const testWorkbenchEndpoints = ['one', '/two', 'three/', '/four/postfix']; const testUsername = 'username'; const testAppID = 'testAppID'; const testAuthority = 'https://example.com'; @@ -34,11 +28,10 @@ describe('envUtil', () => { REACT_APP_URL_BASENAME: testBasename, REACT_APP_URL_DTLINK: testDT, REACT_APP_URL_LIBLINK: testLIB, - REACT_APP_WORKBENCHLINK_TERMINAL: testWorkbenchEndpoints[0], - REACT_APP_WORKBENCHLINK_VNCDESKTOP: testWorkbenchEndpoints[1], - REACT_APP_WORKBENCHLINK_VSCODE: testWorkbenchEndpoints[2], - REACT_APP_WORKBENCHLINK_JUPYTERLAB: testWorkbenchEndpoints[3], - REACT_APP_WORKBENCHLINK_JUPYTERNOTEBOOK: testWorkbenchEndpoints[4], + REACT_APP_WORKBENCHLINK_VNCDESKTOP: testWorkbenchEndpoints[0], + REACT_APP_WORKBENCHLINK_VSCODE: testWorkbenchEndpoints[1], + REACT_APP_WORKBENCHLINK_JUPYTERLAB: testWorkbenchEndpoints[2], + REACT_APP_WORKBENCHLINK_JUPYTERNOTEBOOK: testWorkbenchEndpoints[3], REACT_APP_CLIENT_ID: testAppID, REACT_APP_AUTH_AUTHORITY: testAuthority, diff --git a/client/yarn.lock b/client/yarn.lock index 7f2c20586..2b0c412ec 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -4064,6 +4064,16 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concat-stream@^1.4.7: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + confusing-browser-globals@^1.0.10, confusing-browser-globals@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" @@ -4168,6 +4178,15 @@ create-jest@^29.7.0: jest-util "^29.7.0" prompts "^2.0.1" +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A== + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -7670,6 +7689,14 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" +lru-cache@^4.0.1: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -8136,6 +8163,11 @@ optionator@^0.9.3: prelude-ls "^1.2.1" type-check "^0.4.0" +os-shim@^0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" + integrity sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A== + p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -8889,6 +8921,15 @@ postcss@^8.3.5, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.31, postcss@^8.4. picocolors "^1.0.0" source-map-js "^1.0.2" +pre-commit@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/pre-commit/-/pre-commit-1.2.2.tgz#dbcee0ee9de7235e57f79c56d7ce94641a69eec6" + integrity sha512-qokTiqxD6GjODy5ETAIgzsRgnBWWQHQH2ghy86PU7mIn/wuWeTwF3otyNQZxWBwVn8XNr8Tdzj/QfUXpH+gRZA== + dependencies: + cross-spawn "^5.0.1" + spawn-sync "^1.0.15" + which "1.2.x" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -8899,10 +8940,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" - integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== +prettier@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" + integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" @@ -8982,6 +9023,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== + psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" @@ -9269,7 +9315,7 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -readable-stream@^2.0.1: +readable-stream@^2.0.1, readable-stream@^2.2.2: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -9815,6 +9861,13 @@ shallowequal@^1.1.0: resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== + dependencies: + shebang-regex "^1.0.0" + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -9822,6 +9875,11 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== + shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" @@ -9949,6 +10007,14 @@ sourcemap-codec@^1.4.8: resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== +spawn-sync@^1.0.15: + version "1.0.15" + resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" + integrity sha512-9DWBgrgYZzNghseho0JOuh+5fg9u6QWhAWa51QC7+U5rCheZ/j1DrEZnyE0RBBRqZ9uEXGPgSSM0nky6burpVw== + dependencies: + concat-stream "^1.4.7" + os-shim "^0.1.2" + spdy-transport@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" @@ -10622,6 +10688,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== + typescript@^4.9.5: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" @@ -11079,7 +11150,14 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.9: gopd "^1.0.1" has-tostringtag "^1.0.0" -which@^1.3.1: +which@1.2.x: + version "1.2.14" + resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" + integrity sha512-16uPglFkRPzgiUXYMi1Jf8Z5EzN1iB4V0ZtMXcHZnwsBtQhhHeCqoWw7tsUY42hJGNDWtUsVLTjakIa5BgAxCw== + dependencies: + isexe "^2.0.0" + +which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -11345,6 +11423,11 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== + yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" diff --git a/deploy/README.md b/deploy/README.md index 6e01aec7b..0d925dd91 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -126,7 +126,6 @@ window.env = { REACT_APP_URL_BASENAME: 'dtaas', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/deploy/config/client/env.js b/deploy/config/client/env.js index cd60bf7a3..80d775d0c 100644 --- a/deploy/config/client/env.js +++ b/deploy/config/client/env.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/deploy/config/client/env.local.js b/deploy/config/client/env.local.js index 70c324760..9a9fc669b 100644 --- a/deploy/config/client/env.local.js +++ b/deploy/config/client/env.local.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/deploy/config/client/env.trial.js b/deploy/config/client/env.trial.js index a359a63d7..8b8f64c5a 100644 --- a/deploy/config/client/env.trial.js +++ b/deploy/config/client/env.trial.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/docs/admin/client/CLIENT.md b/docs/admin/client/CLIENT.md index efb224024..392e0f8b4 100644 --- a/docs/admin/client/CLIENT.md +++ b/docs/admin/client/CLIENT.md @@ -33,7 +33,6 @@ To host DTaaS client website on your server, follow these steps: REACT_APP_URL_BASENAME: "Base URL for the client website"(optional), REACT_APP_URL_DTLINK: "Endpoint for the Digital Twin", REACT_APP_URL_LIBLINK: "Endpoint for the Library Assets", - REACT_APP_WORKBENCHLINK_TERMINAL: "Endpoint for the terminal link", REACT_APP_WORKBENCHLINK_VNCDESKTOP: "Endpoint for the VNC Desktop link", REACT_APP_WORKBENCHLINK_VSCODE: "Endpoint for the VS Code link", REACT_APP_WORKBENCHLINK_JUPYTERLAB: "Endpoint for the Jupyter Lab link", @@ -55,7 +54,6 @@ To host DTaaS client website on your server, follow these steps: REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', @@ -78,7 +76,6 @@ To host DTaaS client website on your server, follow these steps: REACT_APP_URL_BASENAME: 'bar', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/docs/admin/host.md b/docs/admin/host.md index e4b323d9b..64b3031a0 100644 --- a/docs/admin/host.md +++ b/docs/admin/host.md @@ -138,7 +138,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: 'dtaas', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab',