From 6c916e01fde260bd122a9947c3073c47044574a1 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 13:26:22 +0530 Subject: [PATCH 01/11] updatingi8n Signed-off-by: RamkrishnaRocket1 --- CHANGELOG.md | 8 ++++++++ webClient/angular.json | 12 +++++++++--- webClient/package.json | 4 ++-- webClient/webpack.config.js | 3 ++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbb30be..7acd236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to the sample angular app will be documented in this file. +## 3.1.0 + +- Enhancement: i18n support aligned with Zowe v3 Desktop (zlux-app-manager PR #684). +- Bumped angular-l10n from 16.0.0 to ~17.0.1 to match Desktop runtime and resolve Angular 18 peer dependency conflict. +- Fixed @zlux/widgets webpack alias to point to ESM (.mjs) bundle for correct module resolution. +- Added Angular locale asset copying in angular.json for locale file availability. +- Enabled detailed source maps (scripts, styles, vendor) for improved debugging. + ## 3.0.0 - AI DISCLAIMER: This upgrade was performed with Claude Opus 4.6. diff --git a/webClient/angular.json b/webClient/angular.json index 777465d..ebb1027 100644 --- a/webClient/angular.json +++ b/webClient/angular.json @@ -17,18 +17,24 @@ "tsConfig": "src/tsconfig.app.json", "assets": [ "src/assets", - "src/favicon.ico" + "src/favicon.ico", + { + "glob": "**/*", + "input": "node_modules/@angular/common/locales", + "output": "locales" + } ], "styles": [ "src/styles.css" ], - "scripts": [] + "scripts": [], + "sourceMap": { "scripts": true, "styles": true, "vendor": true } }, "configurations": { "production": { "optimization": true, "outputHashing": "all", - "sourceMap": false, + "sourceMap": { "scripts": true, "styles": true, "vendor": true }, "namedChunks": false, "extractLicenses": true, "vendorChunk": false, diff --git a/webClient/package.json b/webClient/package.json index 39e0120..c64d50c 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -1,6 +1,6 @@ { "name": "org.zowe.zlux.sample.angular.webclient", - "version": "3.0.0", + "version": "3.0.1", "scripts": { "start": "webpack --progress --watch", "build": "webpack --progress", @@ -24,7 +24,7 @@ "@angular/router": "~18.2.14", "@ngtools/webpack": "^18.2.14", "@zlux/widgets": "github:zowe/zlux-widgets#v3.x/master", - "angular-l10n": "16.0.0", + "angular-l10n": "~17.0.1", "codelyzer": "~6.0.2", "compression-webpack-plugin": "~11.0.0", "copy-webpack-plugin": "~11.0.0", diff --git a/webClient/webpack.config.js b/webClient/webpack.config.js index 51f58df..5c3debe 100644 --- a/webClient/webpack.config.js +++ b/webClient/webpack.config.js @@ -31,7 +31,8 @@ var config = { }, resolve: { alias: { - 'zlux-widgets': path.resolve(__dirname, 'node_modules/@zlux/widgets') + '@zlux/widgets': path.resolve(__dirname, 'node_modules/@zlux/widgets/dist/zlux-widgets/fesm2022/zlux-widgets.mjs'), + 'zlux-widgets': path.resolve(__dirname, 'node_modules/@zlux/widgets/dist/zlux-widgets/fesm2022/zlux-widgets.mjs') } }, plugins: [ From d2f042be2a0c1aa8ef503f59ff49921a4f5801f9 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 13:37:06 +0530 Subject: [PATCH 02/11] Update package-lock.json for angular-l10n ~17.0.1 Signed-off-by: RamkrishnaRocket1 --- webClient/package-lock.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/webClient/package-lock.json b/webClient/package-lock.json index 2cd44c4..5b19b53 100644 --- a/webClient/package-lock.json +++ b/webClient/package-lock.json @@ -1,12 +1,12 @@ { "name": "org.zowe.zlux.sample.angular.webclient", - "version": "3.0.0", + "version": "3.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "org.zowe.zlux.sample.angular.webclient", - "version": "3.0.0", + "version": "3.0.1", "devDependencies": { "@angular-devkit/build-angular": "~18.2.14", "@angular/animations": "~18.2.14", @@ -22,7 +22,7 @@ "@angular/router": "~18.2.14", "@ngtools/webpack": "^18.2.14", "@zlux/widgets": "github:zowe/zlux-widgets#v3.x/master", - "angular-l10n": "16.0.0", + "angular-l10n": "~17.0.1", "codelyzer": "~6.0.2", "compression-webpack-plugin": "~11.0.0", "copy-webpack-plugin": "~11.0.0", @@ -4140,17 +4140,19 @@ } }, "node_modules/angular-l10n": { - "version": "16.0.0", + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/angular-l10n/-/angular-l10n-17.0.1.tgz", + "integrity": "sha512-boAovRJ/CStkrHgw0WkrSYmvxijJvoKodo84jf+e9zYSfsSS4AoEi7M3ZP/UI6bApb66viORdcYJ1MdiGjymlA==", "dev": true, "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">= 16.0.0", - "@angular/core": ">= 16.0.0", - "@angular/forms": ">= 16.0.0", - "@angular/router": ">= 16.0.0" + "@angular/common": ">= 17.0.0", + "@angular/core": ">= 17.0.0", + "@angular/forms": ">= 17.0.0", + "@angular/router": ">= 17.0.0" } }, "node_modules/ansi-colors": { From 709fbf5d2d73e6442bb111e88a3cd54d18e77ec3 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 13:54:54 +0530 Subject: [PATCH 03/11] Update app.component.css Signed-off-by: RamkrishnaRocket1 --- webClient/src/app/app.component.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webClient/src/app/app.component.css b/webClient/src/app/app.component.css index e4a16be..612e4a9 100644 --- a/webClient/src/app/app.component.css +++ b/webClient/src/app/app.component.css @@ -130,7 +130,9 @@ h1 { .test-storage .row { display: flex; - height: 1.8rem; + align-items: center; + min-height: 2rem; + column-gap: 0.4rem; } .test-storage .row span{ @@ -139,7 +141,8 @@ h1 { margin: 0.2rem 0; } -.test-storage .row input,select { +.test-storage .row input, +.test-storage .row select { flex: 1 1 auto; } From c67a1221847508069f9feceae5e1c420cc7429b0 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 16:18:08 +0530 Subject: [PATCH 04/11] Update webpack.config.js Signed-off-by: RamkrishnaRocket1 --- webClient/webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webClient/webpack.config.js b/webClient/webpack.config.js index 5c3debe..d5410e8 100644 --- a/webClient/webpack.config.js +++ b/webClient/webpack.config.js @@ -50,7 +50,8 @@ var config = { }), new AngularWebpackPlugin({ tsConfigPath: './tsconfig.json', - entryModule: './src/app/app.module.ts#AppModule' + entryModule: './src/app/app.module.ts#AppModule', + jitMode: true }) ] }; From 88f27e18355a522fcf0002a4416fa0c9654979a3 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 16:24:12 +0530 Subject: [PATCH 05/11] Update webpack.config.js Signed-off-by: RamkrishnaRocket1 --- webClient/webpack.config.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webClient/webpack.config.js b/webClient/webpack.config.js index d5410e8..5c3debe 100644 --- a/webClient/webpack.config.js +++ b/webClient/webpack.config.js @@ -50,8 +50,7 @@ var config = { }), new AngularWebpackPlugin({ tsConfigPath: './tsconfig.json', - entryModule: './src/app/app.module.ts#AppModule', - jitMode: true + entryModule: './src/app/app.module.ts#AppModule' }) ] }; From 671a4c3360ce6d0b5097358389fb857febcd5218 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 16:47:05 +0530 Subject: [PATCH 06/11] Update app.component.css Signed-off-by: RamkrishnaRocket1 --- webClient/src/app/app.component.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webClient/src/app/app.component.css b/webClient/src/app/app.component.css index 612e4a9..7424d2f 100644 --- a/webClient/src/app/app.component.css +++ b/webClient/src/app/app.component.css @@ -128,21 +128,21 @@ h1 { margin: 2px 2px; } -.test-storage .row { +.test-storage .storage-row { display: flex; align-items: center; min-height: 2rem; column-gap: 0.4rem; } -.test-storage .row span{ +.test-storage .storage-row span { width: 4rem; flex: 0 0 auto; margin: 0.2rem 0; } -.test-storage .row input, -.test-storage .row select { +.test-storage .storage-row input, +.test-storage .storage-row select { flex: 1 1 auto; } From a006325d496680feb37b1377358ea2ffd065d61d Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 14 Apr 2026 16:47:30 +0530 Subject: [PATCH 07/11] Update app.component.html Signed-off-by: RamkrishnaRocket1 --- webClient/src/app/app.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webClient/src/app/app.component.html b/webClient/src/app/app.component.html index 6eaeba0..d9c6f6c 100644 --- a/webClient/src/app/app.component.html +++ b/webClient/src/app/app.component.html @@ -83,14 +83,14 @@
Storage Test
-
+
Server
-
+
Storage
-
+
Key
-
+
Value
Status: {{storageStatus}}
From bb1f59ac65911bebd093feffc54294c6a221abdc Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Wed, 15 Apr 2026 15:11:10 +0530 Subject: [PATCH 08/11] Update CHANGELOG.md Signed-off-by: RamkrishnaRocket1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7acd236..8d9fbb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the sample angular app will be documented in this file. -## 3.1.0 +## 3.0.1 - Enhancement: i18n support aligned with Zowe v3 Desktop (zlux-app-manager PR #684). - Bumped angular-l10n from 16.0.0 to ~17.0.1 to match Desktop runtime and resolve Angular 18 peer dependency conflict. From ab7ac63a9129fb5bbecf5fbbd58298a9fc123120 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Wed, 15 Apr 2026 15:11:44 +0530 Subject: [PATCH 09/11] Update CHANGELOG.md Signed-off-by: RamkrishnaRocket1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9fbb7..2f53bc3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the sample angular app will be documented in this file. ## 3.0.1 -- Enhancement: i18n support aligned with Zowe v3 Desktop (zlux-app-manager PR #684). +- Enhancement: i18n support aligned with Zowe v3 Desktop (zlux-app-manager PR #709). - Bumped angular-l10n from 16.0.0 to ~17.0.1 to match Desktop runtime and resolve Angular 18 peer dependency conflict. - Fixed @zlux/widgets webpack alias to point to ESM (.mjs) bundle for correct module resolution. - Added Angular locale asset copying in angular.json for locale file availability. From 3a35309ba93d871c1e70fcffddab6e1f0d366fa6 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 21 Apr 2026 16:49:36 +0530 Subject: [PATCH 10/11] Update app.component.css Signed-off-by: RamkrishnaRocket1 --- webClient/src/app/app.component.css | 1 - 1 file changed, 1 deletion(-) diff --git a/webClient/src/app/app.component.css b/webClient/src/app/app.component.css index 7424d2f..9f63f13 100644 --- a/webClient/src/app/app.component.css +++ b/webClient/src/app/app.component.css @@ -132,7 +132,6 @@ h1 { display: flex; align-items: center; min-height: 2rem; - column-gap: 0.4rem; } .test-storage .storage-row span { From 5e5172311b00344458385f8790f40a2d5f7cdfc2 Mon Sep 17 00:00:00 2001 From: RamkrishnaRocket1 Date: Tue, 21 Apr 2026 20:25:18 +0530 Subject: [PATCH 11/11] Update app.component.css Signed-off-by: RamkrishnaRocket1 --- webClient/src/app/app.component.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webClient/src/app/app.component.css b/webClient/src/app/app.component.css index 9f63f13..3fb3f72 100644 --- a/webClient/src/app/app.component.css +++ b/webClient/src/app/app.component.css @@ -143,6 +143,12 @@ h1 { .test-storage .storage-row input, .test-storage .storage-row select { flex: 1 1 auto; + height: 2rem; + padding: 0.2rem 0.4rem; + border: 1px solid #ccc; + border-radius: 4px; + font-size: inherit; + box-sizing: border-box; } .test-storage .controls {