From 3d046c4cd8d18bb16a3e89e47f504218afa183b2 Mon Sep 17 00:00:00 2001 From: James Struga Date: Thu, 9 Feb 2023 11:44:37 -0500 Subject: [PATCH 1/6] sync all versions Signed-off-by: James Struga --- .github/workflows/build_test.yml | 6 ++++++ manifest.yaml | 2 +- pluginDefinition.json | 2 +- webClient/package.json | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index a78f4f37..66ea5f23 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -84,3 +84,9 @@ jobs: - name: '[Prep 8] deploy ' uses: zowe-actions/zlux-builds/plugins/deploy-pax@v2.x/main + + - name: '[Prep 9] Bump Staging Version ' + if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }} + uses: zowe-actions/zlux-builds/plugins/bump-version@v2.x/main + env: + GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }} diff --git a/manifest.yaml b/manifest.yaml index c6a312b2..bf8ce3f2 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -2,7 +2,7 @@ name: editor id: org.zowe.editor # Without the v -version: 3.0.0 +version: 2.7.0 # Human readable component name title: Editor # Human readable component description diff --git a/pluginDefinition.json b/pluginDefinition.json index 28f7ddc2..881b6365 100644 --- a/pluginDefinition.json +++ b/pluginDefinition.json @@ -1,7 +1,7 @@ { "identifier": "org.zowe.editor", "apiVersion": "2.0.0", - "pluginVersion": "3.0.1", + "pluginVersion": "2.7.0", "license": "EPL-2.0", "author": "Zowe", "homepage": "https://github.com/zowe/zlux-editor", diff --git a/webClient/package.json b/webClient/package.json index 162a99c5..8ea81e49 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -1,6 +1,6 @@ { "name": "org.zowe.editor.webclient", - "version": "3.0.1", + "version": "2.7.0", "license": "EPL-2.0", "scripts": { "start": "export NODE_OPTIONS=--max_old_space_size=4096 || set NODE_OPTIONS=--max_old_space_size=4096 && webpack --config ./webpack.build.config.js --watch --progress", From 9f0c769370703aefc7c50486851388c24539ff39 Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 10 Feb 2023 11:17:58 -0500 Subject: [PATCH 2/6] change node version Signed-off-by: James Struga --- .github/workflows/build_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 66ea5f23..9561b960 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -54,7 +54,7 @@ jobs: - name: '[Prep 3] Setup Node' uses: actions/setup-node@v2 with: - node-version: 10.24.1 + node-version: 16.15.0 - name: '[Prep 4] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 @@ -69,6 +69,7 @@ jobs: github-email: ${{ secrets.ZOWE_ROBOT_EMAIL }} github-branch: ${{ github.event.inputs.BRANCH_NAME }} release: ${{ github.event.inputs.PERFORM_RELEASE }} + plugin-version: ${{ github.event.inputs.BUILD_VERSION }} - name: '[Prep 6] build' uses: zowe-actions/zlux-builds/plugins/zlux-plugins@v2.x/main From 476a1516d8111bc9eb0bbd7f705781628fc0374f Mon Sep 17 00:00:00 2001 From: James Struga Date: Fri, 10 Feb 2023 12:11:40 -0500 Subject: [PATCH 3/6] add test exit 0 Signed-off-by: James Struga --- webClient/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webClient/package.json b/webClient/package.json index 8ea81e49..c818b6c4 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -5,7 +5,8 @@ "scripts": { "start": "export NODE_OPTIONS=--max_old_space_size=4096 || set NODE_OPTIONS=--max_old_space_size=4096 && webpack --config ./webpack.build.config.js --watch --progress", "build": "export NODE_OPTIONS=--max_old_space_size=4096 || set NODE_OPTIONS=--max_old_space_size=4096 && webpack --config ./webpack.build.config.js --progress && node prune.js", - "lint": "tslint -c tslint.json \"./**/*.ts\"" + "lint": "tslint -c tslint.json \"./**/*.ts\"", + "test": "exit 0" }, "dependencies": { "@angular/cdk": "~6.3.3", From 0342df816b15128bcdd1a7d6ab01a994be65d71a Mon Sep 17 00:00:00 2001 From: Adarshdeep Cheema Date: Thu, 16 Feb 2023 09:17:59 -0500 Subject: [PATCH 4/6] fixing the logic to generate the mode uri Signed-off-by: Adarshdeep Cheema --- webClient/src/app/editor/code-editor/monaco/monaco.service.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webClient/src/app/editor/code-editor/monaco/monaco.service.ts b/webClient/src/app/editor/code-editor/monaco/monaco.service.ts index 6ccaf1a0..e38c0ed7 100644 --- a/webClient/src/app/editor/code-editor/monaco/monaco.service.ts +++ b/webClient/src/app/editor/code-editor/monaco/monaco.service.ts @@ -537,11 +537,10 @@ export class MonacoService implements OnDestroy { } generateUri(editorFile: ProjectStructure): string { - // have to use lowercase here!. This is uniquely identify the Editor Models if(editorFile.isDataset){ return `inmemory://${editorFile.path.toLowerCase()}`; } else{ - return `inmemory://${editorFile.path.toLowerCase()}/${editorFile.name.toLowerCase()}`; + return `inmemory://${editorFile.name.toLowerCase()}/${editorFile.id}`; } } From 315a12ccf0b77142cd060dba488e71556d21a755 Mon Sep 17 00:00:00 2001 From: Adarshdeep Cheema Date: Thu, 16 Feb 2023 09:18:56 -0500 Subject: [PATCH 5/6] fixing the logic to generate the mode uri Signed-off-by: Adarshdeep Cheema --- webClient/src/app/editor/code-editor/monaco/monaco.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webClient/src/app/editor/code-editor/monaco/monaco.service.ts b/webClient/src/app/editor/code-editor/monaco/monaco.service.ts index e38c0ed7..86d61aaf 100644 --- a/webClient/src/app/editor/code-editor/monaco/monaco.service.ts +++ b/webClient/src/app/editor/code-editor/monaco/monaco.service.ts @@ -540,7 +540,7 @@ export class MonacoService implements OnDestroy { if(editorFile.isDataset){ return `inmemory://${editorFile.path.toLowerCase()}`; } else{ - return `inmemory://${editorFile.name.toLowerCase()}/${editorFile.id}`; + return `inmemory://${editorFile.name.toLowerCase()}/${editorFile.id}`; } } From 6514b9dca560823deb569091e00f9fd42042b5dc Mon Sep 17 00:00:00 2001 From: Adarshdeep Cheema Date: Thu, 16 Feb 2023 09:25:16 -0500 Subject: [PATCH 6/6] updating the changelog Signed-off-by: Adarshdeep Cheema --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ae1570b..19da6ccf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Bugfix: Set USS path to correct directory, when opening the directory or file in new browser tab respectively - Added the feature to copy the line content and copy URL link to open a file at a specific line - Bugfix: Getting 400 BAD REQUEST in browser when opening the file or dataset in a new browser tab +- Bugfix: When opening New File, editor keeps on using the earlier opened file and its model ## `3.0.0`