From f11a7fc8a35864145e73f41c7e453bff9fe40c1c Mon Sep 17 00:00:00 2001 From: Claudia Bressi Date: Fri, 17 Dec 2021 11:58:36 +0100 Subject: [PATCH] Add Translate Add NgxTranslate, NgxTranslateTesting Create english bundle file Update all components for translation Update unit tests Add language setting (optional) Resolves #701 --- ui/package-lock.json | 158 +-- ui/package.json | 7 +- ui/src/app/about/about.module.ts | 8 +- ui/src/app/about/info/info.component.html | 181 ++- ui/src/app/about/info/info.component.spec.ts | 15 +- ui/src/app/about/info/info.component.ts | 9 +- .../about/signpost/signpost.component.html | 32 +- .../about/signpost/signpost.component.spec.ts | 15 +- ui/src/app/about/user/user.component.html | 4 +- ui/src/app/about/user/user.component.spec.ts | 9 +- ui/src/app/app.component.html | 8 +- ui/src/app/app.component.spec.ts | 5 +- ui/src/app/app.component.ts | 8 +- ui/src/app/app.module.ts | 20 +- ui/src/app/apps/add/add.compoment.spec.ts | 3 + ui/src/app/apps/add/add.component.html | 10 +- .../app/apps/add/props/props.component.html | 32 +- .../apps/add/props/props.component.spec.ts | 3 + ui/src/app/apps/add/props/props.component.ts | 41 +- .../apps/add/register/register.component.html | 55 +- .../add/register/register.component.spec.ts | 5 +- .../apps/add/register/register.component.ts | 40 +- ui/src/app/apps/add/uri/uri.component.html | 29 +- ui/src/app/apps/add/uri/uri.component.spec.ts | 7 +- ui/src/app/apps/add/uri/uri.component.ts | 35 +- .../website-starters.component.html | 36 +- .../website-starters.component.spec.ts | 3 + .../website-starters.component.ts | 35 +- ui/src/app/apps/app/app.component.html | 58 +- ui/src/app/apps/app/app.component.spec.ts | 10 +- ui/src/app/apps/app/app.component.ts | 11 +- ui/src/app/apps/apps.component.html | 48 +- ui/src/app/apps/apps.component.spec.ts | 10 +- ui/src/app/apps/apps.component.ts | 2 +- ui/src/app/apps/apps.module.ts | 4 +- .../apps/unregister/unregister.component.html | 36 +- .../unregister/unregister.component.spec.ts | 10 +- .../apps/unregister/unregister.component.ts | 21 +- .../app/apps/version/version.component.html | 33 +- .../apps/version/version.component.spec.ts | 10 +- ui/src/app/apps/version/version.component.ts | 28 +- ui/src/app/flo/shared-flo.module.ts | 11 +- .../graph-view/graph-view.component.spec.ts | 3 + .../properties-groups-dialog.component.html | 10 +- .../properties/df.property.component.html | 6 +- .../properties-dialog.component.html | 12 +- .../properties.group.component.html | 2 +- ui/src/app/flo/stream-flo.module.ts | 2 + .../stream/component/create-component.spec.ts | 3 + .../flo/stream/component/create.component.ts | 12 +- .../stream/component/view.component.spec.ts | 8 +- .../flo/stream/component/view.component.ts | 8 +- .../instance-dot/instance-dot.component.html | 2 +- .../stream-properties-dialog.component.ts | 19 +- ui/src/app/flo/task-flo.module.ts | 2 + .../task/component/create.component.spec.ts | 10 +- .../flo/task/component/create.component.ts | 12 +- .../flo/task/component/view.component.spec.ts | 13 + ui/src/app/layout/layout.module.ts | 11 +- ui/src/app/layout/logo/logo.component.ts | 2 +- ui/src/app/layout/nav/nav.component.html | 36 +- ui/src/app/manage/manage.module.ts | 4 +- .../app/manage/records/action.filter.spec.ts | 9 +- ui/src/app/manage/records/action.filter.ts | 2 +- .../manage/records/operation.filter.spec.ts | 9 +- ui/src/app/manage/records/operation.filter.ts | 2 +- .../app/manage/records/records.component.html | 61 +- .../manage/records/records.component.spec.ts | 10 +- .../tools/cleanup/cleanup.component.html | 19 +- .../tools/cleanup/cleanup.component.spec.ts | 10 +- .../manage/tools/cleanup/cleanup.component.ts | 20 +- .../tools/stream/export.component.spec.ts | 11 +- .../manage/tools/stream/export.component.ts | 33 +- .../tools/stream/import.component.spec.ts | 10 +- .../manage/tools/stream/import.component.ts | 54 +- .../tools/task/export.component.spec.ts | 10 +- .../app/manage/tools/task/export.component.ts | 33 +- .../tools/task/import.component.spec.ts | 10 +- .../app/manage/tools/task/import.component.ts | 54 +- ui/src/app/manage/tools/tools.component.html | 36 +- .../app/manage/tools/tools.component.spec.ts | 10 +- .../authentication-required.component.spec.ts | 10 +- .../authentication-required.component.ts | 4 +- .../feature-disabled.component.spec.ts | 10 +- .../component/feature-disabled.component.ts | 4 +- .../component/roles-missing.component.spec.ts | 10 +- .../component/roles-missing.component.ts | 4 +- ui/src/app/security/security.module.ts | 2 + ui/src/app/settings/settings.module.ts | 2 + ui/src/app/settings/settings.service.ts | 28 +- .../settings/settings/settings.component.html | 30 +- .../settings/settings.component.spec.ts | 3 + .../settings/settings/settings.component.ts | 9 +- .../settings/store/settings.effect.spec.ts | 10 +- ui/src/app/settings/store/settings.effect.ts | 25 +- .../settings/store/settings.reducer.spec.ts | 15 +- ui/src/app/settings/store/settings.reducer.ts | 8 +- .../component/confirm/confirm.component.html | 4 +- .../component/confirm/confirm.component.ts | 11 +- .../key-value/key-value.component.spec.ts | 4 +- .../key-value/key-value.component.ts | 14 +- .../component/search/search.component.html | 12 +- .../component/search/search.component.spec.ts | 3 + .../component/search/search.component.ts | 10 +- .../shared/filter/date/date.filter.spec.ts | 9 +- ui/src/app/shared/filter/date/date.filter.ts | 4 +- ui/src/app/shared/shared.module.ts | 2 + .../runtime/details/details.component.html | 22 +- .../runtime/details/details.component.spec.ts | 10 +- .../streams/runtime/runtime.component.html | 32 +- .../streams/runtime/runtime.component.spec.ts | 10 +- ui/src/app/streams/streams.module.ts | 4 +- .../streams/clone/clone.component.html | 38 +- .../streams/clone/clone.component.spec.ts | 8 +- .../streams/streams/clone/clone.component.ts | 26 +- .../streams/create/create.component.html | 51 +- .../streams/create/create.component.spec.ts | 4 +- .../streams/create/create.component.ts | 133 +- .../deploy/builder/builder.component.html | 105 +- .../deploy/builder/builder.component.spec.ts | 3 + .../deploy/builder/builder.component.ts | 19 +- .../streams/deploy/deploy.component.html | 28 +- .../streams/deploy/deploy.component.ts | 33 +- .../deploy/free-text/free-text.component.html | 25 +- .../free-text/free-text.component.spec.ts | 3 + .../deploy/free-text/free-text.component.ts | 8 +- .../deploy/stream-deploy.component.spec.ts | 12 +- .../streams/destroy/destroy.component.html | 24 +- .../streams/destroy/destroy.component.spec.ts | 10 +- .../streams/destroy/destroy.component.ts | 24 +- .../multi-deploy/multi-deploy.component.html | 39 +- .../multi-deploy.component.spec.ts | 3 + .../multi-deploy/multi-deploy.component.ts | 18 +- .../streams/rollback/rollback.component.html | 15 +- .../rollback/rollback.component.spec.ts | 10 +- .../streams/rollback/rollback.component.ts | 13 +- .../streams/status/status.component.spec.ts | 10 +- .../streams/status/status.component.ts | 52 +- .../streams/stream/stream.component.html | 105 +- .../streams/stream/stream.component.spec.ts | 10 +- .../streams/stream/stream.component.ts | 6 +- .../streams/streams/streams.component.html | 73 +- .../streams/streams/streams.component.spec.ts | 11 +- .../streams/undeploy/undeploy.component.html | 24 +- .../undeploy/undeploy.component.spec.ts | 10 +- .../streams/undeploy/undeploy.component.ts | 24 +- .../executions/cleanup/cleanup.component.html | 31 +- .../cleanup/cleanup.component.spec.ts | 10 +- .../executions/cleanup/cleanup.component.ts | 16 +- .../execution/execution.component.html | 82 +- .../execution/execution.component.spec.ts | 10 +- .../execution/execution.component.ts | 9 +- .../executions/execution/log/log.component.ts | 6 +- .../executions/executions.component.html | 57 +- .../executions/executions.component.spec.ts | 11 +- .../executions/stop/stop.component.html | 18 +- .../executions/stop/stop.component.spec.ts | 10 +- .../executions/stop/stop.component.ts | 15 +- .../jobs/execution/execution.component.html | 167 ++- .../execution/execution.component.spec.ts | 10 +- .../jobs/execution/execution.component.ts | 22 +- .../app/tasks-jobs/jobs/jobs.component.html | 67 +- .../tasks-jobs/jobs/jobs.component.spec.ts | 10 +- ui/src/app/tasks-jobs/jobs/jobs.component.ts | 22 +- .../tasks-jobs/jobs/step/step.component.html | 216 ++-- .../jobs/step/step.component.spec.ts | 10 +- .../tasks-jobs/jobs/step/step.component.ts | 21 +- .../schedules/create/create.component.html | 68 +- .../schedules/create/create.component.spec.ts | 10 +- .../schedules/create/create.component.ts | 25 +- .../schedules/destroy/destroy.component.html | 32 +- .../destroy/destroy.component.spec.ts | 10 +- .../schedules/destroy/destroy.component.ts | 16 +- .../schedule/schedule.component.html | 40 +- .../schedule/schedule.component.spec.ts | 10 +- .../schedules/schedule/schedule.component.ts | 6 +- .../schedules/schedules.component.html | 42 +- .../schedules/schedules.component.spec.ts | 11 +- .../schedules/schedules.component.ts | 6 +- ui/src/app/tasks-jobs/tasks-jobs.module.ts | 2 + .../tasks/cleanup/cleanup.component.html | 22 +- .../tasks/cleanup/cleanup.component.spec.ts | 10 +- .../tasks/cleanup/cleanup.component.ts | 22 +- .../tasks/clone/clone.component.html | 34 +- .../tasks/clone/clone.component.spec.ts | 3 + .../tasks-jobs/tasks/clone/clone.component.ts | 26 +- .../tasks/create/create.component.html | 58 +- .../tasks/create/create.component.spec.ts | 3 + .../tasks/create/create.component.ts | 35 +- .../tasks/destroy/destroy.component.html | 30 +- .../tasks/destroy/destroy.component.spec.ts | 16 +- .../tasks/destroy/destroy.component.ts | 26 +- .../launch/builder/builder.component.html | 108 +- .../launch/builder/builder.component.spec.ts | 3 + .../tasks/launch/builder/builder.component.ts | 23 +- .../builder/errors/errors.component.spec.ts | 3 + .../launch/free-text/free-text.component.html | 32 +- .../free-text/free-text.component.spec.ts | 3 + .../tasks/launch/launch.component.html | 21 +- .../tasks/launch/launch.component.spec.ts | 10 +- .../tasks/launch/launch.component.ts | 44 +- .../tasks-jobs/tasks/task/task.component.html | 113 +- .../tasks/task/task.component.spec.ts | 3 + .../tasks-jobs/tasks/task/task.component.ts | 10 +- .../app/tasks-jobs/tasks/tasks.component.html | 63 +- .../tasks-jobs/tasks/tasks.component.spec.ts | 11 +- ui/src/assets/i18n/en.json | 1100 +++++++++++++++++ ui/tsconfig.json | 11 +- 208 files changed, 4197 insertions(+), 1731 deletions(-) create mode 100644 ui/src/assets/i18n/en.json diff --git a/ui/package-lock.json b/ui/package-lock.json index f136803c2..dd6330900 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -34,23 +34,6 @@ "requires": { "@angular-devkit/core": "13.0.2", "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } } }, "@angular-devkit/build-angular": { @@ -152,23 +135,6 @@ "esbuild-windows-arm64": "0.13.12" } }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -185,23 +151,6 @@ "requires": { "@angular-devkit/architect": "0.1300.2", "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } } }, "@angular-devkit/core": { @@ -216,23 +165,6 @@ "magic-string": "0.25.7", "rxjs": "6.6.7", "source-map": "0.7.3" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } } }, "@angular-devkit/schematics": { @@ -246,23 +178,6 @@ "magic-string": "0.25.7", "ora": "5.4.1", "rxjs": "6.6.7" - }, - "dependencies": { - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } } }, "@angular-eslint/builder": { @@ -1923,7 +1838,7 @@ "@compodoc/ngd-transformer": "^2.0.0-alpha.4", "cheerio": "^1.0.0-rc.2", "chokidar": "^1.7.0", - "colors": "1.4.0", + "colors": "^1.1.2", "commander": "2.11.0", "findit": "^2.0.0", "fs-extra": "^4.0.2", @@ -1989,7 +1904,8 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true }, "commander": { "version": "2.11.0", @@ -2639,6 +2555,36 @@ "integrity": "sha512-eCtPydszVvKtkvL4HeDMvWC3IqTF/xZF6CTumMweRNInc6mTZiwwLwLDk8pg3xVp3ttZUOwV17BUnEs4/Q4qMA==", "dev": true }, + "@ngx-translate/core": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-14.0.0.tgz", + "integrity": "sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==", + "requires": { + "tslib": "^2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, + "@ngx-translate/http-loader": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-7.0.0.tgz", + "integrity": "sha512-j+NpXXlcGVdyUNyY/qsJrqqeAdJdizCd+GKh3usXExSqy1aE9866jlAIL+xrfDU4w+LiMoma5pgE4emvFebZmA==", + "requires": { + "tslib": "^2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -4665,12 +4611,6 @@ "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -8311,7 +8251,8 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true } } }, @@ -8520,7 +8461,7 @@ "body-parser": "^1.19.0", "braces": "^3.0.2", "chokidar": "^3.5.1", - "colors": "1.4.0", + "colors": "^1.4.0", "connect": "^3.7.0", "di": "^0.0.1", "dom-serialize": "^2.2.1", @@ -8545,7 +8486,8 @@ "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true }, "connect": { "version": "3.7.0", @@ -8748,13 +8690,14 @@ "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=", "dev": true, "requires": { - "colors": "1.4.0" + "colors": "^1.1.2" }, "dependencies": { "colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", + "dev": true } } }, @@ -8894,7 +8837,7 @@ "integrity": "sha1-pp8ObKWB4DkapXlBlw4XwwjdSGk=", "dev": true, "requires": { - "colors": "1.4.0", + "colors": "^1.4.0", "connect": "3.4.x", "cors": "^2.8.5", "event-stream": "^4.0.1", @@ -9779,6 +9722,15 @@ "tslib": "^2.0.0" } }, + "ngx-translate-testing": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ngx-translate-testing/-/ngx-translate-testing-6.0.1.tgz", + "integrity": "sha512-LI3jOUxGLjnD4OD9DwmmafJ5OyPQJlUbTl6AJKYMYV2EClwmZ3m+V03/mZIO5VRQBIT9fwgNhHmJW1vw7ITpdg==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13974,9 +13926,9 @@ } }, "rxjs": { - "version": "6.6.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", - "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "requires": { "tslib": "^1.9.0" }, @@ -16391,4 +16343,4 @@ } } } -} \ No newline at end of file +} diff --git a/ui/package.json b/ui/package.json index 056926292..34c89475d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -24,7 +24,7 @@ "private": true, "dependencies": { "@angular/animations": "13.0.1", - "@angular/cdk": "^13.0.1", + "@angular/cdk": "13.0.1", "@angular/common": "13.0.1", "@angular/compiler": "13.0.1", "@angular/core": "13.0.1", @@ -39,6 +39,8 @@ "@ngrx/effects": "12.4.0", "@ngrx/router-store": "12.4.0", "@ngrx/store": "12.4.0", + "@ngx-translate/core": "14.0.0", + "@ngx-translate/http-loader": "7.0.0", "@webcomponents/webcomponentsjs": "2.5.0", "angular-2-local-storage": "3.0.2", "file-saver": "2.0.5", @@ -88,7 +90,7 @@ "karma": "6.3.4", "karma-browserstack-launcher": "1.5.1", "karma-chrome-launcher": "3.1.0", - "karma-coverage": "^2.0.3", + "karma-coverage": "2.0.3", "karma-edge-launcher": "0.4.2", "karma-firefox-launcher": "1.3.0", "karma-jasmine": "3.3.1", @@ -96,6 +98,7 @@ "karma-safari-launcher": "1.0.0", "karma-sauce-launcher": "2.0.2", "karma-spec-reporter": "0.0.32", + "ngx-translate-testing": "6.0.1", "prettier": "2.3.0", "pretty-quick": "3.1.0", "protractor": "7.0.0", diff --git a/ui/src/app/about/about.module.ts b/ui/src/app/about/about.module.ts index 87f511efd..07d79325b 100644 --- a/ui/src/app/about/about.module.ts +++ b/ui/src/app/about/about.module.ts @@ -6,10 +6,16 @@ import {SignpostComponent} from './signpost/signpost.component'; import {UserComponent} from './user/user.component'; import {StoreModule} from '@ngrx/store'; import * as fromAbout from '../shared/store/about.reducer'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [InfoComponent, SignpostComponent, UserComponent], - imports: [CommonModule, ClarityModule, StoreModule.forFeature(fromAbout.aboutFeatureKey, fromAbout.reducer)], + imports: [ + CommonModule, + ClarityModule, + StoreModule.forFeature(fromAbout.aboutFeatureKey, fromAbout.reducer), + TranslateModule + ], exports: [SignpostComponent, UserComponent] }) export class AboutModule {} diff --git a/ui/src/app/about/info/info.component.html b/ui/src/app/about/info/info.component.html index 39e47bab9..4c85caaa0 100644 --- a/ui/src/app/about/info/info.component.html +++ b/ui/src/app/about/info/info.component.html @@ -1,51 +1,61 @@ -

About Spring Cloud Data Flow

+

{{ 'about.info.title' | translate }}

-

Data Flow Server Implementation

+

{{ 'about.info.serverImpTitle' | translate }}

    -
  • Name: {{ about.versions.implementation.name || 'n/a' }}
    • -
  • Version: {{ about.versions.implementation.version || 'n/a' }}
    • +
  • + {{ 'about.info.name' | translate }}: {{ about.versions.implementation.name || 'n/a' }} +
    • +
  • + {{ 'about.info.version' | translate }}: {{ about.versions.implementation.version || 'n/a' }} +
-

Features

+

{{ 'about.info.features' | translate }}

  • - Streams: + {{ 'about.info.streams' | translate }}:
  • - Tasks: + {{ 'about.info.tasks' | translate }}:
  • - Schedules: + {{ 'about.info.schedules' | translate }}:
  • - Monitoring Dashboard: - Grafana - Wavefront + {{ 'about.info.monitoring' | translate }}: + {{ + 'about.info.grafana' | translate + }} + {{ + 'about.info.wavefront' | translate + }}
-

Security

+

{{ 'about.info.security' | translate }}

  • - Authentication Enabled: + {{ 'about.info.authentificationEnabled' | translate }}:
  • - Authenticated: + {{ 'about.info.authenticated' | translate }}:
  • Username: {{ about.security.username || 'N/A' }}
  • - Roles: + {{ 'about.info.roles' | translate }}:
    • {{ role }} @@ -53,52 +63,79 @@

      Security

-

Versions

+

{{ 'about.info.version' | translate }}

  • - Implementation Version: {{ about.versions.implementation.version }} ({{ + {{ 'about.info.impVersion' | translate }}: {{ about.versions.implementation.version }} ({{ about.versions.implementation.name }})
    • -
  • Core: {{ about.versions.core.version }} ({{ about.versions.core.name }})
  • - Dashboard: {{ about.versions.dashboard.version }} ({{ about.versions.dashboard.name }}) + {{ 'about.info.core' | translate }}: {{ about.versions.core.version }} ({{ + about.versions.core.name + }}) +
    • +
  • + {{ 'about.info.dashboard' | translate }}: {{ about.versions.dashboard.version }} ({{ + about.versions.dashboard.name + }}) +
    • +
  • + {{ 'about.info.shell' | translate }}: {{ about.versions.shell.version }} ({{ + about.versions.shell.name + }})
    • -
  • Shell: {{ about.versions.shell.version }} ({{ about.versions.shell.name }})
  • - Shell Checksum Sha1: {{ about.versions.shell.checksumSha1 }} + {{ 'about.info.shellChecksumSha1' | translate }}: {{ about.versions.shell.checksumSha1 }}
  • - Shell Checksum Sha256: {{ about.versions.shell.checksumSha256 }} + {{ 'about.info.shellChecksum256' | translate }}: {{ about.versions.shell.checksumSha256 }}
-

Runtime Environment - Skipper Deployer

+

{{ 'about.info.runtimeSkipperDeployer' | translate }}

  • - Implementation Version: + {{ 'about.info.impVersion' | translate }}: {{ about.runtimeEnvironment.appDeployer.deployerImplementationVersion }}
    • -
  • Name: {{ about.runtimeEnvironment.appDeployer.deployerName || 'N/A' }}
    • -
  • Spi Version: {{ about.runtimeEnvironment.appDeployer.deployerSpiVersion || 'N/A' }}
    • -
  • Java Version: {{ about.runtimeEnvironment.appDeployer.javaVersion || 'N/A' }}
  • - Platform Api Version: {{ about.runtimeEnvironment.appDeployer.platformApiVersion || 'N/A' }} + {{ 'about.info.name' | translate }}: + {{ about.runtimeEnvironment.appDeployer.deployerName || 'N/A' }}
  • - Platform Client Version: + {{ 'about.info.spiVersion' | translate }}: + {{ about.runtimeEnvironment.appDeployer.deployerSpiVersion || 'N/A' }} +
    • +
  • + {{ 'about.info.javaVersion' | translate }}: + {{ about.runtimeEnvironment.appDeployer.javaVersion || 'N/A' }} +
    • +
  • + {{ 'about.info.platformApiVersion' | translate }}: + {{ about.runtimeEnvironment.appDeployer.platformApiVersion || 'N/A' }} +
    • +
  • + {{ 'about.info.platformClientVersion' | translate }}: {{ about.runtimeEnvironment.appDeployer.platformClientVersion || 'N/A' }}
  • - Platform Host Version: + {{ 'about.info.platformHostVersion' | translate }}: {{ about.runtimeEnvironment.appDeployer.platformHostVersion || 'N/A' }}
    • -
  • Platform Type: {{ about.runtimeEnvironment.appDeployer.platformType || 'N/A' }}
  • - Spring Boot Version: {{ about.runtimeEnvironment.appDeployer.springBootVersion || 'N/A' }} + {{ 'about.info.platformType' | translate }}: + {{ about.runtimeEnvironment.appDeployer.platformType || 'N/A' }} +
    • +
  • + {{ 'about.info.springBootVersion' | translate }}: + {{ about.runtimeEnvironment.appDeployer.springBootVersion || 'N/A' }} +
    • +
  • + {{ 'about.info.springVersion' | translate }}: + {{ about.runtimeEnvironment.appDeployer.springVersion || 'N/A' }}
    • -
  • Spring Version: {{ about.runtimeEnvironment.appDeployer.springVersion || 'N/A' }}
-

Platform-specific Information of the Skipper Deployer

+

{{ 'about.info.platformSkipperDeployer' | translate }}

    - No platform-specific app deployer information available. + {{ 'about.info.noPlatform' | translate }}
-

Runtime Environment - Task Launcher

+

{{ 'about.info.runtimeTaskLauncher' | translate }}

    -
  • No Task Launcher information is available.
    • +
  • + {{ 'about.info.noLauncher' | translate }}. +
    -
  • Implementation Version: {{ item.deployerImplementationVersion }}
    • -
  • Name: {{ item.deployerName }}
    • -
  • Spi Version: {{ item.deployerSpiVersion }}
    • -
  • Java Version: {{ item.javaVersion }}
    • -
  • Platform Api Version: {{ item.platformApiVersion }}
    • -
  • Platform Client Version: {{ item.platformClientVersion }}
    • -
  • Platform Host Version: {{ item.platformHostVersion }}
    • -
  • Platform Type: {{ item.platformType }}
    • -
  • Spring Boot Version: {{ item.springBootVersion }}
    • -
  • Spring Version: {{ item.springVersion }}
  • - Platform-specific Information of the Task Launcher + {{ 'about.info.impVersion' | translate }}: {{ item.deployerImplementationVersion }} +
    • +
  • + {{ 'about.info.name' | translate }}: {{ item.deployerName }} +
    • +
  • + {{ 'about.info.spiVersion' | translate }}: {{ item.deployerSpiVersion }} +
    • +
  • + {{ 'about.info.javaVersion' | translate }}: {{ item.javaVersion }} +
    • +
  • + {{ 'about.info.platformApiVersion' | translate }}: {{ item.platformApiVersion }} +
    • +
  • + {{ 'about.info.platformClientVersion' | translate }}: {{ item.platformClientVersion }} +
    • +
  • + {{ 'about.info.platformHostVersion' | translate }}: {{ item.platformHostVersion }} +
    • +
  • + {{ 'about.info.platformType' | translate }}: {{ item.platformType }} +
    • +
  • + {{ 'about.info.springBootVersion' | translate }}: {{ item.springBootVersion }} +
    • +
  • + {{ 'about.info.springVersion' | translate }}: {{ item.springVersion }} +
    • +
  • + {{ 'about.info.platformTaskLauncher' | translate }}
      Runtime Environment - Task Launcher
    • - No platform-specific task launcher information available. + {{ 'about.info.noPlatformTaskLauncher' | translate }}
    • @@ -162,16 +221,18 @@

    Runtime Environment - Task Launcher

-

Need Help or Found an Issue?

+

{{ 'about.info.help' | translate }}

- +
diff --git a/ui/src/app/about/info/info.component.spec.ts b/ui/src/app/about/info/info.component.spec.ts index 244136804..3937b2aa6 100644 --- a/ui/src/app/about/info/info.component.spec.ts +++ b/ui/src/app/about/info/info.component.spec.ts @@ -8,6 +8,11 @@ import {AboutServiceMock} from '../../tests/api/about.service.mock'; import {AppServiceMock} from '../../tests/api/app.service.mock'; import {NotificationServiceMock} from '../../tests/service/notification.service.mock'; import {InfoComponent} from './info.component'; +import {SharedModule} from '../../shared/shared.module'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; +import {StoreModule} from '@ngrx/store'; +import {ROOT_REDUCERS, metaReducers} from 'src/app/reducers/reducer'; describe('about/info/info.component.ts', () => { let component: InfoComponent; @@ -17,7 +22,15 @@ describe('about/info/info.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [InfoComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + SharedModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + StoreModule.forRoot(ROOT_REDUCERS, {metaReducers}), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/about/info/info.component.ts b/ui/src/app/about/info/info.component.ts index 269624db1..5108ab088 100644 --- a/ui/src/app/about/info/info.component.ts +++ b/ui/src/app/about/info/info.component.ts @@ -4,6 +4,7 @@ import {AboutService} from '../../shared/api/about.service'; import {NotificationService} from '../../shared/service/notification.service'; import {ClipboardCopyService} from '../../shared/service/clipboard-copy.service'; import {JsonPipe} from '@angular/common'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-about-info', @@ -19,7 +20,8 @@ export class InfoComponent implements OnInit { constructor( private aboutService: AboutService, private clipboardCopyService: ClipboardCopyService, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -32,7 +34,10 @@ export class InfoComponent implements OnInit { copyToClipboard(): void { if (this.about) { this.clipboardCopyService.executeCopy(new JsonPipe().transform(this.about), this.container.nativeElement); - this.notificationService.success('Copy to clipboard', 'Copied About Details to Clipboard (As JSON).'); + this.notificationService.success( + this.translate.instant('about.info.message.copyTitle'), + this.translate.instant('about.info.message.copyContent') + ); } } } diff --git a/ui/src/app/about/signpost/signpost.component.html b/ui/src/app/about/signpost/signpost.component.html index d56e8de43..8cd4bdbbe 100644 --- a/ui/src/app/about/signpost/signpost.component.html +++ b/ui/src/app/about/signpost/signpost.component.html @@ -3,20 +3,26 @@ -

Spring Cloud Data Flow

+

{{ 'appRoot.fullName' | translate }}

- Data Flow Server Implementation
- Name: {{ about.versions.implementation.name || 'n/a' }}
- Version: {{ about.versions.implementation.version || 'n/a' }}
- + {{ 'about.signpost.title' | translate }}
+ {{ 'about.signpost.name' | translate }}: {{ about.versions.implementation.name || 'n/a' }}
+ {{ 'about.signpost.version' | translate }}: {{ about.versions.implementation.version || 'n/a' }}
+

diff --git a/ui/src/app/about/signpost/signpost.component.spec.ts b/ui/src/app/about/signpost/signpost.component.spec.ts index 2acf4afb2..872c17463 100644 --- a/ui/src/app/about/signpost/signpost.component.spec.ts +++ b/ui/src/app/about/signpost/signpost.component.spec.ts @@ -9,6 +9,11 @@ import {AppServiceMock} from '../../tests/api/app.service.mock'; import {NotificationServiceMock} from '../../tests/service/notification.service.mock'; import {SignpostComponent} from './signpost.component'; import {InfoComponent} from '../info/info.component'; +import {SharedModule} from '../../shared/shared.module'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; +import {StoreModule} from '@ngrx/store'; +import {ROOT_REDUCERS, metaReducers} from 'src/app/reducers/reducer'; describe('about/signpost/signpost.component.ts', () => { let component: SignpostComponent; @@ -18,7 +23,15 @@ describe('about/signpost/signpost.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [SignpostComponent, InfoComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + SharedModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + StoreModule.forRoot(ROOT_REDUCERS, {metaReducers}), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/about/user/user.component.html b/ui/src/app/about/user/user.component.html index 10623e883..7e57696cb 100644 --- a/ui/src/app/about/user/user.component.html +++ b/ui/src/app/about/user/user.component.html @@ -5,13 +5,13 @@ - Log out + {{ 'about.user.logOut' | translate }}
- Log In + {{ 'about.user.logIn' | translate }}
diff --git a/ui/src/app/about/user/user.component.spec.ts b/ui/src/app/about/user/user.component.spec.ts index 3e7236ba2..b3fbf0a9e 100644 --- a/ui/src/app/about/user/user.component.spec.ts +++ b/ui/src/app/about/user/user.component.spec.ts @@ -4,6 +4,8 @@ import {ClarityModule} from '@clr/angular'; import {RouterTestingModule} from '@angular/router/testing'; import {UserComponent} from './user.component'; import {SecurityServiceMock} from '../../../app/tests/api/security.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('UserComponent', () => { let component: UserComponent; @@ -13,7 +15,12 @@ describe('UserComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [UserComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([])], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]) + ], providers: [SecurityServiceMock.provider] }).compileComponents(); }) diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 1eec42beb..29cd9edbb 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -1,9 +1,9 @@ @@ -75,7 +73,9 @@ class="clr-form-control clr-row" [class.clr-error]="submitted && form.get('metaDataUri').invalid && !isFormEmpty(form)" > - +
- Please provide a valid URI pointing to the respective properties file. + {{ 'applications.add.register.invalidMetadataURI' | translate }}
- +
@@ -110,7 +107,7 @@ class="btn btn-sm btn-secondary" title="Remove" > - Remove + {{ 'commons.remove' | translate }}
@@ -125,23 +122,29 @@ class="btn btn-sm btn-secondary" itle="Add application" > - New application + {{ 'applications.add.register.newApp' | translate }}
- - + +
-

Register application(s)

+

{{ 'applications.add.register.register' | translate }}

-
  Registering application(s)...
+
+   {{ 'applications.add.register.registering' | translate }} +
- +
diff --git a/ui/src/app/apps/add/register/register.component.spec.ts b/ui/src/app/apps/add/register/register.component.spec.ts index 74dfb9b72..3cb589cab 100644 --- a/ui/src/app/apps/add/register/register.component.spec.ts +++ b/ui/src/app/apps/add/register/register.component.spec.ts @@ -12,6 +12,8 @@ import {NotificationServiceMock} from '../../../tests/service/notification.servi import {RegisterComponent} from './register.component'; import {throwError} from 'rxjs'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('apps/register/register.component.ts', () => { let component: RegisterComponent; @@ -26,6 +28,7 @@ describe('apps/register/register.component.ts', () => { ReactiveFormsModule, FormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], @@ -121,7 +124,7 @@ describe('apps/register/register.component.ts', () => { fixture.detectChanges(); fixture.debugElement.query(By.css('button[name=register]')).nativeElement.click(); fixture.detectChanges(); - expect(NotificationServiceMock.mock.errorNotification[0].title).toBe('Invalid application(s)'); + expect(NotificationServiceMock.mock.errorNotification[0].title).toBe('Invalid field(s)'); expect(NotificationServiceMock.mock.errorNotification[0].message).toBe('Some field(s) are missing or invalid.'); }); diff --git a/ui/src/app/apps/add/register/register.component.ts b/ui/src/app/apps/add/register/register.component.ts index 4cda0b19c..362cb3d1c 100644 --- a/ui/src/app/apps/add/register/register.component.ts +++ b/ui/src/app/apps/add/register/register.component.ts @@ -5,6 +5,7 @@ import {AppService} from '../../../shared/api/app.service'; import {NotificationService} from '../../../shared/service/notification.service'; import {Router} from '@angular/router'; import {AppsAddValidator} from '../add.validtor'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-add-register', @@ -20,7 +21,8 @@ export class RegisterComponent implements OnInit { private appService: AppService, private notificationService: NotificationService, private fb: FormBuilder, - private router: Router + private router: Router, + private translate: TranslateService ) {} ngOnInit(): void { @@ -31,9 +33,15 @@ export class RegisterComponent implements OnInit { this.submitted = true; if (!this.isValid()) { if (this.noValue()) { - this.notificationService.error('Invalid application', 'Please, register at least one application.'); + this.notificationService.error( + this.translate.instant('applications.add.register.message.invalidAppTitle'), + this.translate.instant('applications.add.register.message.invalidAppContent') + ); } else { - this.notificationService.error('Invalid application(s)', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); } } else { this.isImporting = true; @@ -50,19 +58,19 @@ export class RegisterComponent implements OnInit { } }) .filter(a => a != null); - this.appService - .registerProps(applications) - // .pipe(takeUntil(this.ngUnsubscribe$), finalize(() => this.blockerService.unlock())) - .subscribe( - data => { - this.notificationService.success('Register application(s).', `${data.length} App(s) registered.`); - this.cancel(); - }, - error => { - this.isImporting = false; - this.notificationService.error('An error occurred', error); - } - ); + this.appService.registerProps(applications).subscribe( + data => { + this.notificationService.success( + this.translate.instant('applications.add.register.message.successTitle'), + this.translate.instant('applications.add.register.message.successContent', {count: data.length}) + ); + this.cancel(); + }, + error => { + this.isImporting = false; + this.notificationService.error(this.translate.instant('commons.message.error'), error); + } + ); } } diff --git a/ui/src/app/apps/add/uri/uri.component.html b/ui/src/app/apps/add/uri/uri.component.html index 4ec8b8c45..305054df8 100644 --- a/ui/src/app/apps/add/uri/uri.component.html +++ b/ui/src/app/apps/add/uri/uri.component.html @@ -1,8 +1,4 @@ -

- Provide a URI that points to the location of the properties file.
- This properties file is formatted so that the keys represent the type and the name of the application, e.g. type.name. - The property values are the URIs of the app. -

+

@@ -15,31 +11,30 @@ [dataflowFocus]="true" class="clr-col-6" style="width: 100%" - placeholder="https://url.to.properties" + placeholder="{{ 'applications.add.uri.placeholderUri' | translate }}" /> - e.g.: https://dataflow.spring.io/kafka-maven-latest - Please provide a valid URI pointing to the respective properties file. + {{ 'applications.add.uri.eg' | translate }}: {{ 'applications.add.uri.egValue' | translate }} + + {{ 'applications.add.uri.invalidUri' | translate }} - +
- - + +
-

Import application(s)

+

{{ 'applications.add.uri.force' | translate }}

-
  Importing application(s)...
+
 {{ 'applications.add.uri.importing' | translate }}
- +
diff --git a/ui/src/app/apps/add/uri/uri.component.spec.ts b/ui/src/app/apps/add/uri/uri.component.spec.ts index 6a1c4ff1c..f3904894c 100644 --- a/ui/src/app/apps/add/uri/uri.component.spec.ts +++ b/ui/src/app/apps/add/uri/uri.component.spec.ts @@ -12,6 +12,8 @@ import {UriComponent} from './uri.component'; import {throwError} from 'rxjs'; import {FocusDirective} from '../../../shared/directive/focus.directive'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('apps/uri/uri.component.ts', () => { let component: UriComponent; @@ -26,6 +28,7 @@ describe('apps/uri/uri.component.ts', () => { ReactiveFormsModule, FormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], @@ -69,7 +72,7 @@ describe('apps/uri/uri.component.ts', () => { expect(inputs.force.checked).toBe(a.force); component.submit(); fixture.detectChanges(); - expect(NotificationServiceMock.mock.errorNotification[0].title).toBe('Invalid field'); + expect(NotificationServiceMock.mock.errorNotification[0].title).toBe('Invalid field(s)'); expect(NotificationServiceMock.mock.errorNotification[0].message).toBe('Some field(s) are missing or invalid.'); }); }); @@ -86,7 +89,7 @@ describe('apps/uri/uri.component.ts', () => { fixture.detectChanges(); expect(spy).toHaveBeenCalledTimes(1); expect(navigate.calls.mostRecent().args[0].toString()).toBe('apps'); - expect(NotificationServiceMock.mock.successNotifications[0].title).toBe('Import application(s)'); + expect(NotificationServiceMock.mock.successNotifications[0].title).toBe('Import Application(s)'); expect(NotificationServiceMock.mock.successNotifications[0].message).toBe('Application(s) Imported.'); done(); }); diff --git a/ui/src/app/apps/add/uri/uri.component.ts b/ui/src/app/apps/add/uri/uri.component.ts index 9a7942629..91ca809a8 100644 --- a/ui/src/app/apps/add/uri/uri.component.ts +++ b/ui/src/app/apps/add/uri/uri.component.ts @@ -4,6 +4,7 @@ import {NotificationService} from '../../../shared/service/notification.service' import {FormControl, FormGroup, Validators} from '@angular/forms'; import {Router} from '@angular/router'; import {AppsAddValidator} from '../add.validtor'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-add-uri', @@ -16,7 +17,8 @@ export class UriComponent { constructor( private appService: AppService, private notificationService: NotificationService, - private router: Router + private router: Router, + private translate: TranslateService ) { this.form = new FormGroup({ uri: new FormControl('', [Validators.required, AppsAddValidator.uri]), @@ -30,22 +32,25 @@ export class UriComponent { submit(): void { if (!this.form.valid) { - this.notificationService.error('Invalid field', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); } else { this.isImporting = true; - this.appService - .importUri(this.form.get('uri').value.toString(), this.form.get('force').value) - // .pipe(takeUntil(this.ngUnsubscribe$), finalize(() => this.blockerService.unlock())) - .subscribe( - data => { - this.notificationService.success('Import application(s)', 'Application(s) Imported.'); - this.back(); - }, - error => { - this.isImporting = false; - this.notificationService.error('An error occurred', error); - } - ); + this.appService.importUri(this.form.get('uri').value.toString(), this.form.get('force').value).subscribe( + () => { + this.notificationService.success( + this.translate.instant('applications.add.uri.message.successTitle'), + this.translate.instant('applications.add.uri.message.successContent') + ); + this.back(); + }, + error => { + this.isImporting = false; + this.notificationService.error(this.translate.instant('commons.message.error'), error); + } + ); } } diff --git a/ui/src/app/apps/add/website-starters/website-starters.component.html b/ui/src/app/apps/add/website-starters/website-starters.component.html index aee22797c..a1aca9bf3 100644 --- a/ui/src/app/apps/add/website-starters/website-starters.component.html +++ b/ui/src/app/apps/add/website-starters/website-starters.component.html @@ -1,54 +1,54 @@
-

- Use predefined application-URIs (for either maven or docker) for all the out-of-the-box stream and task/batch apps. -

+

{{ 'applications.add.websiteStarters.usePredefined' | translate }}.

- + - + - + - + - + - + - +
- - + +
-

Import application(s)

+

{{ 'applications.add.websiteStarters.importApplications' | translate }}

-
  Importing application(s)...
+
+   + {{ 'applications.add.websiteStarters.importingApplications' | translate }} +
- +
diff --git a/ui/src/app/apps/add/website-starters/website-starters.component.spec.ts b/ui/src/app/apps/add/website-starters/website-starters.component.spec.ts index a0ba396e1..461f54292 100644 --- a/ui/src/app/apps/add/website-starters/website-starters.component.spec.ts +++ b/ui/src/app/apps/add/website-starters/website-starters.component.spec.ts @@ -12,6 +12,8 @@ import {NotificationServiceMock} from '../../../tests/service/notification.servi import {WebsiteStartersComponent} from './website-starters.component'; import {throwError} from 'rxjs'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('apps/website-starters/website-starters.component.ts', () => { let component: WebsiteStartersComponent; @@ -26,6 +28,7 @@ describe('apps/website-starters/website-starters.component.ts', () => { ReactiveFormsModule, FormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], diff --git a/ui/src/app/apps/add/website-starters/website-starters.component.ts b/ui/src/app/apps/add/website-starters/website-starters.component.ts index 3e65016b3..f8638bc91 100644 --- a/ui/src/app/apps/add/website-starters/website-starters.component.ts +++ b/ui/src/app/apps/add/website-starters/website-starters.component.ts @@ -1,5 +1,6 @@ import {Component} from '@angular/core'; import {Router} from '@angular/router'; +import {TranslateService} from '@ngx-translate/core'; import {AppService} from '../../../shared/api/app.service'; import {NotificationService} from '../../../shared/service/notification.service'; @@ -24,28 +25,32 @@ export class WebsiteStartersComponent { constructor( private router: Router, private notificationService: NotificationService, - private appService: AppService + private appService: AppService, + private translate: TranslateService ) {} submit(): void { if (!this.value || !this.uris[this.value]) { - this.notificationService.error('No starter selected', 'Please, select a starter pack.'); + this.notificationService.error( + this.translate.instant('applications.add.websiteStarters.message.noStarterTitle'), + this.translate.instant('applications.add.websiteStarters.message.noStarterContent') + ); return; } this.isImporting = true; - this.appService - .importUri(this.uris[this.value], this.force) - // .pipe(takeUntil(this.ngUnsubscribe$), finalize(() => this.blockerService.unlock())) - .subscribe( - () => { - this.notificationService.success('Import starters', 'Application(s) Imported.'); - this.back(); - }, - error => { - this.notificationService.error('An error occurred', error); - this.isImporting = false; - } - ); + this.appService.importUri(this.uris[this.value], this.force).subscribe( + () => { + this.notificationService.success( + this.translate.instant('applications.add.websiteStarters.message.successTitle'), + this.translate.instant('applications.add.websiteStarters.message.successContent') + ); + this.back(); + }, + error => { + this.notificationService.error(this.translate.instant('commons.message.error'), error); + this.isImporting = false; + } + ); } back(): void { diff --git a/ui/src/app/apps/app/app.component.html b/ui/src/app/apps/app/app.component.html index 5907275b4..8ba59b67f 100644 --- a/ui/src/app/apps/app/app.component.html +++ b/ui/src/app/apps/app/app.component.html @@ -1,6 +1,6 @@

- Application {{ app.name }}{{ app.name }}  {{ app.type }} {{ defaultApp.version }} @@ -10,7 +10,7 @@

- Version + {{ 'applications.main.version' | translate }} @@ -39,7 +39,7 @@

(click)="getProperties(version)" > {{ version.version }}  - (DEFAULT) + ({{ 'applications.details.default' | translate | uppercase }}) @@ -47,39 +47,44 @@

- +
-
Type
+
{{ 'applications.main.type' | translate }}
{{ app.type }}
-
Version
+
{{ 'applications.main.version' | translate }}
{{ defaultApp.version }}
-
Uri
+
{{ 'applications.main.uri' | translate }}
{{ detailedApp.uri }}
-
Metadata Uri
+
{{ 'applications.main.metadataURI' | translate }}
{{ detailedApp.metaDataUri || 'N/A' }}
-
Version(s)
+
{{ 'applications.main.version' | translate }}(s)
{{ versions.length }}
- Loading information... + {{ 'commons.loading' | translate }}
@@ -90,7 +95,7 @@

- There are more than 50 properties to display, the UI can be slow.
Do you - want to display all the properties ? + {{ 'applications.details.tooManyProperties' | translate }}
+ {{ 'applications.details.tooManyProperties2' | translate }}
@@ -120,7 +125,7 @@

@@ -134,16 +139,23 @@

{{ getReadableId(property.id) }}
- Deprecation level: {{ property.deprecation.level }} + {{ 'applications.details.deprecatedLevel' | translate }}: + {{ property.deprecation.level }}
-
{{ property.description ? property.description : '(No Description Available)' }}
+
{{ property.description }}
+
+ ({{ 'applications.details.noDescription' | translate }}) +
{{ property.type }} (Default value: {{ property.defaultValue }}({{ 'applications.details.defaultValue' | translate }}: + {{ property.defaultValue }})
@@ -154,11 +166,11 @@

-
No property
+
{{ 'applications.details.noProperty' | translate }}

- Loading properties... + {{ 'commons.loading' | translate }}
@@ -169,7 +181,7 @@

- Loading application... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/apps/app/app.component.spec.ts b/ui/src/app/apps/app/app.component.spec.ts index fdac446cc..112807786 100644 --- a/ui/src/app/apps/app/app.component.spec.ts +++ b/ui/src/app/apps/app/app.component.spec.ts @@ -18,6 +18,8 @@ import {OrderByPipe} from '../../shared/pipe/order-by.pipe'; import {By} from '@angular/platform-browser'; import {HttpError} from '../../shared/model/error.model'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('apps/apps.component.ts', () => { let component: AppComponent; @@ -33,7 +35,13 @@ describe('apps/apps.component.ts', () => { CardComponent, OrderByPipe ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/apps/app/app.component.ts b/ui/src/app/apps/app/app.component.ts index 4be4c4ad5..d0ca60073 100644 --- a/ui/src/app/apps/app/app.component.ts +++ b/ui/src/app/apps/app/app.component.ts @@ -7,6 +7,7 @@ import {UnregisterComponent} from '../unregister/unregister.component'; import {NotificationService} from '../../shared/service/notification.service'; import {VersionComponent} from '../version/version.component'; import {HttpError} from '../../shared/model/error.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-app', @@ -30,7 +31,8 @@ export class AppComponent implements OnInit { private route: ActivatedRoute, private appsService: AppService, private router: Router, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -45,7 +47,10 @@ export class AppComponent implements OnInit { this.appsService.getAppVersions(this.app.name, this.app.type).subscribe( (apps: App[]) => { if (apps.length === 0) { - this.notificationService.error('An error occurred', 'No application found.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('applications.details.notFound') + ); this.back(); } this.versions = apps; @@ -57,7 +62,7 @@ export class AppComponent implements OnInit { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.back(); } ); diff --git a/ui/src/app/apps/apps.component.html b/ui/src/app/apps/apps.component.html index 1ce2ff327..f5253c033 100644 --- a/ui/src/app/apps/apps.component.html +++ b/ui/src/app/apps/apps.component.html @@ -1,5 +1,5 @@

- Applications + {{ 'applications.main.title' | translate }}

@@ -20,7 +20,9 @@

#datagrid > - + @@ -40,9 +43,11 @@

(click)="setMode(true)" [appRole]="['ROLE_DESTROY']" > - Group Actions + {{ 'commons.groupActions' | translate }} + + - [style.width.px]="context.sizeName | datagridcolumn: datagrid:contextName | async" [clrFilterValue]="context.name" > - Name + {{ 'applications.main.name' | translate }} [clrDgSortOrder]="context.by === 'type' ? (context.reverse ? -1 : 1) : 0" [style.width.px]="context.sizeType | datagridcolumn: datagrid:contextName | async" > - Type + {{ 'applications.main.type' | translate }} @@ -71,7 +76,7 @@

[style.width.px]="context.sizeVersion | datagridcolumn: datagrid:contextName | async" > - Version + {{ 'applications.main.version' | translate }} @@ -82,7 +87,7 @@

[style.width.px]="context.sizeUri | datagridcolumn: datagrid:contextName | async" > - URI + {{ 'applications.main.uri' | translate }} @@ -91,7 +96,7 @@

[style.width.px]="context.sizeMetadataUri | datagridcolumn: datagrid:contextName | async" > - Metadata URI + {{ 'applications.main.metadataURI' | translate }} @@ -115,12 +120,16 @@

>{{ app.metaDataUri }} - - - + + + - No results found. + {{ 'applications.main.noResult' | translate }}. [clrDgPageSize]="+context.size" [clrDgPage]="+context.current" > - Applications per page - {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ page?.total }} applications + {{ + 'applications.main.applicationsPerPage' | translate + }} + {{ + 'applications.main.pagination' + | translate: {first: pagination.firstItem + 1, last: pagination.lastItem + 1, total: page?.total} + }} diff --git a/ui/src/app/apps/apps.component.spec.ts b/ui/src/app/apps/apps.component.spec.ts index 5b889e509..b14b5d90e 100644 --- a/ui/src/app/apps/apps.component.spec.ts +++ b/ui/src/app/apps/apps.component.spec.ts @@ -17,6 +17,8 @@ import {ConfirmComponent} from '../shared/component/confirm/confirm.component'; import {ContextServiceMock} from '../tests/service/context.service.mock'; import {SettingsServiceMock} from '../tests/service/settings.service.mock'; import {DatagridColumnPipe} from '../shared/pipe/datagrid-column.pipe'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../assets/i18n/en.json'; describe('apps/apps.component.ts', () => { let component: AppsComponent; @@ -33,7 +35,13 @@ describe('apps/apps.component.ts', () => { ConfirmComponent, DatagridColumnPipe ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/apps/apps.component.ts b/ui/src/app/apps/apps.component.ts index 3b5175312..1361d49f5 100644 --- a/ui/src/app/apps/apps.component.ts +++ b/ui/src/app/apps/apps.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, OnDestroy, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, ViewChild} from '@angular/core'; import {AppService} from '../shared/api/app.service'; import {ClrDatagridStateInterface} from '@clr/angular'; import {App, AppPage} from '../shared/model/app.model'; diff --git a/ui/src/app/apps/apps.module.ts b/ui/src/app/apps/apps.module.ts index 7d365fddc..00bbd85c1 100644 --- a/ui/src/app/apps/apps.module.ts +++ b/ui/src/app/apps/apps.module.ts @@ -16,6 +16,7 @@ import {PropsComponent} from './add/props/props.component'; import {RegisterComponent} from './add/register/register.component'; import {UriComponent} from './add/uri/uri.component'; import {WebsiteStartersComponent} from './add/website-starters/website-starters.component'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [ @@ -37,7 +38,8 @@ import {WebsiteStartersComponent} from './add/website-starters/website-starters. SharedModule, ClarityModule, SecurityModule, - AppsRoutingModule + AppsRoutingModule, + TranslateModule ], providers: [] }) diff --git a/ui/src/app/apps/unregister/unregister.component.html b/ui/src/app/apps/unregister/unregister.component.html index 05c613b76..fc27ca412 100644 --- a/ui/src/app/apps/unregister/unregister.component.html +++ b/ui/src/app/apps/unregister/unregister.component.html @@ -1,26 +1,32 @@ -

Confirm Unregister Application

-

Confirm Unregister Applications

+

+ {{ 'applications.unregister.title' | translate }} +

+

+ {{ 'applications.unregister.title2' | translate }} +

- This action will unregister and delete application + {{ 'applications.unregister.content' | translate }} {{ apps[0].name }} - of type {{ apps[0].type }}. Are you sure? + {{ 'commons.ofType' | translate }} {{ apps[0].type }}. {{ 'commons.areYouSure' | translate }}
- This action will unregister and delete the + {{ 'applications.unregister.content2' | translate }} {{ apps.length }} application{{ apps?.length > 1 ? 's' : '' }}{{ apps.length }} {{ 'applications.main.application' | translate }}{{ apps?.length > 1 ? 's' : '' }} - listed below.
Are you sure? + {{ 'applications.unregister.listedBelow' | translate }}.
{{ 'commons.areYouSure' | translate }}
- - + + @@ -37,13 +43,15 @@

Confirm Unregister Applications
- Unregistering application(s) ... + {{ 'applications.unregister.unregistering' | translate }}
- +
diff --git a/ui/src/app/apps/unregister/unregister.component.spec.ts b/ui/src/app/apps/unregister/unregister.component.spec.ts index f0c2b1461..6f249a0fa 100644 --- a/ui/src/app/apps/unregister/unregister.component.spec.ts +++ b/ui/src/app/apps/unregister/unregister.component.spec.ts @@ -12,6 +12,8 @@ import {App} from '../../shared/model/app.model'; import {By} from '@angular/platform-browser'; import {throwError} from 'rxjs'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('apps/unregister/unregister.component.ts', () => { let component: UnregisterComponent; @@ -22,7 +24,13 @@ describe('apps/unregister/unregister.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [UnregisterComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/apps/unregister/unregister.component.ts b/ui/src/app/apps/unregister/unregister.component.ts index b1e4f9298..42c58ee4d 100644 --- a/ui/src/app/apps/unregister/unregister.component.ts +++ b/ui/src/app/apps/unregister/unregister.component.ts @@ -2,6 +2,7 @@ import {Component, EventEmitter, Input, OnChanges, Output, SimpleChanges} from ' import {App} from '../../shared/model/app.model'; import {AppService} from '../../shared/api/app.service'; import {NotificationService} from '../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-unregister', @@ -13,7 +14,11 @@ export class UnregisterComponent { isRunning = false; @Output() onUnregistered = new EventEmitter(); - constructor(private appsService: AppService, private notificationService: NotificationService) {} + constructor( + private appsService: AppService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(apps: App[]): void { this.apps = apps; @@ -27,18 +32,24 @@ export class UnregisterComponent { data => { if (data.length === 1) { this.notificationService.success( - 'Unregister application', - 'Successfully removed app "' + this.apps[0].name + '" of type "' + this.apps[0].type.toString() + '".' + this.translate.instant('applications.unregister.message.successTitle'), + this.translate.instant('applications.unregister.message.successContent', { + name: this.apps[0].name, + type: this.apps[0].type.toString() + }) ); } else { - this.notificationService.success('Unregister applications', `${data.length} app(s) unregistered.`); + this.notificationService.success( + this.translate.instant('applications.unregister.message.successTitle2'), + this.translate.instant('applications.unregister.message.successContent2', {count: data.length}) + ); } this.onUnregistered.emit(data); this.isOpen = false; this.apps = null; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.onUnregistered.emit(true); this.isOpen = false; this.apps = null; diff --git a/ui/src/app/apps/version/version.component.html b/ui/src/app/apps/version/version.component.html index 0a572a458..adaad2a2b 100644 --- a/ui/src/app/apps/version/version.component.html +++ b/ui/src/app/apps/version/version.component.html @@ -1,12 +1,12 @@ -

Manage versions

+

{{ 'applications.version.manageVersions' | translate }}

NameType{{ 'applications.main.name' | translate }}{{ 'applications.main.type' | translate }}
- - + + @@ -24,14 +24,16 @@

Manage versions

@@ -40,31 +42,34 @@

Manage versions

- Loading versions(s) ... + {{ 'applications.unregister.loadingVersions' | translate }}
- Unregistering application(s) ... + {{ 'applications.unregister.unregisteringApplications' | translate }}
- +
- This action will unregister the version {{ selected?.version }} of the application - {{ selected?.name }}{{ 'applications.version.version' | translate }} {{ selected?.version }} + {{ 'applications.version.ofTheApplication' | translate }} {{ selected?.name }} {{ selected?.type }}.
- Are you sure? + {{ 'commons.areYouSure' | translate }} - This action will make the version {{ selected?.version }} as the default version for the application - {{ selected?.name }}{{ selected?.version }} + {{ 'applications.version.asTheDefaultVersion' | translate }} {{ selected?.name }}  {{ selected?.type }}.
- Are you sure? + {{ 'commons.areYouSure' | translate }} diff --git a/ui/src/app/apps/version/version.component.spec.ts b/ui/src/app/apps/version/version.component.spec.ts index 83a4ea461..289a11ff3 100644 --- a/ui/src/app/apps/version/version.component.spec.ts +++ b/ui/src/app/apps/version/version.component.spec.ts @@ -14,6 +14,8 @@ import {By} from '@angular/platform-browser'; import {throwError} from 'rxjs'; import {HttpError} from '../../shared/model/error.model'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('apps/version/version.component.ts', () => { let component: VersionComponent; @@ -23,7 +25,13 @@ describe('apps/version/version.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [VersionComponent, ConfirmComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/apps/version/version.component.ts b/ui/src/app/apps/version/version.component.ts index 5d0e9cff7..28c64f507 100644 --- a/ui/src/app/apps/version/version.component.ts +++ b/ui/src/app/apps/version/version.component.ts @@ -3,6 +3,7 @@ import {App, ApplicationType} from '../../shared/model/app.model'; import {AppService} from '../../shared/api/app.service'; import {NotificationService} from '../../shared/service/notification.service'; import {ConfirmComponent} from '../../shared/component/confirm/confirm.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-version', @@ -19,7 +20,11 @@ export class VersionComponent { @ViewChild('unregisterModal', {static: true}) unregisterModal: ConfirmComponent; @ViewChild('makeDefaultModal', {static: true}) makeDefaultModal: ConfirmComponent; - constructor(private appService: AppService, private notificationService: NotificationService) {} + constructor( + private appService: AppService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(name: string, type: ApplicationType): void { this.loading = true; @@ -30,7 +35,7 @@ export class VersionComponent { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.isOpen = false; } ); @@ -50,8 +55,10 @@ export class VersionComponent { this.appService.unregisterApp(this.selected).subscribe( () => { this.notificationService.success( - 'Unregister version', - 'Successfully removed version "' + this.selected.version + '".' + this.translate.instant('applications.version.message.unregisterSuccessTitle'), + this.translate.instant('applications.version.message.unregisterSuccessContent', { + version: this.selected.version + }) ); this.open(this.versions[0].name, this.versions[0].type); this.selected = null; @@ -61,7 +68,7 @@ export class VersionComponent { this.onChange.emit(true); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.isOpen = false; this.selected = null; } @@ -72,16 +79,19 @@ export class VersionComponent { this.appService.defaultVersion(this.selected).subscribe( () => { this.notificationService.success( - 'Default version', - `The version ${this.selected.version} ` + - `is now the default version of the application ${this.versions[0].name} (${this.versions[0].type}).` + this.translate.instant('applications.version.message.defaultSuccessTitle'), + this.translate.instant('applications.version.message.defaultSuccessContent', { + version: this.selected.version, + app: this.versions[0].name, + type: this.versions[0].type + }) ); this.open(this.versions[0].name, this.versions[0].type); this.selected = null; this.onChange.emit(true); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.isOpen = false; this.selected = null; } diff --git a/ui/src/app/flo/shared-flo.module.ts b/ui/src/app/flo/shared-flo.module.ts index 944320e91..e45ba6be3 100644 --- a/ui/src/app/flo/shared-flo.module.ts +++ b/ui/src/app/flo/shared-flo.module.ts @@ -8,6 +8,7 @@ import {ClrDynamicFormPropertyComponent} from './shared/properties/df.property.c import {ClrPropertiesGroupComponent} from './shared/properties/properties.group.component'; import {PropertiesDialogComponent} from './shared/properties/properties-dialog.component'; import {PropertiesGroupsDialogComponent} from './shared/properties-groups/properties-groups-dialog.component'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [ @@ -16,7 +17,15 @@ import {PropertiesGroupsDialogComponent} from './shared/properties-groups/proper PropertiesDialogComponent, PropertiesGroupsDialogComponent ], - imports: [CommonModule, HttpClientModule, FormsModule, ReactiveFormsModule, ClarityModule, FloModule], + imports: [ + CommonModule, + HttpClientModule, + FormsModule, + ReactiveFormsModule, + ClarityModule, + TranslateModule, + FloModule + ], providers: [], exports: [ ClrDynamicFormPropertyComponent, diff --git a/ui/src/app/flo/shared/graph-view/graph-view.component.spec.ts b/ui/src/app/flo/shared/graph-view/graph-view.component.spec.ts index 13e25c6a2..32d62b8a6 100644 --- a/ui/src/app/flo/shared/graph-view/graph-view.component.spec.ts +++ b/ui/src/app/flo/shared/graph-view/graph-view.component.spec.ts @@ -13,6 +13,8 @@ import {MockSharedAppService} from '../../../tests/service/app.service.mock'; import {RenderService} from '../../stream/render.service'; import {NodeHelper} from '../../stream/node-helper.service'; import {PropertiesEditor} from '../../stream/properties-editor.service'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; /** * Test {@link GraphViewComponent}. @@ -34,6 +36,7 @@ describe('StreamGraphViewComponent', () => { FloModule, SharedModule, StreamsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule, StoreModule.forRoot({}), EffectsModule.forRoot([]) diff --git a/ui/src/app/flo/shared/properties-groups/properties-groups-dialog.component.html b/ui/src/app/flo/shared/properties-groups/properties-groups-dialog.component.html index 8aa7c87e3..4ff33cc1b 100644 --- a/ui/src/app/flo/shared/properties-groups/properties-groups-dialog.component.html +++ b/ui/src/app/flo/shared/properties-groups/properties-groups-dialog.component.html @@ -6,7 +6,7 @@

{{ title }}

@@ -40,10 +40,12 @@

{{ title }}

-
  Loading...
+
+  {{ 'commons.loading' | translate }} +
- - + +
diff --git a/ui/src/app/flo/shared/properties/df.property.component.html b/ui/src/app/flo/shared/properties/df.property.component.html index 0c168bc4b..2c06fe384 100644 --- a/ui/src/app/flo/shared/properties/df.property.component.html +++ b/ui/src/app/flo/shared/properties/df.property.component.html @@ -8,7 +8,7 @@
{{ model.description }}
-
Invalid value.
+
{{ 'flo.commons.invalidValue' | translate }}
@@ -23,7 +23,7 @@
{{ model.description }}
-
Invalid value.
+
{{ 'flo.commons.invalidValue' | translate }}
@@ -98,7 +98,7 @@ />
{{ model.description }}
-
Invalid value.
+
{{ 'flo.commons.invalidValue' | translate }}
diff --git a/ui/src/app/flo/shared/properties/properties-dialog.component.html b/ui/src/app/flo/shared/properties/properties-dialog.component.html index a4627c780..e38576c96 100644 --- a/ui/src/app/flo/shared/properties/properties-dialog.component.html +++ b/ui/src/app/flo/shared/properties/properties-dialog.component.html @@ -1,7 +1,7 @@

- Properties for {{ app.name }} + {{ 'flo.properties.title' | translate }} {{ app.name }} {{ typeString }} {{ app.version }} @@ -52,11 +52,13 @@

-
  Loading...
+
+  {{ 'commons.loading' | translate }} +
- - + +
diff --git a/ui/src/app/flo/shared/properties/properties.group.component.html b/ui/src/app/flo/shared/properties/properties.group.component.html index 677de28db..00c4fcc3a 100644 --- a/ui/src/app/flo/shared/properties/properties.group.component.html +++ b/ui/src/app/flo/shared/properties/properties.group.component.html @@ -10,7 +10,7 @@ " class="no-matches-label" > - No results found. + {{ 'commons.noResultFound' | translate }} diff --git a/ui/src/app/flo/stream-flo.module.ts b/ui/src/app/flo/stream-flo.module.ts index 78e4eac88..2e8d55f63 100644 --- a/ui/src/app/flo/stream-flo.module.ts +++ b/ui/src/app/flo/stream-flo.module.ts @@ -23,6 +23,7 @@ import {RuntimeStreamFloViewComponent} from './stream/component/runtime-view.com import {NodeHelper} from './stream/node-helper.service'; import {PropertiesEditor} from './stream/properties-editor.service'; import {SanitizeDsl} from './stream/dsl-sanitize.service'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [ @@ -43,6 +44,7 @@ import {SanitizeDsl} from './stream/dsl-sanitize.service'; ClarityModule, FloModule, SharedFloModule, + TranslateModule, SharedModule ], providers: [ diff --git a/ui/src/app/flo/stream/component/create-component.spec.ts b/ui/src/app/flo/stream/component/create-component.spec.ts index 8dd430961..7cc670afc 100644 --- a/ui/src/app/flo/stream/component/create-component.spec.ts +++ b/ui/src/app/flo/stream/component/create-component.spec.ts @@ -14,6 +14,8 @@ import {SharedModule} from '../../../shared/shared.module'; import {StreamService} from '../../../shared/api/stream.service'; import {MockStreamsService} from '../../../tests/service/stream.service.mock'; import {NotificationServiceMock} from '../../../tests/service/notification.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; /** * Test {@link StreamCreateComponent}. @@ -41,6 +43,7 @@ describe('StreamCreateComponent', () => { SharedModule, StreamsModule, StoreModule.forRoot({}), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), EffectsModule.forRoot([]) ], providers: [ diff --git a/ui/src/app/flo/stream/component/create.component.ts b/ui/src/app/flo/stream/component/create.component.ts index 430c448b2..d95917cc0 100644 --- a/ui/src/app/flo/stream/component/create.component.ts +++ b/ui/src/app/flo/stream/component/create.component.ts @@ -32,7 +32,7 @@ import {PropertiesDialogComponent} from '../../shared/properties/properties-dial (contentValidated)="contentValidated = $event" (onProperties)="handleLinkEvent($event)" (validationMarkers)="markersFromGraphChanged($event)" - searchFilterPlaceHolder="Search for applications..." + [searchFilterPlaceHolder]="'flo.commons.searchForApplications' | translate" >
- +
-
  Loading editor...
+
+  {{ 'commons.loading' | translate }} +
diff --git a/ui/src/app/flo/stream/component/view.component.spec.ts b/ui/src/app/flo/stream/component/view.component.spec.ts index 26d4239e4..ea4c73796 100644 --- a/ui/src/app/flo/stream/component/view.component.spec.ts +++ b/ui/src/app/flo/stream/component/view.component.spec.ts @@ -11,6 +11,8 @@ import {StreamFloViewComponent} from './view.component'; import {StreamService} from '../../../shared/api/stream.service'; import {NotificationServiceMock} from '../../../tests/service/notification.service.mock'; import {NodeHelper} from '../node-helper.service'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; /** * Test {@link StreamGraphComponent}. @@ -30,7 +32,11 @@ describe('StreamGraphComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [StreamFloViewComponent, GraphViewComponent], - imports: [RouterTestingModule.withRoutes([]), FloModule], + imports: [ + RouterTestingModule.withRoutes([]), + FloModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ {provide: StreamService, useValue: streamsService}, {provide: NotificationService, useValue: notificationService}, diff --git a/ui/src/app/flo/stream/component/view.component.ts b/ui/src/app/flo/stream/component/view.component.ts index f5f07a539..f81bacf3f 100644 --- a/ui/src/app/flo/stream/component/view.component.ts +++ b/ui/src/app/flo/stream/component/view.component.ts @@ -5,6 +5,7 @@ import {MetamodelService} from '../metamodel.service'; import {RenderService} from '../render.service'; import {delay} from 'rxjs/operators'; import {Stream} from '../../../shared/model/stream.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream-flo-view', @@ -31,7 +32,8 @@ export class StreamFloViewComponent implements OnDestroy, OnChanges { private streamService: StreamService, private notificationService: NotificationService, public metamodelService: MetamodelService, - public renderService: RenderService + public renderService: RenderService, + private translate: TranslateService ) {} ngOnChanges(): void { @@ -42,7 +44,7 @@ export class StreamFloViewComponent implements OnDestroy, OnChanges { this.dsl = streams.map(s => `${s.name}=${s.dslText}`).join('\n'); }, error => { - this.notificationService.error('An error occured', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } else { @@ -51,7 +53,7 @@ export class StreamFloViewComponent implements OnDestroy, OnChanges { this.dsl = stream.dslText; }, error => { - this.notificationService.error('An error occured', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/flo/stream/instance-dot/instance-dot.component.html b/ui/src/app/flo/stream/instance-dot/instance-dot.component.html index 03a02a70e..03b090760 100644 --- a/ui/src/app/flo/stream/instance-dot/instance-dot.component.html +++ b/ui/src/app/flo/stream/instance-dot/instance-dot.component.html @@ -25,5 +25,5 @@ --> - App instance either is down or not deployed + {{ 'flo.commons.instanceDown' | translate }} diff --git a/ui/src/app/flo/stream/properties/stream-properties-dialog.component.ts b/ui/src/app/flo/stream/properties/stream-properties-dialog.component.ts index bec10506a..474740012 100644 --- a/ui/src/app/flo/stream/properties/stream-properties-dialog.component.ts +++ b/ui/src/app/flo/stream/properties/stream-properties-dialog.component.ts @@ -16,6 +16,7 @@ import 'codemirror-minified/mode/groovy/groovy'; import 'codemirror-minified/mode/javascript/javascript'; import 'codemirror-minified/mode/ruby/ruby'; import 'codemirror-minified/mode/python/python'; +import {TranslateService} from '@ngx-translate/core'; /** * Utility class for working with Properties. @@ -24,7 +25,11 @@ import 'codemirror-minified/mode/python/python'; * @author Andy Clement */ export class StreamPropertiesGroupModel extends PropertiesGroupModel { - constructor(propertiesSource: StreamAppPropertiesSource, private streamService: StreamService) { + constructor( + propertiesSource: StreamAppPropertiesSource, + private streamService: StreamService, + private translate: TranslateService + ) { super(propertiesSource); } @@ -38,7 +43,7 @@ export class StreamPropertiesGroupModel extends PropertiesGroupModel { if (property.id === 'label') { validation = { validator: Validators.pattern(/^[\w_]+[\w_-]*$/), - errorData: [{id: 'pattern', message: 'Invalid app label!'}] + errorData: [{id: 'pattern', message: this.translate.instant('flo.stream.invalidAppLabel')}] }; } else if (property.id === 'stream-name') { validation = { @@ -50,9 +55,9 @@ export class StreamPropertiesGroupModel extends PropertiesGroupModel { ], asyncValidator: Properties.Validators.uniqueResource(value => this.isUniqueStreamName(value), 500), errorData: [ - {id: 'pattern', message: 'Invalid stream name!'}, - {id: 'uniqueResource', message: 'Stream name already exists!'}, - {id: 'noneOf', message: 'Stream name already exists on the canvas'} + {id: 'pattern', message: this.translate.instant('flo.stream.invalidStreamName')}, + {id: 'uniqueResource', message: this.translate.instant('flo.stream.uniqueStreamName')}, + {id: 'noneOf', message: this.translate.instant('flo.stream.noneOfStreamName')} ] }; } @@ -100,12 +105,12 @@ export class StreamPropertiesGroupModel extends PropertiesGroupModel { export class StreamPropertiesDialogComponent extends PropertiesDialogComponent { public title: string; - constructor(private streamsService: StreamService) { + constructor(private streamsService: StreamService, private translate: TranslateService) { super(); } setData(propertiesSource: StreamAppPropertiesSource): void { - this.propertiesGroupModel = new StreamPropertiesGroupModel(propertiesSource, this.streamsService); + this.propertiesGroupModel = new StreamPropertiesGroupModel(propertiesSource, this.streamsService, this.translate); this.propertiesGroupModel.load(); this.propertiesGroupModel.loadedSubject.subscribe(() => { this.setGroupedProperties(); diff --git a/ui/src/app/flo/task-flo.module.ts b/ui/src/app/flo/task-flo.module.ts index 37bd5ad3b..346e4ed11 100644 --- a/ui/src/app/flo/task-flo.module.ts +++ b/ui/src/app/flo/task-flo.module.ts @@ -17,6 +17,7 @@ import {TaskFloCreateComponent} from './task/component/create.component'; import {ToolsService} from './task/tools.service'; import {SharedFloModule} from './shared-flo.module'; import {SharedModule} from '../shared/shared.module'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [TaskNodeComponent, TaskPropertiesDialogComponent, ViewComponent, TaskFloCreateComponent], @@ -28,6 +29,7 @@ import {SharedModule} from '../shared/shared.module'; ClarityModule, FloModule, SharedFloModule, + TranslateModule, SharedModule ], providers: [ diff --git a/ui/src/app/flo/task/component/create.component.spec.ts b/ui/src/app/flo/task/component/create.component.spec.ts index 2d4a830af..b70aa159e 100644 --- a/ui/src/app/flo/task/component/create.component.spec.ts +++ b/ui/src/app/flo/task/component/create.component.spec.ts @@ -8,6 +8,8 @@ import {MockSharedAppService} from '../../../tests/service/app.service.mock'; import {ToolsServiceMock} from '../../../tests/service/task-tools.service.mock'; import {TaskFloModule} from '../../task-flo.module'; import {StoreModule} from '@ngrx/store'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; /** * Test {@link TaskDefinitionCreateComponent}. @@ -24,7 +26,13 @@ describe('TaskFloCreateComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [StoreModule.forRoot({}), TaskFloModule, BrowserAnimationsModule, RouterTestingModule.withRoutes([])], + imports: [ + StoreModule.forRoot({}), + TaskFloModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule, + RouterTestingModule.withRoutes([]) + ], providers: [{provide: MetamodelService, useValue: metamodelService}] }).compileComponents(); }); diff --git a/ui/src/app/flo/task/component/create.component.ts b/ui/src/app/flo/task/component/create.component.ts index f02888f89..ffb01228b 100644 --- a/ui/src/app/flo/task/component/create.component.ts +++ b/ui/src/app/flo/task/component/create.component.ts @@ -29,7 +29,7 @@ import {TaskGraphPropertiesSource} from '../properties/task-properties-source'; (contentValidated)="contentValidated = $event" (validationMarkers)="validationMarkers = $event" (onProperties)="handleLinkEvent($event)" - searchFilterPlaceHolder="Applications" + [searchFilterPlaceHolder]="'flo.commons.searchForApplications' | translate" >
@@ -77,10 +77,14 @@ import {TaskGraphPropertiesSource} from '../properties/task-properties-source';
- +
-
  Loading editor...
+
+  {{ 'commons.loading' | translate }} +
diff --git a/ui/src/app/flo/task/component/view.component.spec.ts b/ui/src/app/flo/task/component/view.component.spec.ts index 60d0ea8d1..2d38c404d 100644 --- a/ui/src/app/flo/task/component/view.component.spec.ts +++ b/ui/src/app/flo/task/component/view.component.spec.ts @@ -5,6 +5,12 @@ import {MetamodelService} from '../metamodel.service'; import {RenderService} from '../render.service'; import {LoggerService} from '../../../shared/service/logger.service'; import {ToolsServiceMock} from '../../../tests/service/task-tools.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; +import {RouterTestingModule} from '@angular/router/testing'; +import {StoreModule} from '@ngrx/store'; +import {TaskFloModule} from '../../task-flo.module'; describe('ViewComponent', () => { let component: ViewComponent; @@ -21,6 +27,13 @@ describe('ViewComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ViewComponent], + imports: [ + StoreModule.forRoot({}), + TaskFloModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule, + RouterTestingModule.withRoutes([]) + ], providers: [ {provide: MetamodelService, useValue: metamodelService}, {provide: RenderService, useValue: renderService} diff --git a/ui/src/app/layout/layout.module.ts b/ui/src/app/layout/layout.module.ts index 4f04495b2..1d6c91cd4 100644 --- a/ui/src/app/layout/layout.module.ts +++ b/ui/src/app/layout/layout.module.ts @@ -7,10 +7,19 @@ import {ClarityModule} from '@clr/angular'; import {NavComponent} from './nav/nav.component'; import {LogoComponent} from './logo/logo.component'; import {SecurityModule} from '../security/security.module'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [LogoComponent, NavComponent], - imports: [RouterModule, BrowserModule, BrowserAnimationsModule, CommonModule, ClarityModule, SecurityModule], + imports: [ + RouterModule, + BrowserModule, + BrowserAnimationsModule, + CommonModule, + ClarityModule, + SecurityModule, + TranslateModule + ], exports: [LogoComponent, NavComponent] }) export class LayoutModule {} diff --git a/ui/src/app/layout/logo/logo.component.ts b/ui/src/app/layout/logo/logo.component.ts index 6aa5b6060..7a6f9041a 100644 --- a/ui/src/app/layout/logo/logo.component.ts +++ b/ui/src/app/layout/logo/logo.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'app-logo', template: `
- + diff --git a/ui/src/app/manage/records/operation.filter.spec.ts b/ui/src/app/manage/records/operation.filter.spec.ts index b8fb1488a..be0d68a33 100644 --- a/ui/src/app/manage/records/operation.filter.spec.ts +++ b/ui/src/app/manage/records/operation.filter.spec.ts @@ -10,6 +10,8 @@ import {RecordServiceMock} from '../../tests/api/record.service.mock'; import {By} from '@angular/platform-browser'; import {OperationFilterComponent} from './operation.filter'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('manage/records/operation.filter.ts', () => { let component: OperationFilterComponent; @@ -19,7 +21,12 @@ describe('manage/records/operation.filter.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [OperationFilterComponent], - imports: [FormsModule, ClarityModule, BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/records/operation.filter.ts b/ui/src/app/manage/records/operation.filter.ts index 94df68ece..92e953549 100644 --- a/ui/src/app/manage/records/operation.filter.ts +++ b/ui/src/app/manage/records/operation.filter.ts @@ -9,7 +9,7 @@ import {RecordOperationType} from '../../shared/model/record.model'; template: `
- + diff --git a/ui/src/app/manage/records/records.component.html b/ui/src/app/manage/records/records.component.html index 1fba79b68..71583252c 100644 --- a/ui/src/app/manage/records/records.component.html +++ b/ui/src/app/manage/records/records.component.html @@ -1,7 +1,9 @@ -

Audit Records

+

{{ 'auditRecords.title' | translate }}

- + Audit Records (clrDgColumnResize)="updateContext('sizeId', $event)" [style.width.px]="context.sizeId | datagridcolumn: datagrid:contextName:0 | async" > - ID + {{ 'auditRecords.id' | translate }} Audit Records [clrFilterValue]="context.dates || []" [style.width.px]="context.sizeCreatedOn | datagridcolumn: datagrid:contextName | async" > - Created On + {{ 'auditRecords.createdOn' | translate }} @@ -33,7 +35,7 @@

Audit Records

[style.width.px]="context.sizeAuditAction | datagridcolumn: datagrid:contextName | async" > - Actions + {{ 'auditRecords.actions' | translate }} @@ -48,7 +50,7 @@

Audit Records

[style.width.px]="context.sizeAuditOperation | datagridcolumn: datagrid:contextName | async" > - Operations + {{ 'auditRecords.operations' | translate }} @@ -63,7 +65,7 @@

Audit Records

[style.width.px]="context.sizeCorrelationId | datagridcolumn: datagrid:contextName | async" > - Operation ID + {{ 'auditRecords.operationID' | translate }} @@ -74,7 +76,7 @@

Audit Records

[style.width.px]="context.sizeCreatedBy | datagridcolumn: datagrid:contextName | async" > - Create by + {{ 'auditRecords.createBy' | translate }} @@ -85,7 +87,7 @@

Audit Records

[style.width.px]="context.sizePlatformName | datagridcolumn: datagrid:contextName | async" > - Platform name + {{ 'auditRecords.platformName' | translate }} @@ -108,46 +110,60 @@

Audit Records

>{{ record.platformName || 'N/A' }} - No results found. + {{ 'auditRecords.noResult' | translate }} Record {{ detail.auditRecordId }}
 NameType{{ 'applications.main.name' | translate }}{{ 'applications.main.type' | translate }}  
- +
- + - + - + - + - + - + - + - + @@ -163,8 +179,13 @@

Audit Records

[clrDgPageSize]="context.size" [clrDgPage]="context.current" > - Records per page - {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ page?.total }} records + {{ + 'auditRecords.recordsPerPage' | translate + }} + {{ + 'auditRecords.pagination' + | translate: {first: pagination.firstItem + 1, last: pagination.lastItem + 1, total: page?.total} + }} diff --git a/ui/src/app/manage/records/records.component.spec.ts b/ui/src/app/manage/records/records.component.spec.ts index 326a7a552..13490c052 100644 --- a/ui/src/app/manage/records/records.component.spec.ts +++ b/ui/src/app/manage/records/records.component.spec.ts @@ -16,8 +16,9 @@ import {DatetimePipe} from '../../shared/pipe/datetime.pipe'; import {RoleDirective} from '../../security/directive/role.directive'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {SettingsServiceMock} from '../../tests/service/settings.service.mock'; -import {ConfirmComponent} from '../../shared/component/confirm/confirm.component'; import {DatagridColumnPipe} from '../../shared/pipe/datagrid-column.pipe'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('manage/records/records.component.ts', () => { let component: RecordsComponent; @@ -35,7 +36,12 @@ describe('manage/records/records.component.ts', () => { RoleDirective, DatagridColumnPipe ], - imports: [FormsModule, ClarityModule, BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/tools/cleanup/cleanup.component.html b/ui/src/app/manage/tools/cleanup/cleanup.component.html index d976a0220..d45178871 100644 --- a/ui/src/app/manage/tools/cleanup/cleanup.component.html +++ b/ui/src/app/manage/tools/cleanup/cleanup.component.html @@ -1,23 +1,24 @@ -

Confirm Clean Up Task Execution(s)

+

{{ 'tools.modal.cleanUp.title' | translate }}

-

- This action will remove {{ status === 'all' ? count.all : count.completed }} execution(s). Are - you sure? -

+

- Removing data... + {{ 'tools.modal.cleanUp.removing' | translate }}
- Loading... + {{ 'commons.loading' | translate }}
- +
diff --git a/ui/src/app/manage/tools/cleanup/cleanup.component.spec.ts b/ui/src/app/manage/tools/cleanup/cleanup.component.spec.ts index 8c1915247..1938c4da3 100644 --- a/ui/src/app/manage/tools/cleanup/cleanup.component.spec.ts +++ b/ui/src/app/manage/tools/cleanup/cleanup.component.spec.ts @@ -10,6 +10,8 @@ import {By} from '@angular/platform-browser'; import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {CleanupComponent} from './cleanup.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('manage/tools/cleanup/cleanup.component.ts', () => { let component: CleanupComponent; @@ -19,7 +21,13 @@ describe('manage/tools/cleanup/cleanup.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [CleanupComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/tools/cleanup/cleanup.component.ts b/ui/src/app/manage/tools/cleanup/cleanup.component.ts index d274c54f6..d2b53e1f4 100644 --- a/ui/src/app/manage/tools/cleanup/cleanup.component.ts +++ b/ui/src/app/manage/tools/cleanup/cleanup.component.ts @@ -1,4 +1,5 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core'; +import {TranslateService} from '@ngx-translate/core'; import {TaskService} from '../../../shared/api/task.service'; import {NotificationService} from '../../../shared/service/notification.service'; @@ -14,7 +15,11 @@ export class CleanupComponent { status = 'all'; @Output() onCleaned = new EventEmitter(); - constructor(private taskService: TaskService, private notificationService: NotificationService) {} + constructor( + private taskService: TaskService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(status: string): void { this.status = status; @@ -23,7 +28,10 @@ export class CleanupComponent { this.count = count; this.loading = false; if (this.count.all === 0) { - this.notificationService.warning('No execution', 'There is no execution.'); + this.notificationService.warning( + this.translate.instant('tools.modal.cleanUp.message.warningNoExecutionTitle'), + this.translate.instant('tools.modal.cleanUp.message.warningNoExecutionContent') + ); this.isOpen = false; } }); @@ -36,14 +44,16 @@ export class CleanupComponent { this.taskService.taskExecutionsClean(null, this.status === 'completed').subscribe( () => { this.notificationService.success( - 'Clean up execution(s)', - `${this.status === 'completed' ? this.count.completed : this.count.all} execution(s) cleaned up.` + this.translate.instant('tools.modal.cleanUp.message.successTitle'), + this.translate.instant('tools.modal.cleanUp.message.successContent', { + count: this.status === 'completed' ? this.count.completed : this.count.all + }) ); this.onCleaned.emit(this.count); this.isOpen = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.isOpen = false; } ); diff --git a/ui/src/app/manage/tools/stream/export.component.spec.ts b/ui/src/app/manage/tools/stream/export.component.spec.ts index 51351f792..8817cc89b 100644 --- a/ui/src/app/manage/tools/stream/export.component.spec.ts +++ b/ui/src/app/manage/tools/stream/export.component.spec.ts @@ -11,6 +11,8 @@ import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {NotificationServiceMock} from '../../../tests/service/notification.service.mock'; import {ImportExportServiceMock} from '../../../tests/service/import-export.service.mock'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('manage/tools/stream/export.component.ts', () => { let component: StreamExportComponent; @@ -20,7 +22,14 @@ describe('manage/tools/stream/export.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [StreamExportComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/tools/stream/export.component.ts b/ui/src/app/manage/tools/stream/export.component.ts index 37f7d9c7e..d317d6770 100644 --- a/ui/src/app/manage/tools/stream/export.component.ts +++ b/ui/src/app/manage/tools/stream/export.component.ts @@ -3,20 +3,18 @@ import {StreamPage} from '../../../shared/model/stream.model'; import {StreamService} from '../../../shared/api/stream.service'; import {ImportExportService} from '../../../shared/service/import-export.service'; import {NotificationService} from '../../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-manage-stream-export', template: ` -

Export stream(s)

+

{{ 'tools.modal.exportStreams.title' | translate }}

-
- You can create an export of your selected streams.
- This operation will generate and download a JSON file. -
+
- Name - Definition + {{ 'tools.modal.exportStreams.name' | translate }} + {{ 'tools.modal.exportStreams.definition' | translate }} {{ stream.name }} @@ -27,12 +25,14 @@ import {NotificationService} from '../../../shared/service/notification.service'
- Exporting stream(s) ... + {{ 'tools.modal.exportStreams.exporting' | translate }}
- +
@@ -47,7 +47,8 @@ export class StreamExportComponent { constructor( private streamService: StreamService, private notificationService: NotificationService, - private importExportService: ImportExportService + private importExportService: ImportExportService, + private translate: TranslateService ) {} open(): void { @@ -61,11 +62,17 @@ export class StreamExportComponent { run(): void { if (this.selected.length === 0) { - this.notificationService.error('No stream selected', 'Please, select stream(s) to export.'); + this.notificationService.error( + this.translate.instant('tools.modal.exportStreams.message.errorNoStreamTitle'), + this.translate.instant('tools.modal.exportStreams.message.errorNoStreamContent') + ); } else { this.isRunning = true; this.importExportService.streamsExport(this.selected).subscribe(() => { - this.notificationService.success('Stream(s) export', 'Stream(s) has been exported.'); + this.notificationService.success( + this.translate.instant('tools.modal.exportStreams.message.successTitle'), + this.translate.instant('tools.modal.exportStreams.message.successContent') + ); this.isOpen = false; }); } diff --git a/ui/src/app/manage/tools/stream/import.component.spec.ts b/ui/src/app/manage/tools/stream/import.component.spec.ts index 7fe39e4a0..e8e7141bc 100644 --- a/ui/src/app/manage/tools/stream/import.component.spec.ts +++ b/ui/src/app/manage/tools/stream/import.component.spec.ts @@ -12,6 +12,8 @@ import {ImportExportServiceMock} from '../../../tests/service/import-export.serv import {StreamImportComponent} from './import.component'; import {throwError} from 'rxjs'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('manage/tools/stream/import.component.ts', () => { let component: StreamImportComponent; @@ -21,7 +23,13 @@ describe('manage/tools/stream/import.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [StreamImportComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/tools/stream/import.component.ts b/ui/src/app/manage/tools/stream/import.component.ts index 458911f1e..5406049da 100644 --- a/ui/src/app/manage/tools/stream/import.component.ts +++ b/ui/src/app/manage/tools/stream/import.component.ts @@ -1,6 +1,7 @@ import {Component} from '@angular/core'; import {NotificationService} from '../../../shared/service/notification.service'; import {ImportExportService} from '../../../shared/service/import-export.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-manage-stream-import', @@ -10,26 +11,23 @@ import {ImportExportService} from '../../../shared/service/import-export.service [clrModalClosable]="view !== 'loading'" [clrModalSize]="view === 'result' ? 'lg' : 'md'" > -

Import stream(s)

+

{{ 'tools.modal.importStreams.title' | translate }}

-
- You can import your streams from a JSON file.
- The file needs to be modified for sensitive properties before importing. -
+
- +
- + - +
- File: {{ file?.name }}{{ file?.name }}
- Duration: {{ result.duration }}s + {{ 'tools.modal.importStreams.duration' | translate }}: {{ result.duration }}s
-

{{ result.error.length }} error(s)

+

{{ 'tools.modal.importStreams.errors' | translate: {count: result.error.length} }}

  - Description + {{ 'tools.modal.importStreams.description' | translate }} @@ -66,18 +64,18 @@ import {ImportExportService} from '../../../shared/service/import-export.service {{ stream.dslText }}
- Message: {{ stream.message }}
- Index: {{ i }} + {{ 'tools.modal.importStreams.errorMessage' | translate }}: {{ stream.message }}
+ {{ 'tools.modal.importStreams.index' | translate }}: {{ i }}
-

{{ result.success.length }} stream(s) created

+

{{ 'tools.modal.importStreams.success' | translate: {count: result.success.length} }}

  - Description + {{ 'tools.modal.importStreams.description' | translate }} @@ -96,11 +94,11 @@ import {ImportExportService} from '../../../shared/service/import-export.service
- Importing stream(s) ... + {{ 'tools.modal.importStreams.importing' | translate }}
@@ -126,7 +124,11 @@ export class StreamImportComponent { duration: 0 }; - constructor(private notificationService: NotificationService, private importExportService: ImportExportService) {} + constructor( + private notificationService: NotificationService, + private importExportService: ImportExportService, + private translate: TranslateService + ) {} open(): void { this.result = { @@ -150,7 +152,10 @@ export class StreamImportComponent { run(): void { if (!this.file) { - this.notificationService.error('Invalid file', 'Please, select a file.'); + this.notificationService.error( + this.translate.instant('tools.modal.importStreams.message.errorSelectFileTitle'), + this.translate.instant('tools.modal.importStreams.message.errorSelectFileContent') + ); return; } const date = new Date().getTime(); @@ -167,7 +172,10 @@ export class StreamImportComponent { }, () => { this.view = 'file'; - this.notificationService.error('Invalid file', 'The file is not valid.'); + this.notificationService.error( + this.translate.instant('tools.modal.importStreams.message.errorInvalidFileTitle'), + this.translate.instant('tools.modal.importStreams.message.errorInvalidFileContent') + ); } ); } diff --git a/ui/src/app/manage/tools/task/export.component.spec.ts b/ui/src/app/manage/tools/task/export.component.spec.ts index a7afe7adc..2b86c9c34 100644 --- a/ui/src/app/manage/tools/task/export.component.spec.ts +++ b/ui/src/app/manage/tools/task/export.component.spec.ts @@ -11,6 +11,8 @@ import {NotificationServiceMock} from '../../../tests/service/notification.servi import {ImportExportServiceMock} from '../../../tests/service/import-export.service.mock'; import {TaskExportComponent} from './export.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('manage/tools/task/export.component.ts', () => { let component: TaskExportComponent; @@ -20,7 +22,13 @@ describe('manage/tools/task/export.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [TaskExportComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/tools/task/export.component.ts b/ui/src/app/manage/tools/task/export.component.ts index 2a2b33b42..34643d4bf 100644 --- a/ui/src/app/manage/tools/task/export.component.ts +++ b/ui/src/app/manage/tools/task/export.component.ts @@ -3,20 +3,18 @@ import {ImportExportService} from '../../../shared/service/import-export.service import {NotificationService} from '../../../shared/service/notification.service'; import {TaskPage} from '../../../shared/model/task.model'; import {TaskService} from '../../../shared/api/task.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-manage-task-export', template: ` -

Export task(s)

+

{{ 'tools.modal.exportTasks.title' | translate }}

-
- You can create an export of your selected tasks.
- This operation will generate and download a JSON file. -
+
- Name - Definition + {{ 'tools.modal.exportTasks.name' | translate }} + {{ 'tools.modal.exportTasks.definition' | translate }} {{ task.name }} @@ -27,12 +25,14 @@ import {TaskService} from '../../../shared/api/task.service';
- Exporting task(s) ... + {{ 'tools.modal.exportTasks.exporting' | translate }}
- +
@@ -47,7 +47,8 @@ export class TaskExportComponent { constructor( private taskService: TaskService, private notificationService: NotificationService, - private importExportService: ImportExportService + private importExportService: ImportExportService, + private translate: TranslateService ) {} open(): void { @@ -61,11 +62,17 @@ export class TaskExportComponent { run(): void { if (this.selected.length === 0) { - this.notificationService.error('No task selected', 'Please, select task(s) to export.'); + this.notificationService.error( + this.translate.instant('tools.modal.exportTasks.message.errorNoTaskTitle'), + this.translate.instant('tools.modal.exportTasks.message.errorNoTaskContent') + ); } else { this.isRunning = true; this.importExportService.tasksExport(this.selected).subscribe(() => { - this.notificationService.success('Task(s) export', 'Task(s) has been exported.'); + this.notificationService.success( + this.translate.instant('tools.modal.exportTasks.message.successTitle'), + this.translate.instant('tools.modal.exportTasks.message.successContent') + ); this.isOpen = false; }); } diff --git a/ui/src/app/manage/tools/task/import.component.spec.ts b/ui/src/app/manage/tools/task/import.component.spec.ts index 9c45e73e0..46cf88b33 100644 --- a/ui/src/app/manage/tools/task/import.component.spec.ts +++ b/ui/src/app/manage/tools/task/import.component.spec.ts @@ -12,6 +12,8 @@ import {ImportExportServiceMock} from '../../../tests/service/import-export.serv import {throwError} from 'rxjs'; import {TaskImportComponent} from './import.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('manage/tools/task/import.component.ts', () => { let component: TaskImportComponent; @@ -21,7 +23,13 @@ describe('manage/tools/task/import.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [TaskImportComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/manage/tools/task/import.component.ts b/ui/src/app/manage/tools/task/import.component.ts index 1d6159a05..525b81761 100644 --- a/ui/src/app/manage/tools/task/import.component.ts +++ b/ui/src/app/manage/tools/task/import.component.ts @@ -1,6 +1,7 @@ import {Component} from '@angular/core'; import {NotificationService} from '../../../shared/service/notification.service'; import {ImportExportService} from '../../../shared/service/import-export.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-manage-task-import', @@ -10,26 +11,23 @@ import {ImportExportService} from '../../../shared/service/import-export.service [clrModalClosable]="view !== 'loading'" [clrModalSize]="view === 'result' ? 'lg' : 'md'" > -

Import task(s)

+

{{ 'tools.modal.importTasks.title' | translate }}

-
- You can import your tasks from a JSON file.
- The file needs to be modified for sensitive properties before importing. -
+
- +
- + - +
- File: {{ file?.name }}{{ file?.name }}
- Duration: {{ result.duration }}s + {{ 'tools.modal.importTasks.duration' | translate }}: {{ result.duration }}s
-

{{ result.error.length }} error(s)

+

{{ 'tools.modal.importTasks.errors' | translate: {count: result.error.length} }}

  - Description + {{ 'tools.modal.importTasks.description' | translate }} @@ -66,18 +64,18 @@ import {ImportExportService} from '../../../shared/service/import-export.service {{ task.dslText }}
- Message: {{ task.message }}
- Index: {{ i }} + {{ 'tools.modal.importTasks.errorMessage' | translate }}: {{ task.message }}
+ {{ 'tools.modal.importTasks.index' | translate }}: {{ i }}
-

{{ result.success.length }} task(s) created

+

{{ 'tools.modal.importTasks.success' | translate: {count: result.success.length} }}

  - Description + {{ 'tools.modal.importTasks.description' | translate }} @@ -96,11 +94,11 @@ import {ImportExportService} from '../../../shared/service/import-export.service
- Importing task(s) ... + {{ 'tools.modal.importTasks.importing' | translate }}
@@ -126,7 +124,11 @@ export class TaskImportComponent { duration: 0 }; - constructor(private notificationService: NotificationService, private importExportService: ImportExportService) {} + constructor( + private notificationService: NotificationService, + private importExportService: ImportExportService, + private translate: TranslateService + ) {} open(): void { this.result = { @@ -150,7 +152,10 @@ export class TaskImportComponent { run(): void { if (!this.file) { - this.notificationService.error('Invalid file', 'Please, select a file.'); + this.notificationService.error( + this.translate.instant('tools.modal.importTasks.message.errorSelectFileTitle'), + this.translate.instant('tools.modal.importTasks.message.errorSelectFileContent') + ); return; } const date = new Date().getTime(); @@ -167,7 +172,10 @@ export class TaskImportComponent { }, () => { this.view = 'file'; - this.notificationService.error('Invalid file', 'The file is not valid.'); + this.notificationService.error( + this.translate.instant('tools.modal.importTasks.message.errorInvalidFileTitle'), + this.translate.instant('tools.modal.importTasks.message.errorInvalidFileContent') + ); } ); } diff --git a/ui/src/app/manage/tools/tools.component.html b/ui/src/app/manage/tools/tools.component.html index 0d438aeff..cfd35ed86 100644 --- a/ui/src/app/manage/tools/tools.component.html +++ b/ui/src/app/manage/tools/tools.component.html @@ -1,49 +1,53 @@ -

Tools

+

{{ 'tools.title' | translate }}

- + - +
- + diff --git a/ui/src/app/manage/tools/tools.component.spec.ts b/ui/src/app/manage/tools/tools.component.spec.ts index f7881ab44..ea343aa32 100644 --- a/ui/src/app/manage/tools/tools.component.spec.ts +++ b/ui/src/app/manage/tools/tools.component.spec.ts @@ -20,6 +20,8 @@ import {By} from '@angular/platform-browser'; import {RoleDirective} from '../../security/directive/role.directive'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {CleanupComponent} from './cleanup/cleanup.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('manage/tools/import-export.component.ts', () => { let component: ToolsComponent; @@ -39,7 +41,13 @@ describe('manage/tools/import-export.component.ts', () => { CardComponent, RoleDirective ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/security/component/authentication-required.component.spec.ts b/ui/src/app/security/component/authentication-required.component.spec.ts index 648cf3aac..d0f7a0fce 100644 --- a/ui/src/app/security/component/authentication-required.component.spec.ts +++ b/ui/src/app/security/component/authentication-required.component.spec.ts @@ -8,6 +8,8 @@ import {AboutServiceMock} from '../../tests/api/about.service.mock'; import {AppServiceMock} from '../../tests/api/app.service.mock'; import {NotificationServiceMock} from '../../tests/service/notification.service.mock'; import {AuthenticationRequiredComponent} from './authentication-required.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('security/component/authentication-required.component.ts', () => { let component: AuthenticationRequiredComponent; @@ -17,7 +19,13 @@ describe('security/component/authentication-required.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [AuthenticationRequiredComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/security/component/authentication-required.component.ts b/ui/src/app/security/component/authentication-required.component.ts index 61aa5670f..1fa1bd426 100644 --- a/ui/src/app/security/component/authentication-required.component.ts +++ b/ui/src/app/security/component/authentication-required.component.ts @@ -2,8 +2,8 @@ import {Component} from '@angular/core'; @Component({ template: ` -

Authentication required

-

Please sign in.

+

{{ 'security.authenticationRequired.title' | translate }}

+

{{ 'security.authenticationRequired.description' | translate }}

` }) export class AuthenticationRequiredComponent {} diff --git a/ui/src/app/security/component/feature-disabled.component.spec.ts b/ui/src/app/security/component/feature-disabled.component.spec.ts index d5deb13de..b62afb797 100644 --- a/ui/src/app/security/component/feature-disabled.component.spec.ts +++ b/ui/src/app/security/component/feature-disabled.component.spec.ts @@ -8,6 +8,8 @@ import {AboutServiceMock} from '../../tests/api/about.service.mock'; import {AppServiceMock} from '../../tests/api/app.service.mock'; import {NotificationServiceMock} from '../../tests/service/notification.service.mock'; import {FeatureDisabledComponent} from './feature-disabled.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('security/component/feature-disabled.component.ts', () => { let component: FeatureDisabledComponent; @@ -17,7 +19,13 @@ describe('security/component/feature-disabled.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [FeatureDisabledComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/security/component/feature-disabled.component.ts b/ui/src/app/security/component/feature-disabled.component.ts index bb023c712..133db076e 100644 --- a/ui/src/app/security/component/feature-disabled.component.ts +++ b/ui/src/app/security/component/feature-disabled.component.ts @@ -2,8 +2,8 @@ import {Component} from '@angular/core'; @Component({ template: ` -

Feature Disabled

-

The requested feature is disabled on the server.

+

{{ 'security.featureDisabled.title' | translate }}

+

{{ 'security.featureDisabled.description' | translate }}

` }) export class FeatureDisabledComponent {} diff --git a/ui/src/app/security/component/roles-missing.component.spec.ts b/ui/src/app/security/component/roles-missing.component.spec.ts index decc48f95..d57ac5b8d 100644 --- a/ui/src/app/security/component/roles-missing.component.spec.ts +++ b/ui/src/app/security/component/roles-missing.component.spec.ts @@ -8,6 +8,8 @@ import {AboutServiceMock} from '../../tests/api/about.service.mock'; import {AppServiceMock} from '../../tests/api/app.service.mock'; import {NotificationServiceMock} from '../../tests/service/notification.service.mock'; import {RolesMissingComponent} from './roles-missing.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('security/component/roles-missing.component.ts', () => { let component: RolesMissingComponent; @@ -17,7 +19,13 @@ describe('security/component/roles-missing.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [RolesMissingComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/security/component/roles-missing.component.ts b/ui/src/app/security/component/roles-missing.component.ts index 9a240c654..a388ebd43 100644 --- a/ui/src/app/security/component/roles-missing.component.ts +++ b/ui/src/app/security/component/roles-missing.component.ts @@ -2,8 +2,8 @@ import {Component} from '@angular/core'; @Component({ template: ` -

Roles Missing

-

It appears that you are missing the proper roles. Please contact your administrator to rectify the situation.

+

{{ 'security.rolesMissing.title' | translate }}

+

{{ 'security.rolesMissing.description' | translate }}

` }) export class RolesMissingComponent {} diff --git a/ui/src/app/security/security.module.ts b/ui/src/app/security/security.module.ts index 1d093edce..cee74dc1a 100644 --- a/ui/src/app/security/security.module.ts +++ b/ui/src/app/security/security.module.ts @@ -14,6 +14,7 @@ import {HTTP_INTERCEPTORS} from '@angular/common/http'; import * as fromSecurity from './store/security.reducer'; import {SecurityEffect} from './store/security.effect'; import {SecurityInterceptor} from './support/security.interceptor'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [RoleDirective, RolesMissingComponent, FeatureDisabledComponent, AuthenticationRequiredComponent], @@ -22,6 +23,7 @@ import {SecurityInterceptor} from './support/security.interceptor'; ClarityModule, SharedModule, SecurityRoutingModule, + TranslateModule, StoreModule.forFeature(fromSecurity.securityFeatureKey, fromSecurity.reducer), EffectsModule.forFeature([SecurityEffect]) ], diff --git a/ui/src/app/settings/settings.module.ts b/ui/src/app/settings/settings.module.ts index 334a16f5b..f48db97bb 100644 --- a/ui/src/app/settings/settings.module.ts +++ b/ui/src/app/settings/settings.module.ts @@ -8,6 +8,7 @@ import {SettingsRoutingModule} from './settings-routing.module'; import {SettingsComponent} from './settings/settings.component'; import * as fromSettings from './store/settings.reducer'; import {SettingsEffect} from './store/settings.effect'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [SettingsComponent], @@ -15,6 +16,7 @@ import {SettingsEffect} from './store/settings.effect'; CommonModule, ClarityModule, SharedModule, + TranslateModule, SettingsRoutingModule, StoreModule.forFeature(fromSettings.settingsFeatureKey, fromSettings.reducer), EffectsModule.forFeature([SettingsEffect]) diff --git a/ui/src/app/settings/settings.service.ts b/ui/src/app/settings/settings.service.ts index b26edf9fc..7b63238cb 100644 --- a/ui/src/app/settings/settings.service.ts +++ b/ui/src/app/settings/settings.service.ts @@ -7,6 +7,10 @@ import {loaded, update} from './store/settings.action'; import {SettingModel} from '../shared/model/setting.model'; import {LocalStorageService} from 'angular-2-local-storage'; +export const LANGUAGES = ['en']; +// export const LANGUAGES = ['en', 'fr', 'de']; +const DEFAULT_LANG = 'en'; + @Injectable({ providedIn: 'root' }) @@ -15,12 +19,27 @@ export class SettingsService { load(): Observable { const isDarkConfig = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches; - let activeValue: string = isDarkConfig ? 'dark' : 'default'; + let activeThemeValue: string = isDarkConfig ? 'dark' : 'default'; + + let activeLanguageValue: string = DEFAULT_LANG; + if (navigator?.language) { + activeLanguageValue = navigator.language.split('-')[0]; + } + if (LANGUAGES.indexOf(activeLanguageValue) === -1) { + activeLanguageValue = DEFAULT_LANG; + } + if (this.localStorageService.get('themeActiveValue')) { - activeValue = this.localStorageService.get('themeActiveValue'); + activeThemeValue = this.localStorageService.get('themeActiveValue'); } + + if (this.localStorageService.get('languageActiveValue')) { + activeLanguageValue = this.localStorageService.get('languageActiveValue'); + } + const settings: SettingModel[] = [ - {name: 'theme-active', value: activeValue}, + {name: 'language-active', value: activeLanguageValue}, + {name: 'theme-active', value: activeThemeValue}, {name: 'results-per-page', value: '20'} ]; return of(settings).pipe(tap(sett => this.store.dispatch(loaded({settings: sett})))); @@ -30,6 +49,9 @@ export class SettingsService { if (setting.name === 'theme-active') { this.localStorageService.set('themeActiveValue', setting.value); } + if (setting.name === 'language-active') { + this.localStorageService.set('languageActiveValue', setting.value); + } return from(new Promise(resolve => resolve())); } diff --git a/ui/src/app/settings/settings/settings.component.html b/ui/src/app/settings/settings/settings.component.html index f4b9e6ff8..9cdb7f8af 100644 --- a/ui/src/app/settings/settings/settings.component.html +++ b/ui/src/app/settings/settings/settings.component.html @@ -1,23 +1,35 @@
-

Settings

+

{{ 'settings.title' | translate }}

+ + + + {{ 'settings.languageDescription' | translate }} + - + - You can choose between dark and default theme + {{ 'settings.themeDescription' | translate }} - + - You can choose the number of results per page. + + {{ 'settings.resultsDescription' | translate }} +
- +
diff --git a/ui/src/app/settings/settings/settings.component.spec.ts b/ui/src/app/settings/settings/settings.component.spec.ts index 349227dbe..d4ec76be9 100644 --- a/ui/src/app/settings/settings/settings.component.spec.ts +++ b/ui/src/app/settings/settings/settings.component.spec.ts @@ -6,6 +6,8 @@ import {ClarityModule} from '@clr/angular'; import {SettingsComponent} from './settings.component'; import * as fromSettings from '../store/settings.reducer'; import {LocalStorageModule, LocalStorageService} from 'angular-2-local-storage'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('SettingsComponent', () => { let component: SettingsComponent; @@ -25,6 +27,7 @@ describe('SettingsComponent', () => { HttpClientModule, ClarityModule, StoreModule.forRoot({}), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), LocalStorageModule.forRoot({ prefix: 'dataflow-', storageType: 'localStorage' diff --git a/ui/src/app/settings/settings/settings.component.ts b/ui/src/app/settings/settings/settings.component.ts index 4ae257719..6a313a2a2 100644 --- a/ui/src/app/settings/settings/settings.component.ts +++ b/ui/src/app/settings/settings/settings.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit} from '@angular/core'; -import {themeActiveKey} from '../store/settings.reducer'; import {SettingsService} from '../settings.service'; import {ModalDialog} from '../../shared/service/modal.service'; import {SettingModel} from '../../shared/model/setting.model'; +import {LANGUAGES} from '../settings.service'; @Component({ selector: 'app-settings', @@ -11,6 +11,8 @@ import {SettingModel} from '../../shared/model/setting.model'; export class SettingsComponent extends ModalDialog implements OnInit { themeActive: SettingModel; resultsPerPage: SettingModel; + languageActive: SettingModel; + languages: Array = LANGUAGES; constructor(private settingsService: SettingsService) { super(); @@ -20,6 +22,7 @@ export class SettingsComponent extends ModalDialog implements OnInit { this.settingsService.getSettings().subscribe(settings => { this.themeActive = settings.find(st => st.name === 'theme-active'); this.resultsPerPage = settings.find(st => st.name === 'results-per-page'); + this.languageActive = settings.find(st => st.name === 'language-active'); }); } @@ -30,4 +33,8 @@ export class SettingsComponent extends ModalDialog implements OnInit { resultPerPageSettingOnChange(count: string): void { this.settingsService.dispatch({name: 'results-per-page', value: count}); } + + languageActiveSettingOnChange(language: string): void { + this.settingsService.dispatch({name: 'language-active', value: language}); + } } diff --git a/ui/src/app/settings/store/settings.effect.spec.ts b/ui/src/app/settings/store/settings.effect.spec.ts index 725b877d6..c8b27db17 100644 --- a/ui/src/app/settings/store/settings.effect.spec.ts +++ b/ui/src/app/settings/store/settings.effect.spec.ts @@ -9,6 +9,8 @@ import {SettingsEffect} from './settings.effect'; import * as fromSettings from './settings.reducer'; import {ThemeService} from '../../layout/theme/theme.service'; import {SettingsService} from '../settings.service'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('settings/store/settings.effect.ts', () => { let effects: SettingsEffect; @@ -20,6 +22,7 @@ describe('settings/store/settings.effect.ts', () => { beforeEach( waitForAsync(() => { TestBed.configureTestingModule({ + imports: [TranslateTestingModule.withTranslations('en', TRANSLATIONS)], providers: [ SettingsEffect, provideMockActions(() => actions$), @@ -56,11 +59,12 @@ describe('settings/store/settings.effect.ts', () => { it('should switch initial theme', () => { actions$ = of( SettingsActions.loaded({ - settings: [{name: fromSettings.themeActiveKey, value: 'value1'}] + settings: [ + {name: fromSettings.themeActiveKey, value: 'value1'}, + {name: fromSettings.languageActiveKey, value: 'value1'} + ] }) ); - const expected = cold('(a|)', {a: 'value1'}); - expect(effects.initialSettings$).toBeObservable(expected); expect(themeServiceSpy.switchTheme).toHaveBeenCalledWith('value1'); }); diff --git a/ui/src/app/settings/store/settings.effect.ts b/ui/src/app/settings/store/settings.effect.ts index d1eb4e485..af7295803 100644 --- a/ui/src/app/settings/store/settings.effect.ts +++ b/ui/src/app/settings/store/settings.effect.ts @@ -5,7 +5,8 @@ import {of} from 'rxjs'; import {SettingsService} from '../settings.service'; import * as SettingsActions from './settings.action'; import {ThemeService} from '../../layout/theme/theme.service'; -import {themeActiveKey} from './settings.reducer'; +import {languageActiveKey, themeActiveKey} from './settings.reducer'; +import {TranslateService} from '@ngx-translate/core'; @Injectable() export class SettingsEffect { @@ -28,9 +29,11 @@ export class SettingsEffect { this.actions$.pipe( ofType(SettingsActions.loaded), take(1), - map(action => action.settings.find(s => s.name === themeActiveKey)?.value as string), - tap(theme => { + tap(action => { + const theme = action.settings.find(s => s.name === themeActiveKey)?.value as string; + const language = action.settings.find(s => s.name === languageActiveKey)?.value as string; this.themeService.switchTheme(theme); + this.translate.use(language); }) ), {dispatch: false} @@ -49,9 +52,23 @@ export class SettingsEffect { {dispatch: false} ); + updateLanguage$ = createEffect( + () => + this.actions$.pipe( + ofType(SettingsActions.updateOk), + tap(action => { + if (action.setting.name === languageActiveKey) { + this.translate.use(action.setting.value as string); + } + }) + ), + {dispatch: false} + ); + constructor( private actions$: Actions, private settingsService: SettingsService, - private themeService: ThemeService + private themeService: ThemeService, + private translate: TranslateService ) {} } diff --git a/ui/src/app/settings/store/settings.reducer.spec.ts b/ui/src/app/settings/store/settings.reducer.spec.ts index a7049575b..3626b68f9 100644 --- a/ui/src/app/settings/store/settings.reducer.spec.ts +++ b/ui/src/app/settings/store/settings.reducer.spec.ts @@ -10,17 +10,26 @@ describe('settings/store/settings.reducer.ts', () => { it('should load and update', () => { let expectedState: fromSettings.SettingsState = { - settings: [{name: fromSettings.themeActiveKey, value: 'value1'}] + settings: [ + {name: fromSettings.themeActiveKey, value: 'value1'}, + {name: fromSettings.languageActiveKey, value: 'value1'} + ] }; let newState = fromSettings.reducer( undefined, SettingsActions.loaded({ - settings: [{name: fromSettings.themeActiveKey, value: 'value1'}] + settings: [ + {name: fromSettings.themeActiveKey, value: 'value1'}, + {name: fromSettings.languageActiveKey, value: 'value1'} + ] }) ); expect(newState).toEqual(expectedState); expectedState = { - settings: [{name: fromSettings.themeActiveKey, value: 'value2'}] + settings: [ + {name: fromSettings.themeActiveKey, value: 'value2'}, + {name: fromSettings.languageActiveKey, value: 'value1'} + ] }; newState = fromSettings.reducer( newState, diff --git a/ui/src/app/settings/store/settings.reducer.ts b/ui/src/app/settings/store/settings.reducer.ts index 55de2456c..a3570fde5 100644 --- a/ui/src/app/settings/store/settings.reducer.ts +++ b/ui/src/app/settings/store/settings.reducer.ts @@ -5,6 +5,7 @@ import {SettingModel} from '../../shared/model/setting.model'; export const settingsFeatureKey = 'settings'; export const themeActiveKey = 'theme-active'; +export const languageActiveKey = 'language-active'; export interface SettingsState { settings: SettingModel[]; @@ -20,7 +21,10 @@ export const getSetting = (settings: SettingModel[], name: string): string => settings.find(s => s.name === name)?.value; export const initialState: SettingsState = { - settings: [{name: themeActiveKey, value: 'default'}] + settings: [ + {name: themeActiveKey, value: 'default'}, + {name: languageActiveKey, value: 'en'} + ] }; function mergeSettings(left: SettingModel[], right: SettingModel[]): SettingModel[] { @@ -40,11 +44,9 @@ function mergeSettings(left: SettingModel[], right: SettingModel[]): SettingMode function updateSettings(settings: SettingModel[], setting: SettingModel): SettingModel[] { const to = []; - let isOverride = false; settings.forEach(v => { if (v.name === setting.name) { to.push({name: v.name, value: setting.value}); - isOverride = true; } else { to.push({name: v.name, value: v.value}); } diff --git a/ui/src/app/shared/component/confirm/confirm.component.html b/ui/src/app/shared/component/confirm/confirm.component.html index ee107d946..f62575d9f 100644 --- a/ui/src/app/shared/component/confirm/confirm.component.html +++ b/ui/src/app/shared/component/confirm/confirm.component.html @@ -4,7 +4,9 @@

{{ title }}

- + diff --git a/ui/src/app/shared/component/confirm/confirm.component.ts b/ui/src/app/shared/component/confirm/confirm.component.ts index ac6f64f32..d6ccf47a0 100644 --- a/ui/src/app/shared/component/confirm/confirm.component.ts +++ b/ui/src/app/shared/component/confirm/confirm.component.ts @@ -1,5 +1,5 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {App} from '../../model/app.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-confirm', @@ -9,8 +9,13 @@ import {App} from '../../model/app.model'; export class ConfirmComponent { isOpen = false; @Output() onConfirmed = new EventEmitter(); - @Input() title = 'Confirm action'; - @Input() yes = 'Yes'; + @Input() title; + @Input() yes; + + constructor(private translate: TranslateService) { + this.title = this.translate.instant('commons.confirmAction'); + this.yes = this.translate.instant('commons.yes'); + } open(): void { this.isOpen = true; diff --git a/ui/src/app/shared/component/key-value/key-value.component.spec.ts b/ui/src/app/shared/component/key-value/key-value.component.spec.ts index cacf8504d..6c5108991 100644 --- a/ui/src/app/shared/component/key-value/key-value.component.spec.ts +++ b/ui/src/app/shared/component/key-value/key-value.component.spec.ts @@ -3,6 +3,8 @@ import {FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; import {KeyValueComponent} from './key-value.component'; import {ClipboardCopyService} from '../../service/clipboard-copy.service'; import {NotificationServiceMock} from '../../../tests/service/notification.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('KeyValueComponent', () => { let component: KeyValueComponent; @@ -12,7 +14,7 @@ describe('KeyValueComponent', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [KeyValueComponent], - imports: [FormsModule, ReactiveFormsModule], + imports: [FormsModule, TranslateTestingModule.withTranslations('en', TRANSLATIONS), ReactiveFormsModule], providers: [NotificationServiceMock.provider, ClipboardCopyService] }).compileComponents(); }) diff --git a/ui/src/app/shared/component/key-value/key-value.component.ts b/ui/src/app/shared/component/key-value/key-value.component.ts index e7e5fe460..0a666938d 100644 --- a/ui/src/app/shared/component/key-value/key-value.component.ts +++ b/ui/src/app/shared/component/key-value/key-value.component.ts @@ -4,6 +4,7 @@ import {KeyValueValidator} from './key-value.validator'; import {KeyValueValidators} from './key-value.interface'; import {ClipboardCopyService} from '../../service/clipboard-copy.service'; import {NotificationService} from '../../service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-key-value', @@ -40,7 +41,7 @@ import {NotificationService} from '../../service/notification.service'; type="file" (change)="fileChange($event)" /> - Import a file + {{ 'commons.importFile' | translate }} Copy to the clipboard
@@ -63,7 +64,11 @@ export class KeyValueComponent implements ControlValueAccessor, OnChanges, OnIni lines: Array = []; @ViewChild('propertiesFile', {static: true}) propertiesFile; - constructor(private clipboardCopyService: ClipboardCopyService, private notificationService: NotificationService) { + constructor( + private clipboardCopyService: ClipboardCopyService, + private notificationService: NotificationService, + private translate: TranslateService + ) { this.form = new FormGroup({ textarea: new FormControl(''), file: new FormControl('') @@ -147,6 +152,9 @@ export class KeyValueComponent implements ControlValueAccessor, OnChanges, OnIni return; } this.clipboardCopyService.executeCopy(this.form.get('textarea').value); - this.notificationService.success('Content copied', 'The content have been copied to your clipboard.'); + this.notificationService.success( + this.translate.instant('commons.message.copiedTitle'), + this.translate.instant('commons.message.copiedContent') + ); } } diff --git a/ui/src/app/shared/component/search/search.component.html b/ui/src/app/shared/component/search/search.component.html index bb074e67e..271761164 100644 --- a/ui/src/app/shared/component/search/search.component.html +++ b/ui/src/app/shared/component/search/search.component.html @@ -10,7 +10,7 @@ (keydown)="onKeyDown($event)" id="quick_search" type="text" - placeholder="Search for keywords ..." + placeholder="{{ 'layout.quicksearch.input' | translate }}" #inputQuickSearch />

- Instance + {{ 'runtime.details.instance' | translate }} {{ item.instanceId }}  {{ item.state }}

- - - - - - - -
@@ -48,6 +40,6 @@

- +
diff --git a/ui/src/app/streams/runtime/details/details.component.spec.ts b/ui/src/app/streams/runtime/details/details.component.spec.ts index 60975222b..938791d2f 100644 --- a/ui/src/app/streams/runtime/details/details.component.spec.ts +++ b/ui/src/app/streams/runtime/details/details.component.spec.ts @@ -14,6 +14,8 @@ import {RuntimeStreamPage} from '../../../shared/model/runtime.model'; import {GET_RUNTIME} from '../../../tests/data/runtime'; import {By} from '@angular/platform-browser'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/runtime/details/details.component.ts', () => { let component: DetailsComponent; @@ -23,7 +25,13 @@ describe('streams/runtime/details/details.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [DetailsComponent, DetailsComponent, GrafanaRuntimeAppDirective, GrafanaRuntimeInstanceDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/runtime/runtime.component.html b/ui/src/app/streams/runtime/runtime.component.html index 8647aa69b..0b141cffe 100644 --- a/ui/src/app/streams/runtime/runtime.component.html +++ b/ui/src/app/streams/runtime/runtime.component.html @@ -1,23 +1,13 @@ -

Runtime

+

{{ 'runtime.main.title' | translate }}

- - - - - - - - - -
- +
-

- Stream {{ runtimeStream.name }} -

+

@@ -29,17 +19,17 @@

{{ runtimeApp.appInstances.length }} - instances - instance + {{ 'runtime.main.instances' | translate }} + {{ 'runtime.main.instance' | translate }}

@@ -54,7 +44,7 @@

- There are currently no applications running. +

@@ -62,7 +52,7 @@

- Loading runtime... + {{ 'runtime.main.loading' | translate }}
diff --git a/ui/src/app/streams/runtime/runtime.component.spec.ts b/ui/src/app/streams/runtime/runtime.component.spec.ts index e1ab98006..46c0e6f3c 100644 --- a/ui/src/app/streams/runtime/runtime.component.spec.ts +++ b/ui/src/app/streams/runtime/runtime.component.spec.ts @@ -13,6 +13,8 @@ import {By} from '@angular/platform-browser'; import {GrafanaRuntimeAppDirective, GrafanaRuntimeInstanceDirective} from '../../shared/grafana/grafana.directive'; import {GrafanaServiceMock} from '../../tests/service/grafana.service.mock'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('streams/runtime/runtime.component.ts', () => { let component: RuntimeComponent; @@ -22,7 +24,13 @@ describe('streams/runtime/runtime.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [RuntimeComponent, DetailsComponent, GrafanaRuntimeAppDirective, GrafanaRuntimeInstanceDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams.module.ts b/ui/src/app/streams/streams.module.ts index 00fe96d3b..39c52b060 100644 --- a/ui/src/app/streams/streams.module.ts +++ b/ui/src/app/streams/streams.module.ts @@ -22,6 +22,7 @@ import {SecurityModule} from '../security/security.module'; import {StatusComponent} from './streams/status/status.component'; import {RollbackComponent} from './streams/rollback/rollback.component'; import {CloneComponent} from './streams/clone/clone.component'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [ @@ -50,7 +51,8 @@ import {CloneComponent} from './streams/clone/clone.component'; StreamsRoutingModule, SharedFloModule, StreamFloModule, - SecurityModule + SecurityModule, + TranslateModule ] }) export class StreamsModule {} diff --git a/ui/src/app/streams/streams/clone/clone.component.html b/ui/src/app/streams/streams/clone/clone.component.html index 5e9af4e50..bf8610173 100644 --- a/ui/src/app/streams/streams/clone/clone.component.html +++ b/ui/src/app/streams/streams/clone/clone.component.html @@ -1,6 +1,6 @@ -

Clone Stream

-

Clone Streams

+

{{ 'streams.clone.title' | translate }}

+

{{ 'streams.clone.title2' | translate }}

Clone Streams

clrLabelSize="4" style="padding: 0; margin: 0" > -
This action will create the following stream(s):
+
-
Duplicate stream name, please check input names.
+
{{ 'streams.clone.duplicateName' | translate }}
- +
{{ stream.dslText }}
- + Clone Streams class="clr-col-12 clr-col-md-10" style="width: 100%" /> - Stream name is required. + {{ + 'streams.clone.requiredName' | translate + }} - Invalid stream name (no space or special charaters). + {{ 'streams.clone.invalidName' | translate }} - Stream name must be less than 255 characters long. + {{ 'streams.clone.maxLengthName' | translate }} - Stream name is already taken. + {{ + 'streams.clone.uniqueName' | translate + }}
@@ -55,17 +61,19 @@

Clone Streams

- Loading... + {{ 'commons.loading' | translate }}
- Cloning stream(s)... + {{ 'streams.clone.cloning' | translate }}
- +
diff --git a/ui/src/app/streams/streams/clone/clone.component.spec.ts b/ui/src/app/streams/streams/clone/clone.component.spec.ts index 120136c84..04439d3c3 100644 --- a/ui/src/app/streams/streams/clone/clone.component.spec.ts +++ b/ui/src/app/streams/streams/clone/clone.component.spec.ts @@ -7,11 +7,10 @@ import {SecurityServiceMock} from '../../../tests/api/security.service.mock'; import {AboutServiceMock} from '../../../tests/api/about.service.mock'; import {NotificationServiceMock} from '../../../tests/service/notification.service.mock'; import {StreamServiceMock} from '../../../tests/api/stream.service.mock'; -import {By} from '@angular/platform-browser'; -import {throwError} from 'rxjs'; -import {Stream} from '../../../shared/model/stream.model'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; import {CloneComponent} from './clone.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('apps/streams/clone/clone.component.ts', () => { let component: CloneComponent; @@ -26,7 +25,8 @@ describe('apps/streams/clone/clone.component.ts', () => { ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule, - ReactiveFormsModule + ReactiveFormsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) ], providers: [ SecurityServiceMock.provider, diff --git a/ui/src/app/streams/streams/clone/clone.component.ts b/ui/src/app/streams/streams/clone/clone.component.ts index 4bc7428df..0a6759cc8 100644 --- a/ui/src/app/streams/streams/clone/clone.component.ts +++ b/ui/src/app/streams/streams/clone/clone.component.ts @@ -6,6 +6,7 @@ import {StreamPage, Stream} from '../../../shared/model/stream.model'; import {of} from 'rxjs'; import {concatAll} from 'rxjs/operators'; import {Utils} from '../../..//flo/stream/support/utils'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream-clone', @@ -24,7 +25,8 @@ export class CloneComponent { constructor( private streamService: StreamService, private notificationService: NotificationService, - private fb: FormBuilder + private fb: FormBuilder, + private translate: TranslateService ) {} open(streams: Array): void { @@ -73,20 +75,32 @@ export class CloneComponent { done(success: number, error: number): void { if (success > 0) { if (error > 0) { - this.notificationService.success('Stream(s) clone', 'Stream(s) have been cloned partially'); + this.notificationService.success( + this.translate.instant('streams.clone.message.partialSuccessTitle'), + this.translate.instant('streams.clone.message.partialSuccessContent') + ); } else { - this.notificationService.success('Stream(s) clone', 'Stream(s) have been cloned successfully'); + this.notificationService.success( + this.translate.instant('streams.clone.message.successTitle'), + this.translate.instant('streams.clone.message.successContent') + ); } this.onCloned.emit(true); this.cancel(); } else { - this.notificationService.error('Error(s) occurred', 'No stream(s) cloned.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('streams.clone.message.errorContent') + ); } } submit(): void { if (this.form.invalid) { - this.notificationService.error('Invalid field', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); return; } const requests = this.streams.map(stream => { @@ -110,7 +124,7 @@ export class CloneComponent { err => { count++; error++; - this.notificationService.error('Error(s) occurred', err); + this.notificationService.error(this.translate.instant('commons.message.error'), err); if (count === requests.length) { this.done(success, error); } diff --git a/ui/src/app/streams/streams/create/create.component.html b/ui/src/app/streams/streams/create/create.component.html index 4edb7c326..2fc27eab5 100644 --- a/ui/src/app/streams/streams/create/create.component.html +++ b/ui/src/app/streams/streams/create/create.component.html @@ -1,13 +1,15 @@ -

Create stream(s)

+

{{ 'streams.create.title' | translate }}

- - + + -

Create Stream(s)

-

Creating Stream(s)...

+

{{ 'streams.create.modal.create' | translate }}

+

{{ 'streams.create.modal.creating' | translate }}

@@ -22,29 +24,30 @@

Creating Stream(s)...

• {{ error }}
-
This action will create the following stream(s):
+
+
+
-
Duplicate stream name, please check input names.
+
{{ 'streams.create.modal.duplicateName' | translate }}
- +
- {{ def.def }}
- +
Creating Stream(s)...
Creating Stream(s)... class="clr-subtext" *ngIf="getControl(def.index.toString()).errors && getControl(def.index.toString()).errors.required" > - Stream name is required! + {{ 'streams.create.modal.requiredName' | translate }}
Creating Stream(s)... getControl(def.index.toString()).errors && getControl(def.index.toString()).errors.uniqueResource " > - Stream name is already taken! + {{ 'streams.create.modal.uniqueName' | translate }}
- Invalid stream name! + {{ 'streams.create.modal.invalidName' | translate }}
- Stream name must be less than 255 characters long! + {{ 'streams.create.modal.maxLengthName' | translate }}
- + Creating Stream(s)... clrControl [ngModel]="def.description" (ngModelChange)="changeStreamDescription(def.index, $event)" - placeholder="Stream Description" + [placeholder]="'streams.create.modal.placeholderDescription' | translate" maxlength="255" style="width: 560px" /> - Stream description must be less than 255 characters long! + + {{ 'streams.create.modal.maxLengthDescription' | translate }}
@@ -118,9 +121,11 @@

Creating Stream(s)...

- +
diff --git a/ui/src/app/streams/streams/create/create.component.spec.ts b/ui/src/app/streams/streams/create/create.component.spec.ts index 0823cdec6..19e0266a3 100644 --- a/ui/src/app/streams/streams/create/create.component.spec.ts +++ b/ui/src/app/streams/streams/create/create.component.spec.ts @@ -19,7 +19,8 @@ import {ParserService} from '../../../flo/shared/service/parser.service'; import {SanitizeDsl} from '../../../flo/stream/dsl-sanitize.service'; import {StreamService} from '../../../shared/api/stream.service'; import {of} from 'rxjs'; -import {browser} from 'protractor'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/streams/create/create.component.ts', () => { let component: CreateComponent; @@ -38,6 +39,7 @@ describe('streams/streams/create/create.component.ts', () => { ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), FloModule ], providers: [ diff --git a/ui/src/app/streams/streams/create/create.component.ts b/ui/src/app/streams/streams/create/create.component.ts index 1cec3c4d3..71d3137d5 100644 --- a/ui/src/app/streams/streams/create/create.component.ts +++ b/ui/src/app/streams/streams/create/create.component.ts @@ -7,8 +7,9 @@ import {NotificationService} from '../../../shared/service/notification.service' import {ParserService} from '../../../flo/shared/service/parser.service'; import {Properties} from 'spring-flo'; import {StreamService} from '../../../shared/api/stream.service'; -import {Observable, timer} from 'rxjs'; +import {Observable} from 'rxjs'; import {SanitizeDsl} from '../../../flo/stream/dsl-sanitize.service'; +import {TranslateService} from '@ngx-translate/core'; class ProgressData { constructor(public count, public total) {} @@ -43,7 +44,8 @@ export class CreateComponent implements OnInit { private streamService: StreamService, private notificationService: NotificationService, private fb: FormBuilder, - private sanitizeDsl: SanitizeDsl + private sanitizeDsl: SanitizeDsl, + private translate: TranslateService ) { this.form = this.fb.group({}, this.uniqueStreamNames()); } @@ -54,9 +56,6 @@ export class CreateComponent implements OnInit { ngOnInit(): void { this.streams = []; - // this.setDsl(`foo${new Date().getTime()}=file --app=sasdasdasdasdasdsadasdasdasdsada --app.toto=asdsadsadasdsadasdsadsad| - // log\nbar${new Date().getTime()}=file|log\njoo${new Date().getTime()}=file|log\nair${new Date().getTime()}=file|log`); - // this.isOpen = true; } back(): void { @@ -205,11 +204,17 @@ export class CreateComponent implements OnInit { createStream(): void { if (!this.flo.dsl || !this.flo.dsl.trim()) { - this.notificationService.error('Invalid stream(s)', 'Please, enter one or more valid streams.'); + this.notificationService.error( + this.translate.instant('streams.create.modal.message.invalidStreamTitle'), + this.translate.instant('streams.create.modal.message.invalidStreamContent') + ); return; } if (this.flo.isCreateStreamsDisabled) { - this.notificationService.error('Invalid stream(s)', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); return; } this.form = new FormGroup({}, this.uniqueStreamNames()); @@ -225,51 +230,56 @@ export class CreateComponent implements OnInit { // this.bsModalRef.hide(); } else { const def = this.streams[index]; - // this.blockerService.lock(); - this.operationRunning = `Create stream ${def.name}`; + this.operationRunning = this.translate.instant('streams.create.modal.operation.creating', {name: def.name}); const description = def.description === undefined ? '' : def.description; - this.streamService - .createStream(def.name, def.def, description) - // .pipe(takeUntil(this.ngUnsubscribe$), finalize(() => this.blockerService.unlock())) - .subscribe( - () => { - // Stream created successfully, mark it as created - def.created = true; - this.progressData.count++; - if (this.streams.length - 1 === index) { - // this.confirm.emit(true); - this.operationRunning = 'Creation completed'; - setTimeout(() => { - this.notificationService.success('Stream(s) creation', 'Stream(s) have been created successfully'); - this.router.navigate(['/streams/list']); - }, PROGRESS_BAR_WAIT_TIME); - } else { - this.waitForStreamDef(def.name, 0).then( - () => { - this.progressData.count++; - this.createStreams(index + 1); - }, - () => { - this.progressData.count++; - this.createStreams(index + 1); - } - ); - } - }, - error => { + this.streamService.createStream(def.name, def.def, description).subscribe( + () => { + // Stream created successfully, mark it as created + def.created = true; + this.progressData.count++; + if (this.streams.length - 1 === index) { + // this.confirm.emit(true); + this.operationRunning = this.translate.instant('streams.create.modal.operation.completed'); setTimeout(() => { - this.progressData = undefined; - }, PROGRESS_BAR_WAIT_TIME); - if (error._body && error._body.message) { - this.notificationService.error( - 'An error occurred', - `Problem creating stream '${def.name}': ${error._body.message}` + this.notificationService.success( + this.translate.instant('streams.create.modal.message.successTitle'), + this.translate.instant('streams.create.modal.message.successContent') ); - } else { - this.notificationService.error('An error occurred', `Failed to create stream '${def.name}'`); - } + this.router.navigate(['/streams/list']); + }, PROGRESS_BAR_WAIT_TIME); + } else { + this.waitForStreamDef(def.name, 0).then( + () => { + this.progressData.count++; + this.createStreams(index + 1); + }, + () => { + this.progressData.count++; + this.createStreams(index + 1); + } + ); } - ); + }, + error => { + setTimeout(() => { + this.progressData = undefined; + }, PROGRESS_BAR_WAIT_TIME); + if (error._body && error._body.message) { + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('streams.create.modal.message.errorContent', { + name: def.name, + message: error._body.message + }) + ); + } else { + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('streams.create.modal.message.errorContent2', {name: def.name}) + ); + } + } + ); } } @@ -282,21 +292,18 @@ export class CreateComponent implements OnInit { if (attemptCount === 10) { resolve(); } - this.streamService - .getStream(streamDefNameToWaitFor) - // .pipe(takeUntil(this.ngUnsubscribe$)) - .subscribe( - () => { - resolve(); - }, - () => { - setTimeout(() => { - this.waitForStreamDef(streamDefNameToWaitFor, attemptCount + 1).then(() => { - resolve(); - }); - }, 400); - } - ); + this.streamService.getStream(streamDefNameToWaitFor).subscribe( + () => { + resolve(); + }, + () => { + setTimeout(() => { + this.waitForStreamDef(streamDefNameToWaitFor, attemptCount + 1).then(() => { + resolve(); + }); + }, 400); + } + ); }); } } diff --git a/ui/src/app/streams/streams/deploy/builder/builder.component.html b/ui/src/app/streams/streams/deploy/builder/builder.component.html index 4c688e13b..83241001a 100644 --- a/ui/src/app/streams/streams/deploy/builder/builder.component.html +++ b/ui/src/app/streams/streams/deploy/builder/builder.component.html @@ -13,7 +13,7 @@
- Platform + {{ 'streams.deploy.builder.platform' | translate }}
@@ -23,18 +23,18 @@ - The define platform is not valid (unknown). + {{ 'streams.deploy.builder.invalidPlatform' | translate }}
-
Platform
+
{{ 'streams.deploy.builder.platform' | translate }}
- Generic Deployer Properties + {{ 'streams.deploy.builder.genericDeployerProperties' | translate }}
@@ -67,10 +67,18 @@
-
Example:
-
Key: cloudfoundry.services
-
Value (application jdbc): mysqlcups
-
Generated property: deployer.jdbc.cloudfoundry.services=mysqlcups
+
+ {{ 'streams.deploy.builder.example' | translate }}: +
+
{{ 'streams.deploy.builder.key' | translate }}: cloudfoundry.services
+
+ {{ 'streams.deploy.builder.value' | translate }} (application jdbc): + mysqlcups +
+
+ {{ 'streams.deploy.builder.generatedProperty' | translate }}: + deployer.jdbc.cloudfoundry.services=mysqlcups +
@@ -78,14 +86,14 @@ - Deployment Platform + {{ 'streams.deploy.builder.deploymentPlatform' | translate }}
-
Properties
+
{{ 'streams.deploy.builder.properties' | translate }}
@@ -140,10 +148,10 @@
-
Version
+
{{ 'streams.deploy.builder.version' | translate }}
-
Properties
+
{{ 'streams.deploy.builder.properties' | translate }}
-
Global
+
{{ 'streams.deploy.builder.global' | translate }}
@@ -206,7 +214,7 @@ " [value]="builder.formGroup.get('platform').value" > - {{ builder.formGroup.get('platform').value }} (invalid) + {{ builder.formGroup.get('platform').value }} ({{ 'streams.deploy.builder.invalid' | translate }})
@@ -225,7 +233,7 @@ >
{{ getDeploymentProperties(builder.builderDeploymentProperties).length }} - / {{ builder.builderDeploymentProperties.global.length }} properties + / {{ builder.builderDeploymentProperties.global.length }} + {{ 'streams.deploy.builder.properties' | translate | lowercase }}
@@ -266,7 +275,7 @@ >
{{ getDeploymentProperties(builder.builderDeploymentProperties, app.name).length }} - / {{ builder.builderDeploymentProperties.apps[app.name].length }} properties + / {{ builder.builderDeploymentProperties.apps[app.name].length }} + {{ 'streams.deploy.builder.properties' | translate | lowercase }}
@@ -372,7 +382,7 @@ >
@@ -417,23 +431,30 @@ >
{{ getAppProperties(builder.builderAppsProperties, app.name).length }} - / {{ app.options.length }} properties + / {{ app.options.length }} + {{ 'streams.deploy.builder.properties' | translate | lowercase }}
- No properties + {{ 'streams.deploy.builder.noProperties' | translate }}
-
Loading ...
-
Error loading
-
Invalid version
+
+ {{ 'commons.loading' | translate }} +
+
+ {{ 'streams.deploy.builder.errorLoading' | translate }} +
+
+ {{ 'streams.deploy.builder.invalidVersion' | translate }} +
- Cancel + {{ + 'commons.cancel' | translate + }}
@@ -487,6 +510,6 @@
- Loading... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/streams/streams/deploy/builder/builder.component.spec.ts b/ui/src/app/streams/streams/deploy/builder/builder.component.spec.ts index 090181b4c..a2d828a2b 100644 --- a/ui/src/app/streams/streams/deploy/builder/builder.component.spec.ts +++ b/ui/src/app/streams/streams/deploy/builder/builder.component.spec.ts @@ -13,6 +13,8 @@ import {StreamServiceMock} from '../../../../tests/api/stream.service.mock'; import {StreamDeployServiceMock} from '../../../../tests/service/stream-deploy.service.mock'; import {RoleDirective} from '../../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../../assets/i18n/en.json'; describe('streams/deploy/builder/builder.component.ts', () => { let component: BuilderComponent; @@ -26,6 +28,7 @@ describe('streams/deploy/builder/builder.component.ts', () => { FormsModule, ReactiveFormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], diff --git a/ui/src/app/streams/streams/deploy/builder/builder.component.ts b/ui/src/app/streams/streams/deploy/builder/builder.component.ts index de9923c03..27b0898ca 100644 --- a/ui/src/app/streams/streams/deploy/builder/builder.component.ts +++ b/ui/src/app/streams/streams/deploy/builder/builder.component.ts @@ -25,6 +25,7 @@ import { import {App} from '../../../../shared/model/app.model'; import {PropertiesDialogComponent} from '../../../../flo/shared/properties/properties-dialog.component'; import {StreamAppPropertiesSource, StreamHead} from '../../../../flo/stream/properties/stream-properties-source'; +import {TranslateService} from '@ngx-translate/core'; export class AppPropertiesSource implements StreamAppPropertiesSource { private options: Array; @@ -116,7 +117,8 @@ export class BuilderComponent implements OnInit, OnDestroy { constructor( private streamDeployService: StreamDeployService, private changeDetector: ChangeDetectorRef, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} /** @@ -646,15 +648,15 @@ export class BuilderComponent implements OnInit, OnDestroy { if (control instanceof FormGroup) { if (control.get('property')) { if (control.get('property') && control.get('property').invalid) { - arr.push('The field "property" is not valid.'); + arr.push(this.translate.instant('streams.deploy.builder.tooltip.invalidProperty')); } } if (control.get('global') && control.get('global').invalid) { - arr.push('The field "global" is not valid.'); + arr.push(this.translate.instant('streams.deploy.builder.tooltip.invalidGlobal')); } streamDeployConfig.apps.forEach(app => { if (control.get(app.name).invalid) { - arr.push(`The field "${app.name}" is not valid.`); + arr.push(this.translate.instant('streams.deploy.builder.tooltip.invalidField', {name: app.name})); } }); } else { @@ -749,7 +751,9 @@ export class BuilderComponent implements OnInit, OnDestroy { this.changeDetector.markForCheck(); }); this.groupsPropertiesModal.setData(groupPropertiesSources); - this.groupsPropertiesModal.title = 'Deployment properties for platform'; + this.groupsPropertiesModal.title = this.translate.instant( + 'streams.deploy.builder.tooltip.deploymentPropertiesTitle' + ); this.groupsPropertiesModal.isOpen = true; } @@ -833,7 +837,10 @@ export class BuilderComponent implements OnInit, OnDestroy { */ deployStream(): void { if (!this.isSubmittable(this.refBuilder)) { - this.notificationService.error('An error occurred', 'Some field(s) are invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); } else { this.deploy.emit(this.getProperties()); } diff --git a/ui/src/app/streams/streams/deploy/deploy.component.html b/ui/src/app/streams/streams/deploy/deploy.component.html index c109e37a6..a9fbd8b8b 100644 --- a/ui/src/app/streams/streams/deploy/deploy.component.html +++ b/ui/src/app/streams/streams/deploy/deploy.component.html @@ -1,20 +1,16 @@

- Update - Deploy - stream {{ stream?.name }} + {{ 'streams.deploy.main.titleUpdate' | translate }}  + {{ 'streams.deploy.main.titleDeploy' | translate }}  + {{ stream?.name }}

-

- Please specify any optional deployment properties. You can either use the builder.
- Alternatively, you can point to an external properties file containing the deployment properties. For more - information please see the Technical Documentation. -

+

- + - + -

Update stream

-

Deploy stream

+

{{ 'streams.deploy.main.update' | translate }}

+

{{ 'streams.deploy.main.deploy' | translate }}

  - Updating stream ... - Deploying stream(s) ... + {{ 'streams.deploy.main.updating' | translate }} + {{ 'streams.deploy.main.deploying' | translate }}
- +
- Loading data ... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/streams/streams/deploy/deploy.component.ts b/ui/src/app/streams/streams/deploy/deploy.component.ts index f7b6cf622..a611f210d 100644 --- a/ui/src/app/streams/streams/deploy/deploy.component.ts +++ b/ui/src/app/streams/streams/deploy/deploy.component.ts @@ -11,6 +11,7 @@ import {ClipboardCopyService} from '../../../shared/service/clipboard-copy.servi import {DateTime} from 'luxon'; import {StreamDeployService} from '../stream-deploy.service'; import {saveAs} from 'file-saver'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-deploy', @@ -34,7 +35,8 @@ export class DeployComponent implements OnInit, OnDestroy { private loggerService: LoggerService, private streamDeployService: StreamDeployService, private router: Router, - private clipboardCopyService: ClipboardCopyService + private clipboardCopyService: ClipboardCopyService, + private translate: TranslateService ) {} /** @@ -72,7 +74,7 @@ export class DeployComponent implements OnInit, OnDestroy { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); if (HttpError.is404(error)) { this.router.navigate(['/streams/definitions']); } @@ -103,7 +105,10 @@ export class DeployComponent implements OnInit, OnDestroy { runExport(value: Array): void { this.update(value); if (this.properties.length === 0) { - this.notificationService.error('An error occured', 'There are no properties to export.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('streams.deploy.main.message.errorExportPropertyContent') + ); } else { const propertiesText = this.properties.join('\n'); const date = DateTime.local().toFormat('yyyy-MM-HHmmss'); @@ -121,11 +126,17 @@ export class DeployComponent implements OnInit, OnDestroy { runCopy(value: Array): void { this.update(value); if (this.properties.length === 0) { - this.notificationService.error('An error occured', 'There are no properties to copy.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('streams.deploy.main.message.errorCopyPropertyContent') + ); } else { const propertiesText = this.properties.join('\n'); this.clipboardCopyService.executeCopy(propertiesText); - this.notificationService.success('Copy to clipboard', 'The properties have been copied to your clipboard.'); + this.notificationService.success( + this.translate.instant('streams.deploy.main.message.successCopyTitle'), + this.translate.instant('streams.deploy.main.message.successCopyContent') + ); } } @@ -169,13 +180,13 @@ export class DeployComponent implements OnInit, OnDestroy { () => { if (isDeployed) { this.notificationService.success( - 'Deploy success', - `Successfully updated stream definition "${this.stream.name}"` + this.translate.instant('streams.deploy.main.message.successUpdateTitle'), + this.translate.instant('streams.deploy.main.message.successUpdateContent', {name: this.stream.name}) ); } else { this.notificationService.success( - 'Deploy success', - `Successfully deployed stream definition "${this.stream.name}"` + this.translate.instant('streams.deploy.main.message.successDeployTitle'), + this.translate.instant('streams.deploy.main.message.successDeployContent', {name: this.stream.name}) ); } this.router.navigate(['streams/list']); @@ -184,8 +195,8 @@ export class DeployComponent implements OnInit, OnDestroy { this.isDeploying = false; const err = error.message ? error.message : error.toString(); this.notificationService.error( - 'An error occurred', - err ? err : 'An error occurred during the stream deployment update.' + this.translate.instant('commons.message.error'), + err ? err : this.translate.instant('streams.deploy.main.message.errorDeployContent') ); } ); diff --git a/ui/src/app/streams/streams/deploy/free-text/free-text.component.html b/ui/src/app/streams/streams/deploy/free-text/free-text.component.html index d999352a9..05a23c0fb 100644 --- a/ui/src/app/streams/streams/deploy/free-text/free-text.component.html +++ b/ui/src/app/streams/streams/deploy/free-text/free-text.component.html @@ -1,8 +1,5 @@
-

- Enter the list of properties into the text area field below. Alternatively, you can also select a file in your local - file system, which is used to populate the text area field. -

+

@@ -23,8 +20,6 @@ (click)="propertiesFile.click()" style="border-right: 0" > - - - Import a local file + {{ 'commons.importFile' | translate }} - Please provide a text file containing properties. This will be used to populate the text area above. + - +
- Cancel + {{ 'commons.cancel' | translate }}
diff --git a/ui/src/app/streams/streams/deploy/free-text/free-text.component.spec.ts b/ui/src/app/streams/streams/deploy/free-text/free-text.component.spec.ts index 152520e27..cb3a91ebf 100644 --- a/ui/src/app/streams/streams/deploy/free-text/free-text.component.spec.ts +++ b/ui/src/app/streams/streams/deploy/free-text/free-text.component.spec.ts @@ -11,6 +11,8 @@ import {GrafanaServiceMock} from '../../../../tests/service/grafana.service.mock import {FreeTextComponent} from './free-text.component'; import {RoleDirective} from '../../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../../assets/i18n/en.json'; describe('streams/deploy/free-text/free-text.component.ts', () => { let component: FreeTextComponent; @@ -24,6 +26,7 @@ describe('streams/deploy/free-text/free-text.component.ts', () => { FormsModule, ReactiveFormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], diff --git a/ui/src/app/streams/streams/deploy/free-text/free-text.component.ts b/ui/src/app/streams/streams/deploy/free-text/free-text.component.ts index 93f2a73c4..52fc2ae46 100644 --- a/ui/src/app/streams/streams/deploy/free-text/free-text.component.ts +++ b/ui/src/app/streams/streams/deploy/free-text/free-text.component.ts @@ -2,6 +2,7 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnIn import {FormControl, FormGroup} from '@angular/forms'; import {StreamDeployValidator} from '../stream-deploy.validator'; import {NotificationService} from '../../../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; /** * Free Text Component @@ -81,7 +82,7 @@ export class FreeTextComponent implements OnInit, OnDestroy { * Constructor * Initialize FormGroup */ - constructor(private notificationService: NotificationService) { + constructor(private notificationService: NotificationService, private translate: TranslateService) { this.formGroup = new FormGroup({ input: new FormControl(), file: new FormControl('') @@ -178,7 +179,10 @@ export class FreeTextComponent implements OnInit, OnDestroy { */ deployStream(): void { if (!this.isSubmittable) { - this.notificationService.error('Invalid properties', 'Some line(s) are invalid.'); + this.notificationService.error( + this.translate.instant('streams.deploy.freetext.message.errorDeployTitle'), + this.translate.instant('streams.deploy.freetext.message.errorDeployContent') + ); } else { this.deploy.emit(this.getCleanProperties()); } diff --git a/ui/src/app/streams/streams/deploy/stream-deploy.component.spec.ts b/ui/src/app/streams/streams/deploy/stream-deploy.component.spec.ts index 6c4748f93..0c2957a58 100644 --- a/ui/src/app/streams/streams/deploy/stream-deploy.component.spec.ts +++ b/ui/src/app/streams/streams/deploy/stream-deploy.component.spec.ts @@ -19,6 +19,8 @@ import {ParserService} from '../../../flo/shared/service/parser.service'; import {ActivatedRoute} from '@angular/router'; import {of} from 'rxjs'; import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; @Component({ selector: 'app-stream-deploy-builder', @@ -60,7 +62,13 @@ describe('streams/streams/deploy/deploy.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [DeployComponent, BuilderMockComponent, FreeTextMockComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, @@ -115,7 +123,7 @@ describe('streams/streams/deploy/deploy.component.ts', () => { await fixture.whenStable(); expect(spy).toHaveBeenCalled(); expect(navigate).toHaveBeenCalledWith(['streams/list']); - expect(NotificationServiceMock.mock.successNotifications[0].title).toContain('Deploy success'); + expect(NotificationServiceMock.mock.successNotifications[0].title).toContain('Update success'); done(); }); diff --git a/ui/src/app/streams/streams/destroy/destroy.component.html b/ui/src/app/streams/streams/destroy/destroy.component.html index 78ab0abca..794808f81 100644 --- a/ui/src/app/streams/streams/destroy/destroy.component.html +++ b/ui/src/app/streams/streams/destroy/destroy.component.html @@ -1,18 +1,16 @@ -

Confirm Destroy Stream

-

Confirm Destroy Streams

+

{{ 'streams.destroy.title' | translate }}

+

{{ 'streams.destroy.title2' | translate }}

- This action will destroy and delete the stream {{ streams[0].name }}. Are you sure? +
- This action will destroy the {{ streams.length }} stream definitions listed below. Are you sure? -
+
Property{{ 'auditRecords.property' | translate }} Value
Created On + {{ 'auditRecords.createdOn' | translate }} + {{ detail.createdOn | datetime }}
Actions + {{ 'auditRecords.actions' | translate }} + {{ detail.auditAction }}
Operations + {{ 'auditRecords.operations' | translate }} + {{ detail.auditOperation }}
Operation ID + {{ 'auditRecords.operationID' | translate }} + {{ detail.correlationId }}
Create by + {{ 'auditRecords.createBy' | translate }} + {{ detail.createdBy || 'N/A' }}
Platform name + {{ 'auditRecords.platformName' | translate }} + {{ detail.platformName || 'N/A' }}
Data + {{ 'auditRecords.data' | translate }} + {{ detail.auditData || 'N/A' }}
- - + + @@ -31,13 +29,15 @@

Confirm Destroy Streams

- Destroying stream(s) ... + {{ 'streams.destroy.destroying' | translate }}
- +
diff --git a/ui/src/app/streams/streams/destroy/destroy.component.spec.ts b/ui/src/app/streams/streams/destroy/destroy.component.spec.ts index 3cdceed73..34d9165e0 100644 --- a/ui/src/app/streams/streams/destroy/destroy.component.spec.ts +++ b/ui/src/app/streams/streams/destroy/destroy.component.spec.ts @@ -14,6 +14,8 @@ import {Stream} from '../../../shared/model/stream.model'; import {UpperCasePipe} from '@angular/common'; import {RoleDirective} from '../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/streams/destroy/destroy.component.ts', () => { let component: DestroyComponent; @@ -24,7 +26,13 @@ describe('streams/streams/destroy/destroy.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [DestroyComponent, UpperCasePipe, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams/destroy/destroy.component.ts b/ui/src/app/streams/streams/destroy/destroy.component.ts index aa5c46d56..43dd7485b 100644 --- a/ui/src/app/streams/streams/destroy/destroy.component.ts +++ b/ui/src/app/streams/streams/destroy/destroy.component.ts @@ -1,7 +1,8 @@ -import {Component, EventEmitter, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, Output} from '@angular/core'; import {NotificationService} from '../../../shared/service/notification.service'; import {Stream} from '../../../shared/model/stream.model'; import {StreamService} from '../../../shared/api/stream.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream-destroy', @@ -14,7 +15,11 @@ export class DestroyComponent { isRunning = false; @Output() onDestroyed = new EventEmitter(); - constructor(private streamService: StreamService, private notificationService: NotificationService) {} + constructor( + private streamService: StreamService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(streams: Stream[]): void { this.streams = streams; @@ -27,22 +32,25 @@ export class DestroyComponent { data => { if (data.length === 1) { this.notificationService.success( - 'Destroy stream', - 'Successfully removed stream "' + this.streams[0].name + '".' + this.translate.instant('streams.destroy.message.successTitle'), + this.translate.instant('streams.destroy.message.successContent', {name: this.streams[0].name}) ); } else { - this.notificationService.success('Destroy streams', `${data.length} stream(s) destroyed.`); + this.notificationService.success( + this.translate.instant('streams.destroy.message.successTitle2'), + this.translate.instant('streams.destroy.message.successContent2', {count: data.length}) + ); } this.isRunning = false; this.onDestroyed.emit(data); this.isOpen = false; this.streams = null; }, - error => { + () => { this.isRunning = false; this.notificationService.error( - 'An error occurred', - 'An error occurred while bulk deleting Streams. ' + 'Please check the server logs for more details.' + this.translate.instant('commons.message.error'), + this.translate.instant('streams.destroy.message.errorContent') ); this.isOpen = false; this.streams = null; diff --git a/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.html b/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.html index 89999ce74..aba539e97 100644 --- a/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.html +++ b/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.html @@ -1,19 +1,23 @@ -

Deploy Streams

+

{{ 'streams.multiDeploy.title' | translate }}

- Deploy - Update + {{ + 'streams.multiDeploy.deploy' | translate + }} + {{ + 'streams.multiDeploy.update' | translate + }}  {{ streamConfig.stream.name }}
-
DSL Text
+
{{ 'streams.main.definition' | translate }}
@@ -21,13 +25,13 @@

Deploy Streams

-
Description
+
{{ 'streams.main.description' | translate }}
{{ streamConfig.stream.description }}
-
Status
+
{{ 'streams.main.status' | translate }}
{{ streamConfig.stream.status @@ -35,30 +39,25 @@

Deploy Streams

- + - Select a platform. + {{ 'streams.multiDeploy.invalidPlatform' | translate }} - + - - - - - - One or more arguments are invalid.
Example: myarg=myvalue. +
@@ -66,19 +65,19 @@

Deploy Streams

- - + +
-

Deploy streams

+

{{ 'streams.multiDeploy.deployModal' | translate }}

- Deploying streams... + {{ 'streams.multiDeploy.deploying' | translate }}
- +
diff --git a/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.spec.ts b/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.spec.ts index 48905919f..142b61f38 100644 --- a/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.spec.ts +++ b/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.spec.ts @@ -19,6 +19,8 @@ import {of, throwError} from 'rxjs'; import {HttpError} from '../../../shared/model/error.model'; import {RoleDirective} from '../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/streams/multi-deploy/multi-deploy.component.ts', () => { let component: MultiDeployComponent; @@ -33,6 +35,7 @@ describe('streams/streams/multi-deploy/multi-deploy.component.ts', () => { ReactiveFormsModule, ClarityModule, RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), BrowserAnimationsModule ], providers: [ diff --git a/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.ts b/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.ts index da3d05d3b..a27f2df85 100644 --- a/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.ts +++ b/ui/src/app/streams/streams/multi-deploy/multi-deploy.component.ts @@ -8,7 +8,7 @@ import {forkJoin, Observable, throwError} from 'rxjs'; import {FormControl, FormGroup} from '@angular/forms'; import {StreamDeployService} from '../stream-deploy.service'; import {NotificationService} from '../../../shared/service/notification.service'; -import {ParserService} from '../../../flo/shared/service/parser.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream-multi-deploy', @@ -30,8 +30,8 @@ export class MultiDeployComponent implements OnInit { private route: ActivatedRoute, private notificationService: NotificationService, private streamDeployService: StreamDeployService, - private parserService: ParserService, - private groupService: GroupService + private groupService: GroupService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -93,7 +93,10 @@ export class MultiDeployComponent implements OnInit { runDeploy(): void { if (!this.isValid()) { - this.notificationService.error('Invalid properties', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); } else { this.isRunning = true; const cleanValue = v => @@ -130,12 +133,15 @@ export class MultiDeployComponent implements OnInit { }); forkJoin([...requests]).subscribe( () => { - this.notificationService.success('Deploy success', `Successfully deployed ${requests.length} stream(s).`); + this.notificationService.success( + this.translate.instant('streams.multiDeploy.successTitle'), + this.translate.instant('streams.multiDeploy.successContent', {count: requests.length}) + ); this.back(); }, error => { this.isRunning = false; - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/streams/streams/rollback/rollback.component.html b/ui/src/app/streams/streams/rollback/rollback.component.html index 81c8cf8e8..e07af2530 100644 --- a/ui/src/app/streams/streams/rollback/rollback.component.html +++ b/ui/src/app/streams/streams/rollback/rollback.component.html @@ -1,15 +1,18 @@ -

Confirm stream rollback

+

{{ 'streams.rollback.title' | translate }}

- This action will rollback the stream {{ history.stream }} to the version {{ history.version }}. Are - you sure? +
- Rollback stream(s) ... + {{ 'streams.rollback.rollbacking' | translate }}
- - + +
diff --git a/ui/src/app/streams/streams/rollback/rollback.component.spec.ts b/ui/src/app/streams/streams/rollback/rollback.component.spec.ts index 40753bfcf..b2935d522 100644 --- a/ui/src/app/streams/streams/rollback/rollback.component.spec.ts +++ b/ui/src/app/streams/streams/rollback/rollback.component.spec.ts @@ -14,6 +14,8 @@ import {By} from '@angular/platform-browser'; import {throwError} from 'rxjs'; import {RoleDirective} from '../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/streams/rollback/rollback.component.ts', () => { let component: RollbackComponent; @@ -23,7 +25,13 @@ describe('streams/streams/rollback/rollback.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [RollbackComponent, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams/rollback/rollback.component.ts b/ui/src/app/streams/streams/rollback/rollback.component.ts index 3ed2381a4..8c30eecf6 100644 --- a/ui/src/app/streams/streams/rollback/rollback.component.ts +++ b/ui/src/app/streams/streams/rollback/rollback.component.ts @@ -2,6 +2,7 @@ import {Component, EventEmitter, Output} from '@angular/core'; import {StreamHistory} from '../../../shared/model/stream.model'; import {StreamService} from '../../../shared/api/stream.service'; import {NotificationService} from '../../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream-rollback', @@ -14,7 +15,11 @@ export class RollbackComponent { isRunning = false; @Output() onRollback = new EventEmitter(); - constructor(private streamService: StreamService, private notificationService: NotificationService) {} + constructor( + private streamService: StreamService, + private notificationService: NotificationService, + private translation: TranslateService + ) {} open(history: StreamHistory): void { this.history = history; @@ -30,14 +35,14 @@ export class RollbackComponent { this.streamService.rollbackStream(this.history).subscribe( data => { this.notificationService.success( - 'Rollback success', - `Successful stream rollback to version '${this.history.version}'` + this.translation.instant('streams.rollback.message.successTitle'), + this.translation.instant('streams.rollback.message.successContent', {version: this.history.version}) ); this.onRollback.emit(true); this.close(); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translation.instant('commons.message.error'), error); this.isRunning = false; } ); diff --git a/ui/src/app/streams/streams/status/status.component.spec.ts b/ui/src/app/streams/streams/status/status.component.spec.ts index f5f732eb3..e81cbb8e4 100644 --- a/ui/src/app/streams/streams/status/status.component.spec.ts +++ b/ui/src/app/streams/streams/status/status.component.spec.ts @@ -11,6 +11,8 @@ import {GrafanaServiceMock} from '../../../tests/service/grafana.service.mock'; import {StatusComponent} from './status.component'; import {By} from '@angular/platform-browser'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/streams/stream/stream.component.ts', () => { let component: StatusComponent; @@ -20,7 +22,13 @@ describe('streams/streams/stream/stream.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [StatusComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams/status/status.component.ts b/ui/src/app/streams/streams/status/status.component.ts index 9d7cb2fa3..940ecc234 100644 --- a/ui/src/app/streams/streams/status/status.component.ts +++ b/ui/src/app/streams/streams/status/status.component.ts @@ -4,37 +4,61 @@ import {Component} from '@angular/core'; selector: 'app-stream-status', template: ` -

Stream status

+

{{ 'streams.status.title' | translate }}

- DEPLOYING - Deployment has been initiated + {{ + 'streams.status.deploying' | translate | uppercase + }} + {{ 'streams.status.deployingContent' | translate }}
- DEPLOYED - Fully deployed based on each of the stream's apps' count properties + {{ + 'streams.status.deployed' | translate | uppercase + }} + {{ 'streams.status.deployedContent' | translate }}
- PARTIAL - 1 or more of the apps are not yet deployed. + {{ + 'streams.status.partial' | translate | uppercase + }} + {{ 'streams.status.partialContent' | translate }}
- INCOMPLETE - At least 1 of each app, but 1 or more of them not at requested capacity + {{ + 'streams.status.incomplete' | translate | uppercase + }} + {{ 'streams.status.incompleteContent' | translate }}
- FAILED - 1 or more of the apps does not have even a single instance deployed + {{ + 'streams.status.failed' | translate | uppercase + }} + {{ 'streams.status.failedContent' | translate }}
- UNDEPLOYED - Intentionally undeployed, or created but not yet deployed + {{ + 'streams.status.undeployed' | translate | uppercase + }} + {{ 'streams.status.undeployedContent' | translate }}
- +
` diff --git a/ui/src/app/streams/streams/stream/stream.component.html b/ui/src/app/streams/streams/stream/stream.component.html index bed0d9420..172a72134 100644 --- a/ui/src/app/streams/streams/stream/stream.component.html +++ b/ui/src/app/streams/streams/stream/stream.component.html @@ -1,6 +1,7 @@

- Stream {{ stream?.name }}{{ stream?.name }}  {{ stream.status }} @@ -16,7 +17,7 @@

(click)="deploy()" [appRole]="['ROLE_DEPLOY']" > - Deploy stream + {{ 'streams.stream.deploy' | translate }}

- +
-
Description
+
{{ 'streams.main.description' | translate }}
{{ stream.description }}
-
Definition
+
{{ 'streams.main.definition' | translate }}
-
Status
+
{{ 'streams.main.status' | translate }}
{{ stream.status }}
-
Applications
+
{{ 'streams.stream.applications' | translate }}
@@ -94,7 +100,7 @@

- Loading applications... + {{ 'commons.loading' | translate }}
@@ -104,7 +110,12 @@

- +
@@ -124,7 +135,12 @@

- + @@ -132,7 +148,12 @@

- +
@@ -156,14 +177,19 @@

- Loading deployment info... + {{ 'commons.loading' | translate }}
- +
@@ -178,14 +204,16 @@

}}

- + @@ -194,7 +222,7 @@

- Loading runtime... + {{ 'commons.loading' | translate }}
@@ -202,17 +230,22 @@

- +

NameDefinition{{ 'streams.main.name' | translate }}{{ 'streams.main.definition' | translate }}
{{ app.deploymentId }}{{ app.instances?.length || 'n/a' }} instance(s) + {{ app.instances?.length || 'n/a' }} {{ 'streams.stream.instances' | translate }} +
- - - - - + + + + + @@ -232,17 +265,17 @@

class="btn btn-sm btn-secondary" [disabled]="!canRollback(hist)" > - Rollback + {{ 'streams.stream.rollback' | translate }}

VersionDateStream statusDescriptionPlatform{{ 'streams.stream.version' | translate }}{{ 'streams.stream.date' | translate }}{{ 'streams.stream.streamStatus' | translate }}{{ 'streams.stream.description' | translate }}{{ 'streams.stream.platform' | translate }}  
-
There is no history yet.
+
{{ 'streams.stream.noHistory' | translate }}
- Loading history... + {{ 'commons.loading' | translate }}
@@ -252,26 +285,28 @@

- Loading stream... + {{ 'commons.loading' | translate }}

- Log {{ log.name }} + {{ 'streams.stream.logStream' | translate: {name: log.name} }} {{ log.type }} 

{{log.log}}
-
No log.
+
{{ 'streams.stream.noLog' | translate }}
- Loading log(s)... + {{ 'commons.loading' | translate }}
- +
diff --git a/ui/src/app/streams/streams/stream/stream.component.spec.ts b/ui/src/app/streams/streams/stream/stream.component.spec.ts index 427912e3a..a429688a6 100644 --- a/ui/src/app/streams/streams/stream/stream.component.spec.ts +++ b/ui/src/app/streams/streams/stream/stream.component.spec.ts @@ -21,6 +21,8 @@ import {DatetimePipe} from '../../../shared/pipe/datetime.pipe'; import {StreamDslComponent} from '../../../shared/component/stream-dsl/stream-dsl.component'; import {ParserService} from '../../../flo/shared/service/parser.service'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('streams/streams/stream/stream.component.ts', () => { let component: StreamComponent; @@ -39,7 +41,13 @@ describe('streams/streams/stream/stream.component.ts', () => { DatetimePipe, StreamDslComponent ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams/stream/stream.component.ts b/ui/src/app/streams/streams/stream/stream.component.ts index 23636715d..c75ac803c 100644 --- a/ui/src/app/streams/streams/stream/stream.component.ts +++ b/ui/src/app/streams/streams/stream/stream.component.ts @@ -10,6 +10,7 @@ import {UndeployComponent} from '../undeploy/undeploy.component'; import get from 'lodash.get'; import {StreamStatus} from '../../../shared/model/metrics.model'; import {RollbackComponent} from '../rollback/rollback.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream', @@ -41,7 +42,8 @@ export class StreamComponent implements OnInit { private route: ActivatedRoute, private router: Router, private notificationService: NotificationService, - private streamService: StreamService + private streamService: StreamService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -70,7 +72,7 @@ export class StreamComponent implements OnInit { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); if (HttpError.is404(error)) { this.back(); } diff --git a/ui/src/app/streams/streams/streams.component.html b/ui/src/app/streams/streams/streams.component.html index 1e2039c21..5ad4d41e9 100644 --- a/ui/src/app/streams/streams/streams.component.html +++ b/ui/src/app/streams/streams/streams.component.html @@ -1,11 +1,15 @@

- Streams + {{ 'streams.main.title' | translate }} + + - -

@@ -17,7 +21,9 @@

#datagrid > - + @@ -62,9 +68,11 @@

(click)="setMode(true)" [appRole]="['ROLE_DEPLOY', 'ROLE_CREATE', 'ROLE_DESTROY']" > - Group Actions + {{ 'commons.groupActions' | translate }} + + - [style.width.px]="context.sizeName | datagridcolumn: datagrid:contextName:30 | async" [clrFilterValue]="context.name" > - Name + {{ 'streams.main.name' | translate }} - Description + {{ 'streams.main.description' | translate }} (clrDgColumnResize)="updateContext('sizeDslText', $event)" [style.width.px]="context.sizeDslText | datagridcolumn: datagrid:contextName:30 | async" > - Definition + {{ 'streams.main.definition' | translate }} [style.width.px]="context.sizeStatus | datagridcolumn: datagrid:contextName:20 | async" > - Status  + {{ 'streams.main.status' | translate }}  @@ -119,14 +127,14 @@

>{{ stream.status }} - + + + + + - - - - - No results found. + {{ 'streams.main.noResult' | translate }} [clrDgPageSize]="context.size" [clrDgPage]="context.current" > - Streams per page - {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ page?.total }} streams + {{ + 'streams.main.streamsPerPage' | translate + }} + {{ + 'streams.main.pagination' + | translate: {first: pagination.firstItem + 1, last: pagination.lastItem + 1, total: page?.total} + }} diff --git a/ui/src/app/streams/streams/streams.component.spec.ts b/ui/src/app/streams/streams/streams.component.spec.ts index 93915f2a9..0551e0de3 100644 --- a/ui/src/app/streams/streams/streams.component.spec.ts +++ b/ui/src/app/streams/streams/streams.component.spec.ts @@ -16,8 +16,9 @@ import {GrafanaServiceMock} from '../../tests/service/grafana.service.mock'; import {GroupServiceMock} from '../../tests/service/group.service.mock'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {SettingsServiceMock} from '../../tests/service/settings.service.mock'; -import {ConfirmComponent} from '../../shared/component/confirm/confirm.component'; import {DatagridColumnPipe} from '../../shared/pipe/datagrid-column.pipe'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('streams/streams/streams.component.ts', () => { let component: StreamsComponent; @@ -34,7 +35,13 @@ describe('streams/streams/streams.component.ts', () => { GrafanaStreamDirective, DatagridColumnPipe ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams/undeploy/undeploy.component.html b/ui/src/app/streams/streams/undeploy/undeploy.component.html index 3ece37f4f..8b318d02b 100644 --- a/ui/src/app/streams/streams/undeploy/undeploy.component.html +++ b/ui/src/app/streams/streams/undeploy/undeploy.component.html @@ -1,18 +1,16 @@ -

Confirm Undeploy Stream

-

Confirm Undeploy Streams

+

{{ 'streams.undeploy.title' | translate }}

+

{{ 'streams.undeploy.title2' | translate }}

- This action will undeploy the stream {{ streams[0].name }}. Are you sure? +
- This action will undeploy the {{ streams.length }} stream definitions listed below. Are you sure? -
+
- - + + @@ -31,13 +29,15 @@

Confirm Undeploy Streams

- Undeploying stream(s) ... + {{ 'streams.undeploy.undeploying' | translate }}
- +
diff --git a/ui/src/app/streams/streams/undeploy/undeploy.component.spec.ts b/ui/src/app/streams/streams/undeploy/undeploy.component.spec.ts index 9a49c3b4a..40ad76e0b 100644 --- a/ui/src/app/streams/streams/undeploy/undeploy.component.spec.ts +++ b/ui/src/app/streams/streams/undeploy/undeploy.component.spec.ts @@ -12,6 +12,8 @@ import {throwError} from 'rxjs'; import {Stream} from '../../../shared/model/stream.model'; import {UndeployComponent} from './undeploy.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('apps/undeploy/undeploy.component.ts', () => { let component: UndeployComponent; @@ -22,7 +24,13 @@ describe('apps/undeploy/undeploy.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [UndeployComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/streams/streams/undeploy/undeploy.component.ts b/ui/src/app/streams/streams/undeploy/undeploy.component.ts index 65fbe8ee8..7a0cecbad 100644 --- a/ui/src/app/streams/streams/undeploy/undeploy.component.ts +++ b/ui/src/app/streams/streams/undeploy/undeploy.component.ts @@ -1,7 +1,8 @@ -import {Component, EventEmitter, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, Output} from '@angular/core'; import {Stream} from '../../../shared/model/stream.model'; import {StreamService} from '../../../shared/api/stream.service'; import {NotificationService} from '../../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-stream-undeploy', @@ -14,7 +15,11 @@ export class UndeployComponent { isRunning = false; @Output() onUndeployed = new EventEmitter(); - constructor(private streamService: StreamService, private notificationService: NotificationService) {} + constructor( + private streamService: StreamService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(streams: Stream[]): void { this.streams = streams; @@ -27,21 +32,24 @@ export class UndeployComponent { data => { if (data.length === 1) { this.notificationService.success( - 'Undeploy stream', - 'Successfully undeploy stream "' + this.streams[0].name + '".' + this.translate.instant('streams.undeploy.message.successTitle'), + this.translate.instant('streams.undeploy.message.successContent', {name: this.streams[0].name}) ); } else { - this.notificationService.success('Undeploy streams', `${data.length} stream(s) undeployed.`); + this.notificationService.success( + this.translate.instant('streams.undeploy.message.successTitle2'), + this.translate.instant('streams.undeploy.message.successContent2', {count: data.length}) + ); } this.onUndeployed.emit(data); this.isOpen = false; this.isRunning = false; this.streams = null; }, - error => { + () => { this.notificationService.error( - 'An error occurred', - 'An error occurred while undeploying Streams. ' + 'Please check the server logs for more details.' + this.translate.instant('commons.message.error'), + this.translate.instant('streams.undeploy.message.errorContent') ); this.isOpen = false; this.isRunning = false; diff --git a/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.html b/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.html index 43b3bb0fc..64e872b8a 100644 --- a/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.html +++ b/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.html @@ -1,22 +1,19 @@ -

Confirm Clean Up Task Execution(s)

+

{{ 'executions.cleanup.title' | translate }}

-

- This action will remove the data of the task execution {{ executions[0].executionId }} (task - {{ executions[0].taskName }}). Are you sure? -

+

-

- This action will remove the data of the {{ executions.length }} task executions listed below. Are - you sure? -

+

NameDefinition{{ 'streams.main.name' | translate }}{{ 'streams.main.definition' | translate }}
- - + + @@ -29,13 +26,15 @@

Confirm Clean Up Task Execution(s)

- Removing data... + {{ 'executions.cleanup.removing' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.spec.ts b/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.spec.ts index 21b8d33cc..8362e1e6d 100644 --- a/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.spec.ts +++ b/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.spec.ts @@ -12,6 +12,8 @@ import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {CleanupComponent} from './cleanup.component'; import {TaskExecution} from '../../../shared/model/task-execution.model'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/executions/cleanup/cleanup.component.ts', () => { let component: CleanupComponent; @@ -22,7 +24,13 @@ describe('tasks-jobs/executions/cleanup/cleanup.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [CleanupComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS) + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.ts b/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.ts index 94d1589e9..7be97f420 100644 --- a/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.ts +++ b/ui/src/app/tasks-jobs/executions/cleanup/cleanup.component.ts @@ -1,7 +1,8 @@ -import {Component, EventEmitter, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, Output} from '@angular/core'; import {TaskExecution} from '../../../shared/model/task-execution.model'; import {TaskService} from '../../../shared/api/task.service'; import {NotificationService} from '../../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-execution-cleanup', @@ -13,7 +14,11 @@ export class CleanupComponent { executions: TaskExecution[]; @Output() onCleaned = new EventEmitter(); - constructor(private taskService: TaskService, private notificationService: NotificationService) {} + constructor( + private taskService: TaskService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(executions: TaskExecution[]): void { this.executions = executions; @@ -25,13 +30,16 @@ export class CleanupComponent { this.isRunning = true; this.taskService.executionsClean(this.executions).subscribe( data => { - this.notificationService.success('Clean up task execution(s)', `${data.length} task execution(s) cleaned up.`); + this.notificationService.success( + this.translate.instant('executions.cleanup.message.successTitle'), + this.translate.instant('executions.cleanup.message.successContent', {count: data.length}) + ); this.onCleaned.emit(data); this.isOpen = false; this.executions = null; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.isOpen = false; this.executions = null; } diff --git a/ui/src/app/tasks-jobs/executions/execution/execution.component.html b/ui/src/app/tasks-jobs/executions/execution/execution.component.html index 68e5738b0..0dc94d13e 100644 --- a/ui/src/app/tasks-jobs/executions/execution/execution.component.html +++ b/ui/src/app/tasks-jobs/executions/execution/execution.component.html @@ -1,5 +1,5 @@

- Task execution - Execution ID: {{ execution?.executionId }} + {{ 'executions.execution.title' | translate }}: {{ execution?.executionId }}

@@ -11,7 +11,7 @@

[disabled]="!task" [appRole]="['ROLE_DEPLOY']" > - Relaunch task + {{ 'executions.execution.relaunch' | translate }}

- +
-
Execution Id
+
{{ 'executions.main.executionId' | translate }}
{{ execution.executionId }}
-
Arguments
+
{{ 'executions.main.arguments' | translate }}
@@ -62,7 +67,7 @@

-
External Execution Id
+
{{ 'executions.main.externalExecutionId' | translate }}
{{ execution.externalExecutionId || 'N/A' }}
@@ -75,7 +80,7 @@

-
Job Execution Ids
+
{{ 'executions.main.jobExecutionIds' | translate }}
-
Start Time
+
{{ 'executions.main.startTime' | translate }}
{{ execution.startTime | datetime }}
-
End Time
+
{{ 'executions.main.endTime' | translate }}
{{ execution.endTime | datetime }}
-
Duration
+
{{ 'executions.main.duration' | translate }}
{{ execution.startTime | duration: execution.endTime }}
-
Exit Code
+
{{ 'executions.main.exitCode' | translate }}
{{ execution.exitCode }}
-
Exit Message
+
{{ 'executions.main.exitMessage' | translate }}
{{ execution.exitMessage || 'N/A' }}
-
Resource URL
+
{{ 'executions.main.resourceUrl' | translate }}
{{ execution.resourceUrl || 'N/A' }}
@@ -126,7 +131,7 @@

class="row" *ngIf="this.execution.externalExecutionId || execution.getAppPropertiesToArray().length > 0" > -
Application Properties
+
{{ 'executions.main.applicationProperties' | translate }}
@@ -141,7 +146,7 @@

class="row" *ngIf="this.execution.externalExecutionId || execution.getDeploymentPropertiesToArray().length > 0" > -
Platform Properties
+
{{ 'executions.main.platformProperties' | translate }}
@@ -153,41 +158,48 @@

-
No execution yet.
+
{{ 'executions.main.noExecution' | translate }}

- +
- +
-
Name
+
{{ 'tasks.main.name' | translate }}
{{ task.name }}
-
Description
+
{{ 'tasks.main.description' | translate }}
{{ task.description }}
-
Definition
+
{{ 'tasks.main.definition' | translate }}
{{ task.dslText }}
-
Status
+
{{ 'tasks.main.status' | translate }}
{{ task.status }}
-
Applications
+
{{ 'tasks.main.applications' | translate }}
@@ -198,21 +210,25 @@

- Loading application(s)... + {{ 'commons.loading' | translate }}
-
No task found.
+
{{ 'executions.execution.noTask' | translate }}
- Loading task... + {{ 'commons.loading' | translate }}
- - + +
@@ -221,7 +237,7 @@

- Loading execution... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/tasks-jobs/executions/execution/execution.component.spec.ts b/ui/src/app/tasks-jobs/executions/execution/execution.component.spec.ts index 2f445b3b5..09d73f3f8 100644 --- a/ui/src/app/tasks-jobs/executions/execution/execution.component.spec.ts +++ b/ui/src/app/tasks-jobs/executions/execution/execution.component.spec.ts @@ -13,6 +13,8 @@ import {StopComponent} from '../stop/stop.component'; import {CleanupComponent} from '../cleanup/cleanup.component'; import {RoleDirective} from '../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/executions/execution/execution.component.ts', () => { let component: ExecutionComponent; @@ -22,7 +24,13 @@ describe('tasks-jobs/executions/execution/execution.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ExecutionComponent, StopComponent, CleanupComponent, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/executions/execution/execution.component.ts b/ui/src/app/tasks-jobs/executions/execution/execution.component.ts index 36987eb4f..061350812 100644 --- a/ui/src/app/tasks-jobs/executions/execution/execution.component.ts +++ b/ui/src/app/tasks-jobs/executions/execution/execution.component.ts @@ -12,6 +12,7 @@ import {Task} from '../../../shared/model/task.model'; import {TaskConversion} from '../../../flo/task/model/models'; import {ToolsService} from '../../../flo/task/tools.service'; import get from 'lodash.get'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-execution', @@ -33,7 +34,8 @@ export class ExecutionComponent implements OnInit { private router: Router, private taskService: TaskService, private toolsService: ToolsService, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -122,7 +124,10 @@ export class ExecutionComponent implements OnInit { } log(): void { - this.logModal.open(`Log task execution ${this.execution.executionId}`, this.execution); + this.logModal.open( + this.translate.instant('executions.execution.logTitle', {id: this.execution.executionId}), + this.execution + ); } stop(): void { diff --git a/ui/src/app/tasks-jobs/executions/execution/log/log.component.ts b/ui/src/app/tasks-jobs/executions/execution/log/log.component.ts index f1a11c17a..4aadd3b5f 100644 --- a/ui/src/app/tasks-jobs/executions/execution/log/log.component.ts +++ b/ui/src/app/tasks-jobs/executions/execution/log/log.component.ts @@ -13,11 +13,13 @@ import {TaskExecution} from '../../../../shared/model/task-execution.model';

- Loading logs... + {{ 'commons.loading' | translate }}
- +
` }) diff --git a/ui/src/app/tasks-jobs/executions/executions.component.html b/ui/src/app/tasks-jobs/executions/executions.component.html index ed7a03756..172bbea79 100644 --- a/ui/src/app/tasks-jobs/executions/executions.component.html +++ b/ui/src/app/tasks-jobs/executions/executions.component.html @@ -1,4 +1,4 @@ -

Task executions

+

{{ 'executions.main.title' | translate }}

Task executions #datagrid > - + + - Task executions (clrDgColumnResize)="updateContext('sizeId', $event)" [style.width.px]="context.sizeId | datagridcolumn: datagrid:contextName | async" > - Execution ID + {{ 'executions.main.executionId' | translate }} Task executions (clrDgColumnResize)="updateContext('sizeName', $event)" [style.width.px]="context.sizeName | datagridcolumn: datagrid:contextName | async" > - Task name + {{ 'executions.main.taskName' | translate }} - Duration + {{ 'executions.main.duration' | translate }} Task executions (clrDgColumnResize)="updateContext('sizeStart', $event)" [style.width.px]="context.sizeStart | datagridcolumn: datagrid:contextName | async" > - Start Date + {{ 'executions.main.startDate' | translate }} Task executions (clrDgColumnResize)="updateContext('sizeEnd', $event)" [style.width.px]="context.sizeEnd | datagridcolumn: datagrid:contextName | async" > - End Date + {{ 'executions.main.endDate' | translate }} Task executions (clrDgColumnResize)="updateContext('sizeExit', $event)" [style.width.px]="context.sizeExit | datagridcolumn: datagrid:contextName | async" > - Exit Code + {{ 'executions.main.exitCode' | translate }} @@ -89,27 +93,33 @@

Task executions

{{ execution.endTime | datetime }} {{ execution.exitCode }} - - - + + + + - - No results found. + {{ 'commons.noResultFound' | translate }} Task executions [clrDgPageSize]="context.size" [clrDgPage]="context.current" > - Task executions per page - {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ page?.total }} task executions + {{ + 'executions.main.executionPerPage' | translate + }} + {{ + 'executions.main.pagination' + | translate: {first: pagination.firstItem + 1, last: pagination.lastItem + 1, total: page?.total} + }} diff --git a/ui/src/app/tasks-jobs/executions/executions.component.spec.ts b/ui/src/app/tasks-jobs/executions/executions.component.spec.ts index 9cf6b37de..7a8bcd4cc 100644 --- a/ui/src/app/tasks-jobs/executions/executions.component.spec.ts +++ b/ui/src/app/tasks-jobs/executions/executions.component.spec.ts @@ -13,8 +13,9 @@ import {CleanupComponent} from './cleanup/cleanup.component'; import {RoleDirective} from '../../security/directive/role.directive'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {SettingsServiceMock} from '../../tests/service/settings.service.mock'; -import {ConfirmComponent} from '../../shared/component/confirm/confirm.component'; import {DatagridColumnPipe} from '../../shared/pipe/datagrid-column.pipe'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('tasks-jobs/executions/executions.component.ts', () => { let component: ExecutionsComponent; @@ -24,7 +25,13 @@ describe('tasks-jobs/executions/executions.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ExecutionsComponent, StopComponent, CleanupComponent, RoleDirective, DatagridColumnPipe], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/executions/stop/stop.component.html b/ui/src/app/tasks-jobs/executions/stop/stop.component.html index 6fcdc22e8..121bc6c55 100644 --- a/ui/src/app/tasks-jobs/executions/stop/stop.component.html +++ b/ui/src/app/tasks-jobs/executions/stop/stop.component.html @@ -1,20 +1,20 @@ -

Confirm Stop Task Execution

+

{{ 'executions.stop.title' | translate }}

-

- This action will stop the task execution {{ execution.executionId }} (task - {{ execution.taskName }}). Are you sure? -

+

- Stopping task execution... + {{ 'executions.stop.stopping' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/executions/stop/stop.component.spec.ts b/ui/src/app/tasks-jobs/executions/stop/stop.component.spec.ts index 5856d8218..a8e34666a 100644 --- a/ui/src/app/tasks-jobs/executions/stop/stop.component.spec.ts +++ b/ui/src/app/tasks-jobs/executions/stop/stop.component.spec.ts @@ -12,6 +12,8 @@ import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {TaskExecution} from '../../../shared/model/task-execution.model'; import {StopComponent} from './stop.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/executions/stop/stop.component.ts', () => { let component: StopComponent; @@ -21,7 +23,13 @@ describe('tasks-jobs/executions/stop/stop.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [StopComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/executions/stop/stop.component.ts b/ui/src/app/tasks-jobs/executions/stop/stop.component.ts index 580ce4065..3296dfe89 100644 --- a/ui/src/app/tasks-jobs/executions/stop/stop.component.ts +++ b/ui/src/app/tasks-jobs/executions/stop/stop.component.ts @@ -2,6 +2,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core'; import {TaskExecution} from '../../../shared/model/task-execution.model'; import {TaskService} from '../../../shared/api/task.service'; import {NotificationService} from '../../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-execution-stop', @@ -13,7 +14,11 @@ export class StopComponent { execution: TaskExecution; @Output() onStopped = new EventEmitter(); - constructor(private taskService: TaskService, private notificationService: NotificationService) {} + constructor( + private taskService: TaskService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(execution: TaskExecution): void { this.execution = execution; @@ -26,8 +31,8 @@ export class StopComponent { this.taskService.executionStop(this.execution).subscribe( () => { this.notificationService.success( - 'Stop task execution(s)', - `Request submitted to stop task execution "${this.execution.executionId}".` + this.translate.instant('executions.stop.message.successTitle'), + this.translate.instant('executions.stop.message.successContent', {id: this.execution.executionId}) ); this.onStopped.emit(true); this.isOpen = false; @@ -36,8 +41,8 @@ export class StopComponent { }, error => { this.notificationService.error( - 'An error occurred', - 'An error occurred while stopping task executions. ' + 'Please check the server logs for more details.' + this.translate.instant('commons.message.error'), + this.translate.instant('executions.stop.message.errorContent') ); this.isOpen = false; this.execution = null; diff --git a/ui/src/app/tasks-jobs/jobs/execution/execution.component.html b/ui/src/app/tasks-jobs/jobs/execution/execution.component.html index 1e6bf30ca..74a19e376 100644 --- a/ui/src/app/tasks-jobs/jobs/execution/execution.component.html +++ b/ui/src/app/tasks-jobs/jobs/execution/execution.component.html @@ -1,5 +1,6 @@

- Job execution {{ execution.name }} ({{ execution.jobExecutionId }}) + {{ 'jobs.execution.title' | translate }} + {{ execution.name }} ({{ execution.jobExecutionId }})

@@ -9,7 +10,7 @@

(click)="restart()" [disabled]="execution.status !== 'FAILED' && execution.status !== 'STOPPED' && execution.status !== 'ERROR'" > - Restart the job + {{ 'jobs.execution.restart' | translate }}

- +
-
Id
+
{{ 'jobs.main.id' | translate }}
{{ execution.jobExecutionId }}
-
Job Name
+
{{ 'jobs.main.jobName' | translate }}
{{ execution.name }}
-
Job Instance
+
{{ 'jobs.main.jobInstance' | translate }}
{{ execution.jobInstanceId }}
-
Task Execution Id
+
{{ 'jobs.main.taskExecutionId' | translate }}
{{ execution.taskExecutionId @@ -50,39 +56,39 @@

-
Job Parameters
+
{{ 'jobs.main.jobParameters' | translate }}
{{ execution.jobParametersString }}
-
Start Time
+
{{ 'jobs.main.startTime' | translate }}
{{ execution.startTime | datetime }}
-
End Time
+
{{ 'jobs.main.endTime' | translate }}
{{ execution.endTime | datetime }}
-
Duration
+
{{ 'jobs.main.duration' | translate }}
{{ execution.startTime | duration: execution.endTime }}
-
Status
+
{{ 'jobs.main.status' | translate }}
{{ execution.status }}
-
Exit Code
+
{{ 'jobs.main.exitCode' | translate }}
{{ execution.exitCode }}
-
Exit Message
+
{{ 'jobs.main.exitMessage' | translate }}
{{ execution.exitMessage }}
-
Step Execution Count
+
{{ 'jobs.main.stepExecutionCount' | translate }}
{{ execution.stepExecutionCount }}
@@ -90,32 +96,37 @@

- +
-
Name
+
{{ 'tasks.main.name' | translate }}
{{ task.name }}
-
Description
+
{{ 'tasks.main.description' | translate }}
{{ task.description }}
-
Definition
+
{{ 'tasks.main.definition' | translate }}
{{ task.dslText }}
-
Status
+
{{ 'tasks.main.status' | translate }}
{{ task.status }}
-
Applications
+
{{ 'tasks.main.applications' | translate }}
@@ -126,33 +137,42 @@

- Loading application(s)... + {{ 'commons.loading' | translate }}
-
No task found.
+
{{ 'jobs.execution.noTaskFound' | translate }}
- Loading task... + {{ 'commons.loading' | translate }}
- - + +
- +
-
Execution Id
+
{{ 'executions.main.executionId' | translate }}
{{ taskExecution.executionId }}
-
Arguments
+
{{ 'executions.main.arguments' | translate }}
@@ -164,13 +184,13 @@

-
External Execution Id
+
{{ 'executions.main.externalExecutionId' | translate }}
{{ taskExecution.externalExecutionId || 'N/A' }}
-
Job Execution Ids
+
{{ 'executions.main.jobExecutionIds' | translate }}
-
Batch Job
+
{{ 'executions.main.batchJob' | translate }}
-
Start Time
+
{{ 'executions.main.startTime' | translate }}
{{ taskExecution.startTime | datetime }}
-
End Time
+
{{ 'executions.main.endTime' | translate }}
{{ taskExecution.endTime | datetime }}
-
Duration
+
{{ 'executions.main.duration' | translate }}
{{ taskExecution.startTime | duration: taskExecution.endTime }}
-
Exit Code
+
{{ 'executions.main.exitCode' | translate }}
{{ taskExecution.exitCode }}
-
Exit Message
+
{{ 'executions.main.exitMessage' | translate }}
{{ taskExecution.exitMessage || 'N/A' }}
-
Resource URL
+
{{ 'executions.main.resourceUrl' | translate }}
{{ taskExecution.resourceUrl || 'N/A' }}
-
Application Properties
+
{{ 'executions.main.applicationProperties' | translate }}
@@ -237,7 +257,7 @@

-
Platform Properties
+
{{ 'executions.main.platformProperties' | translate }}
@@ -249,35 +269,44 @@

-
No execution yet.
+
{{ 'executions.main.noExecution' | translate }}
- Loading task... + {{ 'commons.loading' | translate }}
- - + +
- +
Execution IDTask{{ 'executions.main.executionId' | translate }}{{ 'executions.main.taskName' | translate }}
- - - - - - - - + + + + + + + + @@ -311,19 +340,29 @@

- Loading job execution... + {{ 'commons.loading' | translate }}
- - This action will restart the steps failed of the job execution - {{ execution?.name }} ({{ execution?.jobExecutionId }}).
- Are you sure? + +
- - This action will stop the job execution - {{ execution?.name }} ({{ execution?.jobExecutionId }}).
- Are you sure? + +
diff --git a/ui/src/app/tasks-jobs/jobs/execution/execution.component.spec.ts b/ui/src/app/tasks-jobs/jobs/execution/execution.component.spec.ts index 74592a0b7..7e854d9f4 100644 --- a/ui/src/app/tasks-jobs/jobs/execution/execution.component.spec.ts +++ b/ui/src/app/tasks-jobs/jobs/execution/execution.component.spec.ts @@ -15,6 +15,8 @@ import {ToolsServiceMock} from '../../../tests/service/task-tools.service.mock'; import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {LogComponent} from '../../executions/execution/log/log.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/jobs/execution/execution.component.ts', () => { let component: ExecutionComponent; @@ -24,7 +26,13 @@ describe('tasks-jobs/jobs/execution/execution.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ExecutionComponent, StopComponent, ConfirmComponent, LogComponent, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts b/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts index 8775ef316..7e8311d7b 100644 --- a/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts +++ b/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts @@ -13,6 +13,7 @@ import {TaskService} from '../../../shared/api/task.service'; import {ToolsService} from '../../../flo/task/tools.service'; import get from 'lodash.get'; import {LogComponent} from '../../executions/execution/log/log.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-job-execution', @@ -38,7 +39,8 @@ export class ExecutionComponent implements OnInit { private toolsService: ToolsService, private taskService: TaskService, private router: Router, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -57,7 +59,7 @@ export class ExecutionComponent implements OnInit { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); if (HttpError.is404(error)) { this.router.navigateByUrl('/tasks-jobs/job-executions'); } @@ -75,7 +77,7 @@ export class ExecutionComponent implements OnInit { }, error => { this.loadingExecution = false; - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } @@ -133,10 +135,13 @@ export class ExecutionComponent implements OnInit { restartJob(): void { this.jobService.restart(this.execution).subscribe( () => { - this.notificationService.success('Restart job', `Successfully restarted job "${this.execution.name}"`); + this.notificationService.success( + this.translate.instant('jobs.main.message.successStopTitle'), + this.translate.instant('jobs.main.message.successRestartMessage', {name: this.execution.name}) + ); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } @@ -171,10 +176,13 @@ export class ExecutionComponent implements OnInit { stopJob(): void { this.jobService.stop(this.execution).subscribe( () => { - this.notificationService.success('Stop job', `Successfully stopped job "${this.execution.name}"`); + this.notificationService.success( + this.translate.instant('jobs.main.message.successStopTitle'), + this.translate.instant('jobs.main.message.successStopMessage', {name: this.execution.name}) + ); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/tasks-jobs/jobs/jobs.component.html b/ui/src/app/tasks-jobs/jobs/jobs.component.html index 069f5ef28..a3c4b7016 100644 --- a/ui/src/app/tasks-jobs/jobs/jobs.component.html +++ b/ui/src/app/tasks-jobs/jobs/jobs.component.html @@ -1,40 +1,42 @@ -

Jobs

+

{{ 'jobs.main.title' | translate }}

- + - Execution Id + {{ 'jobs.main.executionId' | translate }} - Name + {{ 'jobs.main.name' | translate }} - Task Id + {{ 'jobs.main.taskId' | translate }} - Instance Id + {{ 'jobs.main.instanceId' | translate }} - Job Start Time + {{ 'jobs.main.startTime' | translate }} @@ -44,14 +46,14 @@

Jobs

(clrDgColumnResize)="updateContext('sizeStepCount', $event)" [style.width.px]="context.sizeStepCount | datagridcolumn: datagrid:contextName | async" > - Step Execution Count + {{ 'jobs.main.stepExecutionCount' | translate }} - Status + {{ 'jobs.main.status' | translate }} @@ -69,25 +71,27 @@

Jobs

>{{ execution.status }} - + + - - No results found. + {{ 'commons.noResultFound' | translate }} Jobs

[clrDgPageSize]="context.size" [clrDgPage]="context.current" > - Job executions per page - {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ page?.total }} job executions + {{ + 'jobs.main.jobPerPage' | translate + }} + {{ + 'jobs.main.pagination' + | translate: {first: pagination.firstItem + 1, last: pagination.lastItem + 1, total: page?.total} + }} - - This action will restart the steps failed of the job execution - {{ selection?.name }} ({{ selection?.jobExecutionId }}).
- Are you sure? + +
- - This action will stop the job execution - {{ selection?.name }} ({{ selection?.jobExecutionId }}).
- Are you sure? + +
diff --git a/ui/src/app/tasks-jobs/jobs/jobs.component.spec.ts b/ui/src/app/tasks-jobs/jobs/jobs.component.spec.ts index 1d8469adb..302c1cede 100644 --- a/ui/src/app/tasks-jobs/jobs/jobs.component.spec.ts +++ b/ui/src/app/tasks-jobs/jobs/jobs.component.spec.ts @@ -15,6 +15,8 @@ import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {SettingsServiceMock} from '../../tests/service/settings.service.mock'; import {DateFilterComponent} from '../../shared/filter/date/date.filter'; import {DatagridColumnPipe} from '../../shared/pipe/datagrid-column.pipe'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('tasks-jobs/jobs/jobs.component.ts', () => { let component: JobsComponent; @@ -31,7 +33,13 @@ describe('tasks-jobs/jobs/jobs.component.ts', () => { DateFilterComponent, DatagridColumnPipe ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/jobs/jobs.component.ts b/ui/src/app/tasks-jobs/jobs/jobs.component.ts index 783201783..a7318a56f 100644 --- a/ui/src/app/tasks-jobs/jobs/jobs.component.ts +++ b/ui/src/app/tasks-jobs/jobs/jobs.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, ViewChild} from '@angular/core'; import {JobService} from '../../shared/api/job.service'; import {ClrDatagridStateInterface} from '@clr/angular'; import {JobExecution, JobExecutionPage} from '../../shared/model/job.model'; @@ -8,6 +8,7 @@ import {NotificationService} from '../../shared/service/notification.service'; import {DatagridComponent} from '../../shared/component/datagrid/datagrid.component'; import {ContextService} from '../../shared/service/context.service'; import {SettingsService} from '../../settings/settings.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-jobs', @@ -25,7 +26,8 @@ export class JobsComponent extends DatagridComponent { protected contextService: ContextService, protected settingsService: SettingsService, protected changeDetectorRef: ChangeDetectorRef, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) { super(contextService, settingsService, changeDetectorRef, 'tasks-jobs/jobs'); } @@ -44,7 +46,7 @@ export class JobsComponent extends DatagridComponent { }, error => { this.loading = false; - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } @@ -62,10 +64,13 @@ export class JobsComponent extends DatagridComponent { restartJob(): void { this.jobService.restart(this.selection).subscribe( () => { - this.notificationService.success('Restart job', `Successfully restarted job "${this.selection.name}"`); + this.notificationService.success( + this.translate.instant('jobs.main.message.successStopTitle'), + this.translate.instant('jobs.main.message.successRestartMessage', {name: this.selection.name}) + ); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } @@ -78,10 +83,13 @@ export class JobsComponent extends DatagridComponent { stopJob(): void { this.jobService.stop(this.selection).subscribe( () => { - this.notificationService.success('Stop job', `Successfully stopped job "${this.selection.name}"`); + this.notificationService.success( + this.translate.instant('jobs.main.message.successStopTitle'), + this.translate.instant('jobs.main.message.successStopMessage', {name: this.selection.name}) + ); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/tasks-jobs/jobs/step/step.component.html b/ui/src/app/tasks-jobs/jobs/step/step.component.html index e4a8d5eb2..6dca7281a 100644 --- a/ui/src/app/tasks-jobs/jobs/step/step.component.html +++ b/ui/src/app/tasks-jobs/jobs/step/step.component.html @@ -1,45 +1,63 @@

- Step Execution + {{ 'jobs.step.title' | translate }} - {{ stepResource.stepExecution.name }} ({{ stepResource.stepExecution.id }}) - Job execution + {{ stepResource.stepExecution.name }} ({{ stepResource.stepExecution.id }}) - + {{ 'jobs.execution.title' | translate }} {{ execution.name }} ({{ execution.jobExecutionId }})

- +
- +
-
No Step Execution available.
+
{{ 'jobs.step.noStep' | translate }}
-
Step Execution Id
+
+ {{ 'jobs.step.stepExecutionId' | translate }} +
{{ stepResource.stepExecution.id }}
-
Job Execution Id
+
+ {{ 'jobs.step.jobExecutionId' | translate }} +
{{ stepResource.jobExecutionId }}
-
Step Name
+
+ {{ 'jobs.step.stepName' | translate }} +
{{ stepResource.stepExecution.name }}
-
Step Type
+
+ {{ 'jobs.step.stepType' | translate }} +
{{ stepResource.stepType }}
-
Status
+
+ {{ 'jobs.step.status' | translate }} +
{{ stepResource.stepExecution.status }}
-
Commits
+
+ {{ 'jobs.step.commits' | translate }} +
{{ stepResource.stepExecution.commitCount }}
-
Duration
+
+ {{ 'jobs.step.duration' | translate }} +
{{ stepResource.stepExecution.startTime | duration: stepResource.stepExecution.endTime }}
-
Filter Count
+
+ {{ 'jobs.step.filterCount' | translate }} +
{{ stepResource.stepExecution.filterCount }}
-
Process Skips
+
+ {{ 'jobs.step.processSkips' | translate }} +
{{ stepResource.stepExecution.processSkipCount }}
-
Reads
+
+ {{ 'jobs.step.reads' | translate }} +
{{ stepResource.stepExecution.readCount }}
-
Read Skips
+
+ {{ 'jobs.step.readSkips' | translate }} +
{{ stepResource.stepExecution.readSkipCount }}
-
Rollbacks
+
+ {{ 'jobs.step.rollbacks' | translate }} +
{{ stepResource.stepExecution.rollbackCount }}
-
Skips
+
+ {{ 'jobs.step.skips' | translate }} +
{{ stepResource.stepExecution.skipCount }}
-
Writes
+
+ {{ 'jobs.step.writes' | translate }} +
{{ stepResource.stepExecution.writeCount }}
-
Write Skips
+
+ {{ 'jobs.step.writeSkips' | translate }} +
{{ stepResource.stepExecution.writeSkipCount }}
@@ -93,7 +131,7 @@

- No step execution context + {{ 'jobs.step.noExecutionContext' | translate }}
>
- - - - - - + + + + + + - + @@ -163,7 +203,9 @@

- + @@ -171,7 +213,9 @@

- + @@ -179,7 +223,9 @@

- + @@ -187,7 +233,9 @@

- + @@ -195,7 +243,9 @@

- + @@ -203,7 +253,9 @@

- + @@ -211,7 +263,9 @@

- + @@ -219,7 +273,9 @@

- + @@ -227,7 +283,9 @@

- + @@ -240,32 +298,37 @@

- +
-
Name
+
{{ 'tasks.main.name' | translate }}
{{ task.name }}
-
Description
+
{{ 'tasks.main.description' | translate }}
{{ task.description }}
-
Definition
+
{{ 'tasks.main.definition' | translate }}
{{ task.dslText }}
-
Status
+
{{ 'tasks.main.status' | translate }}
{{ task.status }}
-
Applications
+
{{ 'tasks.main.applications' | translate }}
@@ -276,33 +339,42 @@

- Loading application(s)... + {{ 'commons.loading' | translate }}
-
No task found.
+
{{ 'jobs.execution.noTaskFound' | translate }}
- Loading task... + {{ 'commons.loading' | translate }}
- - + +
- +
-
Execution Id
+
{{ 'executions.main.executionId' | translate }}
{{ taskExecution.executionId }}
-
Arguments
+
{{ 'executions.main.arguments' | translate }}
@@ -314,7 +386,7 @@

-
External Execution Id
+
{{ 'executions.main.jobExecutionIds' | translate }}
-
Batch Job
+
{{ 'executions.main.batchJob' | translate }}
-
Job Execution Ids
+
{{ 'executions.main.externalExecutionId' | translate }}
{{ taskExecution.externalExecutionId || 'N/A' }}
-
Start Time
+
{{ 'executions.main.startTime' | translate }}
{{ taskExecution.startTime | datetime }}
-
End Time
+
{{ 'executions.main.endTime' | translate }}
{{ taskExecution.endTime | datetime }}
-
Duration
+
{{ 'executions.main.startTime' | translate }}
{{ taskExecution.startTime | duration: taskExecution.endTime }}
-
Exit Code
+
{{ 'executions.main.exitCode' | translate }}
{{ taskExecution.exitCode }}
-
Exit Message
+
{{ 'executions.main.exitMessage' | translate }}
{{ taskExecution.exitMessage || 'N/A' }}
-
Resource URL
+
{{ 'executions.main.resourceUrl' | translate }}
{{ taskExecution.resourceUrl || 'N/A' }}
-
Application Properties
+
{{ 'executions.main.applicationProperties' | translate }}
@@ -387,7 +459,7 @@

-
Platform Properties
+
{{ 'executions.main.platformProperties' | translate }}
@@ -399,16 +471,20 @@

-
No execution yet.
+
{{ 'executions.main.noExecution' | translate }}
- Loading execution... + {{ 'commons.loading' | translate }}
- - + +
@@ -417,7 +493,7 @@

- Loading job step execution... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/tasks-jobs/jobs/step/step.component.spec.ts b/ui/src/app/tasks-jobs/jobs/step/step.component.spec.ts index 00c1c9e5f..889e08b41 100644 --- a/ui/src/app/tasks-jobs/jobs/step/step.component.spec.ts +++ b/ui/src/app/tasks-jobs/jobs/step/step.component.spec.ts @@ -15,6 +15,8 @@ import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {ToolsServiceMock} from '../../../tests/service/task-tools.service.mock'; import {StepComponent} from './step.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/jobs/step/step.component.ts', () => { let component: StepComponent; @@ -24,7 +26,13 @@ describe('tasks-jobs/jobs/step/step.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [StepComponent, StopComponent, ConfirmComponent, LogComponent, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/jobs/step/step.component.ts b/ui/src/app/tasks-jobs/jobs/step/step.component.ts index 63bdcf247..7574946a6 100644 --- a/ui/src/app/tasks-jobs/jobs/step/step.component.ts +++ b/ui/src/app/tasks-jobs/jobs/step/step.component.ts @@ -13,6 +13,7 @@ import {ToolsService} from '../../../flo/task/tools.service'; import get from 'lodash.get'; import {TaskService} from '../../../shared/api/task.service'; import {LogComponent} from '../../executions/execution/log/log.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-execution-step', @@ -37,7 +38,8 @@ export class StepComponent implements OnInit { private router: Router, private taskService: TaskService, private toolsService: ToolsService, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -54,14 +56,11 @@ export class StepComponent implements OnInit { this.jobService.getExecutionStep(params.executionId, params.stepId), this.jobService.getExecutionStepProgress(params.executionId, params.stepId) ]).pipe( - map(results => - // this.jobId = val.jobid; - ({ - execution: results[0], - step: results[1], - stepProgress: results[2] - }) - ) + map(results => ({ + execution: results[0], + step: results[1], + stepProgress: results[2] + })) ) ) ) @@ -74,7 +73,7 @@ export class StepComponent implements OnInit { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); if (HttpError.is404(error)) { this.router.navigateByUrl('/tasks-jobs/job-executions'); } @@ -92,7 +91,7 @@ export class StepComponent implements OnInit { }, error => { this.loadingExecution = false; - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/tasks-jobs/schedules/create/create.component.html b/ui/src/app/tasks-jobs/schedules/create/create.component.html index 63b8b251a..880a903dc 100644 --- a/ui/src/app/tasks-jobs/schedules/create/create.component.html +++ b/ui/src/app/tasks-jobs/schedules/create/create.component.html @@ -1,15 +1,15 @@ -

Create schedule(s)

+

{{ 'schedules.create.title' | translate }}

-
Task Name
+
{{ 'schedules.main.taskName' | translate }}
{{ config.tasks[0].name }}
- + Create schedule(s)

name="example" [dataflowFocus]="true" /> - The name is required. - The name already exists. + {{ + 'schedules.create.requiredName' | translate + }} + {{ 'schedules.create.uniqueName' | translate }}
@@ -28,19 +30,19 @@

Create schedule(s)

- Duplicate schedule name on the form. + {{ 'schedules.create.duplicateScheduleName' | translate }}
-
Task Name
+
{{ 'schedules.main.taskName' | translate }}
{{ task.name }}
- + Create schedule(s) name="example" [dataflowFocus]="i === 0" /> - The name is required. - The name already exists. - The name already exists. + {{ + 'schedules.create.requiredScheduleName' | translate + }} + {{ + 'schedules.create.uniqueScheduleName' | translate + }} + {{ + 'schedules.create.uniqueScheduleName' | translate + }}
- + - The platform is required. + {{ + 'schedules.create.requiredPlatform' | translate + }} - + - The cron expression is required. + {{ + 'schedules.create.requiredCronExpression' | translate + }} - + - Arguments can be prefixed by -- (optional). Example:
+ 
--myarg1=value1
 --myarg2=value2
 - One or more arguments are invalid.
Example: myarg=myvalue. +
- + - Parameters should start with an app. or scheduler.. Example:
+ 
app.myparam=value1
-          scheduler.myparam2=value2
+scheduler.myparam2=value2 - One or more parameters are invalid.
Example: app.myarg=myvalue. +
- - + +
- Loading... + {{ 'commons.loading' | translate }}
-

Create schedule(s)

+

{{ 'schedules.create.create' | translate }}

- Creating schedule(s)... + {{ 'schedules.create.creating' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/schedules/create/create.component.spec.ts b/ui/src/app/tasks-jobs/schedules/create/create.component.spec.ts index 4daf08dac..21aab7d39 100644 --- a/ui/src/app/tasks-jobs/schedules/create/create.component.spec.ts +++ b/ui/src/app/tasks-jobs/schedules/create/create.component.spec.ts @@ -12,6 +12,8 @@ import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {CreateComponent} from './create.component'; import {GroupServiceMock} from '../../../tests/service/group.service.mock'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/schedules/create/create.component.ts', () => { let component: CreateComponent; @@ -21,7 +23,13 @@ describe('tasks-jobs/schedules/create/create.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [CreateComponent, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/schedules/create/create.component.ts b/ui/src/app/tasks-jobs/schedules/create/create.component.ts index a1461a525..e95744a1b 100644 --- a/ui/src/app/tasks-jobs/schedules/create/create.component.ts +++ b/ui/src/app/tasks-jobs/schedules/create/create.component.ts @@ -13,6 +13,7 @@ import {KeyValueValidator} from '../../../shared/component/key-value/key-value.v import {TaskPropValidator} from '../../tasks/task-prop.validator'; import {Task} from '../../../shared/model/task.model'; import {Platform} from '../../../shared/model/platform.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-schedules-create', @@ -30,7 +31,8 @@ export class CreateComponent implements OnInit { private route: ActivatedRoute, private scheduleService: ScheduleService, private taskService: TaskService, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -41,7 +43,7 @@ export class CreateComponent implements OnInit { if (this.groupService.group(params.id)) { return forkJoin([...(this.groupService.group(params.id) as any)].map(id => this.taskService.getTask(id))); } else { - return throwError('Group selection not found.'); + return throwError(this.translate.instant('schedules.create.message.groupSeclectionNotFoundTitle')); } } else { return forkJoin([this.taskService.getTask(params.id)]); @@ -78,7 +80,7 @@ export class CreateComponent implements OnInit { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.back(); } ); @@ -124,7 +126,10 @@ export class CreateComponent implements OnInit { submit(): void { if (!this.form.valid) { - this.notificationService.error('Invalid field(s)', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); } else { this.creating = true; const getClean = (val: string): Array => val.split('\n').filter(a => a !== ''); @@ -147,19 +152,21 @@ export class CreateComponent implements OnInit { () => { if (scheduleParams.length === 1) { this.notificationService.success( - 'Schedule creation', - `Successfully schedule creation "${scheduleParams[0].schedulerName}"` + this.translate.instant('schedules.create.message.scheculeSuccessTitle'), + this.translate.instant('schedules.create.message.scheculeSuccessContent', { + name: scheduleParams[0].schedulerName + }) ); } else { this.notificationService.success( - 'Schedules creation', - `Successfully ${scheduleParams.length} schedules creation` + this.translate.instant('schedules.create.message.scheculesSuccessTitle'), + this.translate.instant('schedules.create.message.scheculesSuccessContent', {count: scheduleParams.length}) ); } this.back(); }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.creating = false; } ); diff --git a/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.html b/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.html index 946d76754..8892462ae 100644 --- a/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.html +++ b/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.html @@ -1,25 +1,17 @@ -

Confirm Delete Schedule

-

Confirm Delete Schedules

+

{{ 'schedules.destroy.title' | translate }}

+

{{ 'schedules.destroy.title2' | translate }}

- This action will delete the schedule - {{ schedules[0].name }}. Are you sure? +
- This action will delete the - {{ schedules.length }} schedule{{ schedules?.length > 1 ? 's' : '' }} - listed below.
Are you sure? -
+
Step IdStep NameReadsWritesCommitsRollbacksDurationStatus{{ 'jobs.step.stepId' | translate }}{{ 'jobs.step.stepName' | translate }}{{ 'jobs.step.reads' | translate }}{{ 'jobs.step.writes' | translate }}{{ 'jobs.step.commits' | translate }}{{ 'jobs.step.rollbacks' | translate }}{{ 'jobs.step.duration' | translate }}{{ 'jobs.step.status' | translate }}
NameCountMinMaxMeanStandard Deviation{{ 'jobs.step.history.name' | translate }}{{ 'jobs.step.history.count' | translate }}{{ 'jobs.step.history.min' | translate }}{{ 'jobs.step.history.max' | translate }}{{ 'jobs.step.history.mean' | translate }}{{ 'jobs.step.history.standardDeviation' | translate }}
Commit Count + {{ 'jobs.step.history.commitCount' | translate }} + {{ stepProgress.stepExecutionHistory.commitCount.count }} {{ stepProgress.stepExecutionHistory.commitCount.min }} {{ stepProgress.stepExecutionHistory.commitCount.max }}{{ stepProgress.stepExecutionHistory.commitCount.standardDeviation }}
Duration + {{ 'jobs.step.history.duration' | translate }} + {{ stepProgress.stepExecutionHistory.duration.count }} {{ stepProgress.stepExecutionHistory.duration.min }} {{ stepProgress.stepExecutionHistory.duration.max }}{{ stepProgress.stepExecutionHistory.duration.standardDeviation }}
Duration per Read + {{ 'jobs.step.history.durationPerRead' | translate }} + {{ stepProgress.stepExecutionHistory.durationPerRead.count }} {{ stepProgress.stepExecutionHistory.durationPerRead.min }} {{ stepProgress.stepExecutionHistory.durationPerRead.max }}{{ stepProgress.stepExecutionHistory.durationPerRead.standardDeviation }}
Filter Count + {{ 'jobs.step.history.filterCount' | translate }} + {{ stepProgress.stepExecutionHistory.filterCount.count }} {{ stepProgress.stepExecutionHistory.filterCount.min }} {{ stepProgress.stepExecutionHistory.filterCount.max }}{{ stepProgress.stepExecutionHistory.filterCount.standardDeviation }}
Process Skip Count + {{ 'jobs.step.history.processSkipCount' | translate }} + {{ stepProgress.stepExecutionHistory.processSkipCount.count }} {{ stepProgress.stepExecutionHistory.processSkipCount.min }} {{ stepProgress.stepExecutionHistory.processSkipCount.max }}{{ stepProgress.stepExecutionHistory.processSkipCount.standardDeviation }}
Read Count + {{ 'jobs.step.history.readCount' | translate }} + {{ stepProgress.stepExecutionHistory.readCount.count }} {{ stepProgress.stepExecutionHistory.readCount.min }} {{ stepProgress.stepExecutionHistory.readCount.max }}{{ stepProgress.stepExecutionHistory.readCount.standardDeviation }}
Read Skip Count + {{ 'jobs.step.history.readSkipCount' | translate }} + {{ stepProgress.stepExecutionHistory.readSkipCount.count }} {{ stepProgress.stepExecutionHistory.readSkipCount.min }} {{ stepProgress.stepExecutionHistory.readSkipCount.max }}{{ stepProgress.stepExecutionHistory.readSkipCount.standardDeviation }}
Rollback Count + {{ 'jobs.step.history.rollbackCount' | translate }} + {{ stepProgress.stepExecutionHistory.rollbackCount.count }} {{ stepProgress.stepExecutionHistory.rollbackCount.min }} {{ stepProgress.stepExecutionHistory.rollbackCount.max }}{{ stepProgress.stepExecutionHistory.rollbackCount.standardDeviation }}
Write Count + {{ 'jobs.step.history.writeCount' | translate }} + {{ stepProgress.stepExecutionHistory.writeCount.count }} {{ stepProgress.stepExecutionHistory.writeCount.min }} {{ stepProgress.stepExecutionHistory.writeCount.max }}{{ stepProgress.stepExecutionHistory.writeCount.standardDeviation }}
Write Skip Count + {{ 'jobs.step.history.writeSkipCoumt' | translate }} + {{ stepProgress.stepExecutionHistory.writeSkipCount.count }} {{ stepProgress.stepExecutionHistory.writeSkipCount.min }} {{ stepProgress.stepExecutionHistory.writeSkipCount.max }}
- - - + + + @@ -35,13 +27,15 @@

Confirm Delete Schedules
- Deleting schedule(s) ... + {{ 'schedules.destroy.deleting' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.spec.ts b/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.spec.ts index d0619b9eb..40f57867a 100644 --- a/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.spec.ts +++ b/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.spec.ts @@ -12,6 +12,8 @@ import {throwError} from 'rxjs'; import {Schedule} from '../../../shared/model/schedule.model'; import {ScheduleServiceMock} from '../../../tests/api/schedule.service.mock'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks/schedules/destroy/destroy.component.ts', () => { let component: DestroyComponent; @@ -22,7 +24,13 @@ describe('tasks/schedules/destroy/destroy.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [DestroyComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.ts b/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.ts index 5fb3bf87a..d70f2e2ed 100644 --- a/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.ts +++ b/ui/src/app/tasks-jobs/schedules/destroy/destroy.component.ts @@ -2,6 +2,7 @@ import {Component, EventEmitter, Output} from '@angular/core'; import {NotificationService} from '../../../shared/service/notification.service'; import {ScheduleService} from '../../../shared/api/schedule.service'; import {Schedule} from '../../../shared/model/schedule.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-schedule-destroy', @@ -13,7 +14,11 @@ export class DestroyComponent { isRunning = false; @Output() onDestroyed = new EventEmitter(); - constructor(private scheduleService: ScheduleService, private notificationService: NotificationService) {} + constructor( + private scheduleService: ScheduleService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(schedules: Schedule[]): void { this.isRunning = false; @@ -32,15 +37,18 @@ export class DestroyComponent { ) .subscribe( data => { - this.notificationService.success('Delete schedule(s)', `${data.length} schedule(s) deleted.`); + this.notificationService.success( + this.translate.instant('schedules.destroy.message.successTitle'), + this.translate.instant('schedules.destroy.message.successContent', {count: data.length}) + ); this.onDestroyed.emit(data); this.isOpen = false; this.schedules = null; }, error => { this.notificationService.error( - 'An error occurred', - 'An error occurred while deleting schedule(s). ' + 'Please check the server logs for more details.' + this.translate.instant('commons.message.error'), + this.translate.instant('schedules.destroy.message.errorContent') ); this.isOpen = false; this.schedules = null; diff --git a/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.html b/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.html index fdd2e4276..877ef9a23 100644 --- a/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.html +++ b/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.html @@ -1,34 +1,43 @@

- Schedule {{ schedule?.name }} + {{ 'schedules.schedule.title' | translate }} {{ schedule?.name }}

- - + +
- +
-
Name
+
{{ 'schedules.main.name' | translate }}
{{ schedule.name }}
-
Task name
+
{{ 'schedules.main.taskName' | translate }}
{{ schedule.taskName }}
-
Platform
+
{{ 'schedules.main.platform' | translate }}
{{ schedule.platform || 'N/A' }}
-
Cron Expr.
+
{{ 'schedules.main.cronExp' | translate }}
{{ schedule.cronExpression || 'N/A' }}
@@ -37,23 +46,28 @@

- +
-
Name
+
{{ 'tasks.main.name' | translate }}
{{ task.name }}
-
Definition
+
{{ 'tasks.main.definition' | translate }}
{{ task.dslText }}
-
Status
+
{{ 'tasks.main.status' | translate }}
{{ task.status }}
@@ -67,7 +81,7 @@

- Loading schedule... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.spec.ts b/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.spec.ts index 713aaf04c..e4002738e 100644 --- a/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.spec.ts +++ b/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.spec.ts @@ -12,6 +12,8 @@ import {ScheduleServiceMock} from '../../../tests/api/schedule.service.mock'; import {ScheduleComponent} from './schedule.component'; import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/schedules/schedule/schedule.component.ts', () => { let component: ScheduleComponent; @@ -21,7 +23,13 @@ describe('tasks-jobs/schedules/schedule/schedule.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ScheduleComponent, DestroyComponent, RoleDirective], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.ts b/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.ts index 4aa4813bf..cfd13cb3e 100644 --- a/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.ts +++ b/ui/src/app/tasks-jobs/schedules/schedule/schedule.component.ts @@ -8,6 +8,7 @@ import {ScheduleService} from '../../../shared/api/schedule.service'; import {HttpError} from '../../../shared/model/error.model'; import {NotificationService} from '../../../shared/service/notification.service'; import {DestroyComponent} from '../destroy/destroy.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-schedule', @@ -24,7 +25,8 @@ export class ScheduleComponent implements OnInit { private router: Router, private scheduleService: ScheduleService, private notificationService: NotificationService, - private taskService: TaskService + private taskService: TaskService, + private translate: TranslateService ) {} ngOnInit(): void { @@ -52,7 +54,7 @@ export class ScheduleComponent implements OnInit { this.isLoading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.errors'), error); if (HttpError.is404(error)) { this.back(); } diff --git a/ui/src/app/tasks-jobs/schedules/schedules.component.html b/ui/src/app/tasks-jobs/schedules/schedules.component.html index b2a0fe3db..f46b1383c 100644 --- a/ui/src/app/tasks-jobs/schedules/schedules.component.html +++ b/ui/src/app/tasks-jobs/schedules/schedules.component.html @@ -1,4 +1,4 @@ -

Schedules

+

{{ 'schedules.main.title' | translate }}

Schedules #datagrid > - + - - + + - Name + {{ 'schedules.main.name' | translate }} - Task name + {{ 'schedules.main.taskName' | translate }} - Platform + {{ 'schedules.main.platform' | translate }} @@ -48,7 +54,7 @@

Schedules

(clrDgColumnResize)="updateContext('sizeCronExpression', $event)" [style.width.px]="context.sizeCronExpression | datagridcolumn: datagrid:contextName | async" > - Cron Expression + {{ 'schedules.main.cronExpression' | translate }} @@ -63,14 +69,20 @@

Schedules

{{ schedule.platform || 'N/A' }} {{ schedule.cronExpression || 'N/A' }} - - - - + + + + - No results found. - {{ page?.total }} schedules + {{ 'commons.noResultFound' | translate }} + {{ 'schedules.main.pagination' | translate: {count: page?.total} }} diff --git a/ui/src/app/tasks-jobs/schedules/schedules.component.spec.ts b/ui/src/app/tasks-jobs/schedules/schedules.component.spec.ts index 8756aad01..78f8a5a65 100644 --- a/ui/src/app/tasks-jobs/schedules/schedules.component.spec.ts +++ b/ui/src/app/tasks-jobs/schedules/schedules.component.spec.ts @@ -14,8 +14,9 @@ import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {SettingsServiceMock} from '../../tests/service/settings.service.mock'; import {PlatformFilterComponent} from './platform.filter'; import {TaskServiceMock} from '../../tests/api/task.service.mock'; -import {ConfirmComponent} from '../../shared/component/confirm/confirm.component'; import {DatagridColumnPipe} from '../../shared/pipe/datagrid-column.pipe'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('tasks-jobs/schedules/schedules.component.ts', () => { let component: SchedulesComponent; @@ -31,7 +32,13 @@ describe('tasks-jobs/schedules/schedules.component.ts', () => { RoleDirective, DatagridColumnPipe ], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/schedules/schedules.component.ts b/ui/src/app/tasks-jobs/schedules/schedules.component.ts index 027e6e857..ee5d2637c 100644 --- a/ui/src/app/tasks-jobs/schedules/schedules.component.ts +++ b/ui/src/app/tasks-jobs/schedules/schedules.component.ts @@ -8,6 +8,7 @@ import {DatagridComponent} from '../../shared/component/datagrid/datagrid.compon import {ContextService} from '../../shared/service/context.service'; import {SettingsService} from '../../settings/settings.service'; import {NotificationService} from '../../shared/service/notification.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-schedules', @@ -23,7 +24,8 @@ export class SchedulesComponent extends DatagridComponent { protected settingsService: SettingsService, protected changeDetectorRef: ChangeDetectorRef, protected contextService: ContextService, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) { super(contextService, settingsService, changeDetectorRef, 'tasks-jobs/schedules'); } @@ -45,7 +47,7 @@ export class SchedulesComponent extends DatagridComponent { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/tasks-jobs/tasks-jobs.module.ts b/ui/src/app/tasks-jobs/tasks-jobs.module.ts index 92010ec7d..dcba5a2ca 100644 --- a/ui/src/app/tasks-jobs/tasks-jobs.module.ts +++ b/ui/src/app/tasks-jobs/tasks-jobs.module.ts @@ -31,6 +31,7 @@ import {PlatformFilterComponent} from './schedules/platform.filter'; import {CloneComponent} from './tasks/clone/clone.component'; import {SharedFloModule} from '../flo/shared-flo.module'; import {ErrorsComponent} from './tasks/launch/builder/errors/errors.component'; +import {TranslateModule} from '@ngx-translate/core'; @NgModule({ declarations: [ @@ -65,6 +66,7 @@ import {ErrorsComponent} from './tasks/launch/builder/errors/errors.component'; SharedModule, SharedFloModule, TasksJobsRoutingModule, + TranslateModule, FormsModule, TaskFloModule, SecurityModule diff --git a/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.html b/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.html index 4bf118442..64e4e8547 100644 --- a/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.html +++ b/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.html @@ -1,33 +1,33 @@ -

Confirm Clean Up Execution(s)

+

{{ 'tasks.cleanup.title' | translate }}

-

- This action will remove {{ count.all }} execution(s). Are you sure? -

+

-

Please, selected the status of the execution to remove:

+

{{ 'tasks.cleanup.selectContent' | translate }}

- + - +
- Removing data... + {{ 'tasks.cleanup.removing' | translate }}
- Loading... + {{ 'tasks.cleanup.commons.loading' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.spec.ts b/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.spec.ts index 4ac3eb376..d27c8222f 100644 --- a/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.spec.ts @@ -11,6 +11,8 @@ import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {CleanupComponent} from './cleanup.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; import {Task} from '../../../shared/model/task.model'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/tasks/cleanup/cleanup.component.ts', () => { let component: CleanupComponent; @@ -21,7 +23,13 @@ describe('tasks-jobs/tasks/cleanup/cleanup.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [CleanupComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.ts b/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.ts index d85a55409..dc1cb56e8 100644 --- a/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.ts +++ b/ui/src/app/tasks-jobs/tasks/cleanup/cleanup.component.ts @@ -3,6 +3,7 @@ import {TaskService} from '../../../shared/api/task.service'; import {NotificationService} from '../../../shared/service/notification.service'; import {Task} from '../../../shared/model/task.model'; import {AppError} from '../../../shared/model/error.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-task-cleanup', @@ -17,7 +18,11 @@ export class CleanupComponent { status = 'all'; @Output() onCleaned = new EventEmitter(); - constructor(private taskService: TaskService, private notificationService: NotificationService) {} + constructor( + private taskService: TaskService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(task: Task): void { this.status = 'all'; @@ -28,13 +33,16 @@ export class CleanupComponent { this.count = count; this.loading = false; if (this.count.all === 0) { - this.notificationService.warning('No execution', 'There is no execution for this task.'); + this.notificationService.warning( + this.translate.instant('tasks.cleanup.message.warningNoExecutionTitle'), + this.translate.instant('tasks.cleanup.message.warningNoExecutionContent') + ); this.isOpen = false; this.task = null; } }, (error: AppError) => { - this.notificationService.error('An error occurred', error.getMessage()); + this.notificationService.error(this.translate.instant('commons.message.error'), error.getMessage()); this.isOpen = false; } ); @@ -47,15 +55,17 @@ export class CleanupComponent { this.taskService.taskExecutionsClean(this.task, this.status === 'completed').subscribe( () => { this.notificationService.success( - 'Clean up execution(s)', - `${this.status === 'completed' ? this.count.completed : this.count.all} execution(s) cleaned up.` + this.translate.instant('tasks.cleanup.message.successTitle'), + this.translate.instant('tasks.cleanup.message.successContent', { + count: this.status === 'completed' ? this.count.completed : this.count.all + }) ); this.onCleaned.emit(this.count); this.isOpen = false; this.task = null; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.isOpen = false; this.task = null; } diff --git a/ui/src/app/tasks-jobs/tasks/clone/clone.component.html b/ui/src/app/tasks-jobs/tasks/clone/clone.component.html index 1d87aea59..627438da2 100644 --- a/ui/src/app/tasks-jobs/tasks/clone/clone.component.html +++ b/ui/src/app/tasks-jobs/tasks/clone/clone.component.html @@ -1,6 +1,6 @@ -

Clone Task

-

Clone Tasks

+

{{ 'tasks.clone.cloneTitle' | translate }}

+

{{ 'tasks.clones.cloneTitle' | translate }}

Clone Tasks clrLabelSize="4" style="padding: 0; margin: 0" > -
This action will create the following task(s):
+
-
Duplicate task name, please check input names.
+
{{ 'tasks.clone.duplication' | translate }}
- +
{{ task.dslText }}
- + Clone Tasks class="clr-col-12 clr-col-md-10" style="width: 100%" /> - Task name is required. + {{ 'tasks.clone.requiredName' | translate }} - Invalid task name (no space or special charaters). + {{ 'tasks.clone.invalidName' | translate }} - Task name must be less than 255 characters long. + {{ 'tasks.clone.maxLengthName' | translate }} - Task name is already taken. + {{ + 'tasks.clone.uniqueName' | translate + }}
@@ -55,17 +57,19 @@

Clone Tasks

- Loading... + {{ 'commons.loading' | translate }}
- Cloning task(s)... + {{ 'tasks.clone.cloning' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/tasks/clone/clone.component.spec.ts b/ui/src/app/tasks-jobs/tasks/clone/clone.component.spec.ts index bb5ab6f58..c7256c622 100644 --- a/ui/src/app/tasks-jobs/tasks/clone/clone.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/clone/clone.component.spec.ts @@ -9,6 +9,8 @@ import {NotificationServiceMock} from '../../../tests/service/notification.servi import {ContextServiceMock} from '../../../tests/service/context.service.mock'; import {CloneComponent} from './clone.component'; import {TaskServiceMock} from '../../../tests/api/task.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('apps/tasks-jobs/tasks/clone/clone.component.ts', () => { let component: CloneComponent; @@ -23,6 +25,7 @@ describe('apps/tasks-jobs/tasks/clone/clone.component.ts', () => { ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), ReactiveFormsModule ], providers: [ diff --git a/ui/src/app/tasks-jobs/tasks/clone/clone.component.ts b/ui/src/app/tasks-jobs/tasks/clone/clone.component.ts index 5eaa2da2c..a035f2e11 100644 --- a/ui/src/app/tasks-jobs/tasks/clone/clone.component.ts +++ b/ui/src/app/tasks-jobs/tasks/clone/clone.component.ts @@ -6,6 +6,7 @@ import {concatAll} from 'rxjs/operators'; import {Utils} from '../../../flo/stream/support/utils'; import {TaskService} from '../../../shared/api/task.service'; import {TaskPage} from '../../../shared/model/task.model'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-task-clone', @@ -24,7 +25,8 @@ export class CloneComponent { constructor( private taskService: TaskService, private notificationService: NotificationService, - private fb: FormBuilder + private fb: FormBuilder, + private translate: TranslateService ) {} open(tasks: Array): void { @@ -73,20 +75,32 @@ export class CloneComponent { done(success: number, error: number): void { if (success > 0) { if (error > 0) { - this.notificationService.success('Task(s) clone', 'Task(s) have been cloned partially'); + this.notificationService.success( + this.translate.instant('tasks.clone.message.partialSuccessTitle'), + this.translate.instant('tasks.clone.message.partialSuccessContent') + ); } else { - this.notificationService.success('Task(s) clone', 'Task(s) have been cloned successfully'); + this.notificationService.success( + this.translate.instant('tasks.clone.message.successTitle'), + this.translate.instant('tasks.clone.message.successContent') + ); } this.onCloned.emit(true); this.cancel(); } else { - this.notificationService.error('Error(s) occurred', 'No task(s) cloned.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.clone.message.errorContent') + ); } } submit(): void { if (this.form.invalid) { - this.notificationService.error('Invalid field', 'Some field(s) are missing or invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); return; } const requests = this.tasks.map(task => { @@ -110,7 +124,7 @@ export class CloneComponent { err => { count++; error++; - this.notificationService.error('Error(s) occurred', err); + this.notificationService.error(this.translate.instant('commons.message.error'), err); if (count === requests.length) { this.done(success, error); } diff --git a/ui/src/app/tasks-jobs/tasks/create/create.component.html b/ui/src/app/tasks-jobs/tasks/create/create.component.html index 41e986125..2731dbc17 100644 --- a/ui/src/app/tasks-jobs/tasks/create/create.component.html +++ b/ui/src/app/tasks-jobs/tasks/create/create.component.html @@ -1,9 +1,11 @@ -

Create a task

+

{{ 'tasks.create.title' | translate }}

- - + + Create a task >

Create task

-
  Creating task...
+
  {{ 'tasks.create.modal.creating' | translate }}
- - + +
@@ -25,31 +29,33 @@

Create task

• {{ error }}
-
This action will create the following task:
+
+
+
-
Duplicate task name, please check input names.
+
{{ 'tasks.create.modal.duplicateName' | translate }}
- +
{{ dsl }}
- +
Create task />
- The task definition name should be less than 63 characters for Kubernetes or Cloud Foundry platforms. + {{ 'tasks.create.modal.maxLength63Name' | translate }} +
+
+ {{ 'tasks.create.modal.requiredTask' | translate }}
-
Task name is required!
- Task name is already taken! + {{ 'tasks.create.modal.uniqueName' | translate }} +
+
+ {{ 'tasks.create.modal.invalidName' | translate }}
-
Invalid task name!
- Task name must be less than 256 characters long! + {{ 'tasks.create.modal.maxLengthName' | translate }}
- + Task description must be less than 255 characters long! + >{{ 'tasks.create.modal.maxLengthDescription' | translate }}
- - + +
diff --git a/ui/src/app/tasks-jobs/tasks/create/create.component.spec.ts b/ui/src/app/tasks-jobs/tasks/create/create.component.spec.ts index fb04c1767..8cc68ef39 100644 --- a/ui/src/app/tasks-jobs/tasks/create/create.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/create/create.component.spec.ts @@ -14,6 +14,8 @@ import {ToolsServiceMock} from '../../../tests/service/task-tools.service.mock'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; import {TaskService} from '../../../shared/api/task.service'; import {of} from 'rxjs'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/tasks/create/create.component.ts', () => { let component: CreateComponent; @@ -32,6 +34,7 @@ describe('tasks-jobs/tasks/create/create.component.ts', () => { ReactiveFormsModule, ClarityModule, RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), BrowserAnimationsModule ], providers: [ diff --git a/ui/src/app/tasks-jobs/tasks/create/create.component.ts b/ui/src/app/tasks-jobs/tasks/create/create.component.ts index 75f0fe428..f8d2e385e 100644 --- a/ui/src/app/tasks-jobs/tasks/create/create.component.ts +++ b/ui/src/app/tasks-jobs/tasks/create/create.component.ts @@ -6,6 +6,7 @@ import {Router} from '@angular/router'; import {Properties} from 'spring-flo'; import {Observable} from 'rxjs'; import {TaskFloCreateComponent} from '../../../flo/task/component/create.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-create', @@ -33,7 +34,8 @@ export class CreateComponent implements OnInit { private fb: FormBuilder, private taskService: TaskService, private router: Router, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) { this.form = fb.group({ taskName: this.taskName, @@ -51,19 +53,19 @@ export class CreateComponent implements OnInit { // this.notificationService.error('An error occurred.', 'Some field(s) are missing or invalid.'); // } else { this.isCreating = true; - this.taskService - .createTask(this.taskName.value, this.dsl, this.taskDescription.value) - // .pipe(takeUntil(this.ngUnsubscribe$), finalize(() => this.blockerService.unlock())) - .subscribe( - () => { - this.notificationService.success('Task creation', 'Task Definition created for ' + this.taskName.value); - this.back(); - }, - error => { - this.isCreating = false; - this.notificationService.error('An error occurred', error); - } - ); + this.taskService.createTask(this.taskName.value, this.dsl, this.taskDescription.value).subscribe( + () => { + this.notificationService.success( + this.translate.instant('tasks.create.message.successTitle'), + this.translate.instant('tasks.create.message.successContent', {name: this.taskName.value}) + ); + this.back(); + }, + error => { + this.isCreating = false; + this.notificationService.error(this.translate.instant('commons.message.error'), error); + } + ); // } } @@ -93,7 +95,10 @@ export class CreateComponent implements OnInit { createTask(): void { if (!this.flo.dsl || !this.flo.dsl.trim()) { - this.notificationService.error('An error occurred', 'Please, enter a valid task.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.create.message.errorContent') + ); return; } this.taskName.setValue(''); diff --git a/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.html b/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.html index bf8dbcd1a..ae0277deb 100644 --- a/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.html +++ b/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.html @@ -1,24 +1,16 @@ -

Confirm Destroy Task

-

Confirm Destroy Tasks

+

{{ 'tasks.destroy.destroyTitle' | translate }}

+

{{ 'tasks.destroy.destroyTitle2' | translate }}

- This action will destroy and delete the task - {{ tasks[0].name }}. Are you sure? +
- This action will destroy the - {{ tasks.length }} task{{ tasks?.length > 1 ? 's' : '' }} - listed below.
Are you sure? -
+
NameTask namePlatform{{ 'schedules.main.name' | translate }}{{ 'schedules.main.taskName' | translate }}{{ 'schedules.main.platform' | translate }}
- - + + @@ -39,13 +31,15 @@

Confirm Destroy Tasks

- Destroying task(s) ... + {{ 'tasks.destroy.destroying' | translate }}
- +
diff --git a/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.spec.ts b/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.spec.ts index 6bf489eae..ab3f57b3b 100644 --- a/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.spec.ts @@ -12,6 +12,8 @@ import {throwError} from 'rxjs'; import {Task} from '../../../shared/model/task.model'; import {TaskServiceMock} from '../../../tests/api/task.service.mock'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks/tasks/destroy/destroy.component.ts', () => { let component: DestroyComponent; @@ -22,7 +24,13 @@ describe('tasks/tasks/destroy/destroy.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [DestroyComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, @@ -56,8 +64,8 @@ describe('tasks/tasks/destroy/destroy.component.ts', () => { fixture.debugElement.query(By.css('.modal-footer .btn-danger')).nativeElement.click(); fixture.detectChanges(); await fixture.whenStable(); - expect(NotificationServiceMock.mock.successNotifications[0].title).toBe('Destroy task(s)'); - expect(NotificationServiceMock.mock.successNotifications[0].message).toBe('1 task definition(s) destroyed.'); + expect(NotificationServiceMock.mock.successNotifications[0].title).toBe('Destroy task'); + expect(NotificationServiceMock.mock.successNotifications[0].message).toBe('Successfully removed task "foo".'); done(); }); @@ -71,7 +79,7 @@ describe('tasks/tasks/destroy/destroy.component.ts', () => { fixture.debugElement.query(By.css('.modal-footer .btn-danger')).nativeElement.click(); fixture.detectChanges(); await fixture.whenStable(); - expect(NotificationServiceMock.mock.successNotifications[0].title).toBe('Destroy task(s)'); + expect(NotificationServiceMock.mock.successNotifications[0].title).toBe('Destroy tasks'); expect(NotificationServiceMock.mock.successNotifications[0].message).toBe('2 task definition(s) destroyed.'); done(); }); diff --git a/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.ts b/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.ts index 755631e2c..90eb8d28a 100644 --- a/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.ts +++ b/ui/src/app/tasks-jobs/tasks/destroy/destroy.component.ts @@ -1,4 +1,5 @@ import {Component, EventEmitter, OnInit, Output, ViewChild} from '@angular/core'; +import {TranslateService} from '@ngx-translate/core'; import {TaskService} from '../../../shared/api/task.service'; import {Task} from '../../../shared/model/task.model'; import {NotificationService} from '../../../shared/service/notification.service'; @@ -13,7 +14,11 @@ export class DestroyComponent { isRunning = false; @Output() onDestroyed = new EventEmitter(); - constructor(private taskService: TaskService, private notificationService: NotificationService) {} + constructor( + private taskService: TaskService, + private notificationService: NotificationService, + private translate: TranslateService + ) {} open(tasks: Task[]): void { this.isRunning = false; @@ -25,15 +30,26 @@ export class DestroyComponent { this.isRunning = true; this.taskService.destroyTasks(this.tasks).subscribe( data => { - this.notificationService.success('Destroy task(s)', `${data.length} task definition(s) destroyed.`); + if (data.length === 1) { + this.notificationService.success( + this.translate.instant('tasks.destroy.message.successTitle'), + this.translate.instant('tasks.destroy.message.successContent', {name: this.tasks[0].name}) + ); + } else { + this.notificationService.success( + this.translate.instant('tasks.destroy.message.successTitle2'), + this.translate.instant('tasks.destroy.message.successContent2', {count: data.length}) + ); + } + this.isRunning = false; this.onDestroyed.emit(data); this.isOpen = false; this.tasks = null; }, - error => { + () => { this.notificationService.error( - 'An error occurred', - 'An error occurred while destroying tasks. ' + 'Please check the server logs for more details.' + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.destroy.message.errorContent') ); this.isOpen = false; this.tasks = null; diff --git a/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.html b/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.html index c3928591a..c240f75c7 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.html +++ b/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.html @@ -1,15 +1,17 @@ -
Platform
+
{{ 'tasks.launch.builder.platform' | translate }}
- Generic Deployer Properties + {{ 'tasks.launch.builder.genericDeployerProperties' | translate }}
@@ -82,14 +84,14 @@ - Deployment Platform + {{ 'tasks.launch.builder.deploymentPlatform' | translate }}
-
Properties
+
{{ 'tasks.launch.builder.properties' | translate }}
@@ -140,10 +142,10 @@ -
Version
+
{{ 'tasks.launch.builder.version' | translate }}
-
Properties
+
{{ 'tasks.launch.builder.properties' | translate }}
- Ctr Properties + {{ 'tasks.launch.builder.ctrProperties' | translate }}
-
Properties
+
{{ 'tasks.launch.builder.properties' | translate }}
- Arguments + {{ 'tasks.launch.builder.arguments' | translate }}
@@ -202,7 +204,7 @@
-
Global
+
{{ 'tasks.launch.builder.global' | translate }}
@@ -217,7 +219,7 @@ >
@@ -250,7 +252,7 @@ >
{{ getDeploymentProperties(builder.builderDeploymentProperties).length }} - / {{ builder.builderDeploymentProperties.global.length }} properties + / {{ builder.builderDeploymentProperties.global.length }} + {{ 'tasks.launch.builder.properties' | translate | lowercase }}
@@ -291,7 +294,7 @@ > {{ getCtrProperties(builder.ctrProperties).length }} - / {{ builder.ctrProperties.length }} properties + / {{ builder.ctrProperties.length }} + {{ 'tasks.launch.builder.properties' | translate | lowercase }}
- Loading ... + {{ 'commons.loading' | translate }}
- Error Loading + {{ 'tasks.launch.builder.errorLoading' | translate }}
@@ -365,7 +369,7 @@ > @@ -452,14 +456,15 @@ >
{{ getDeploymentProperties(builder.builderDeploymentProperties, app.name).length }} - / {{ builder.builderDeploymentProperties.apps[app.name].length }} properties + / {{ builder.builderDeploymentProperties.apps[app.name].length }} + {{ 'tasks.launch.builder.properties' | translate | lowercase }}
@@ -473,7 +478,7 @@ > - {{ builder.formGroup.get('appsVersion').get(app.name).value }} (invalid) + {{ builder.formGroup.get('appsVersion').get(app.name).value }} ({{ + 'tasks.launch.builder.invalid' | translate | lowercase + }}) @@ -518,23 +525,30 @@ >
{{ getAppProperties(builder.builderAppsProperties, app.name).length }} - / {{ app.options.length }} properties + / {{ app.options.length }} + {{ 'tasks.launch.builder.properties' | translate | lowercase }}
- No properties + {{ 'tasks.launch.builder.noProperties' | translate }}
-
Loading ...
-
Error loading
-
Invalid version
+
+ {{ 'commons.loading' | translate | lowercase }} +
+
+ {{ 'tasks.launch.builder.errorLoading' | translate | lowercase }} +
+
+ {{ 'tasks.launch.builder.invalidVersion' | translate }} +
- Cancel + {{ + 'commons.cancel' | translate + }}
diff --git a/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.spec.ts b/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.spec.ts index 555dd8905..e45bbc0b9 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.spec.ts @@ -15,6 +15,8 @@ import {RoleDirective} from '../../../../security/directive/role.directive'; import {ContextServiceMock} from '../../../../tests/service/context.service.mock'; import {Task} from '../../../../shared/model/task.model'; import {SIMPLE_TASK_DEFAULT, COMPOSED_TASK_DEFAULT} from '../../../../tests/data/task'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../../assets/i18n/en.json'; describe('tasks-jobs/tasks/launch/builder/builder.component.ts', () => { let component: BuilderComponent; @@ -30,6 +32,7 @@ describe('tasks-jobs/tasks/launch/builder/builder.component.ts', () => { FormsModule, ReactiveFormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], diff --git a/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.ts b/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.ts index 3f6f48957..6f003c63c 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.ts +++ b/ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.ts @@ -29,6 +29,7 @@ import {StreamAppPropertiesSource, StreamHead} from '../../../../flo/stream/prop import {TaskPropertiesDialogComponent} from '../../../../flo/task/properties/task-properties-dialog-component'; import {ValuedConfigurationMetadataProperty} from '../../../../shared/model/detailed-app.model'; import {get} from 'lodash'; +import {TranslateService} from '@ngx-translate/core'; export class AppPropertiesSource implements StreamAppPropertiesSource { private options: Array; @@ -168,7 +169,8 @@ export class BuilderComponent implements OnInit, OnDestroy { constructor( private taskLaunchService: TaskLaunchService, private changeDetector: ChangeDetectorRef, - private notificationService: NotificationService + private notificationService: NotificationService, + private translate: TranslateService ) {} /** @@ -890,15 +892,15 @@ export class BuilderComponent implements OnInit, OnDestroy { if (control instanceof FormGroup) { if (control.get('property')) { if (control.get('property') && control.get('property').invalid) { - arr.push(`The field "property" is not valid.`); + arr.push(this.translate.instant('tasks.launch.builder.tooltip.invalidProperty')); } } if (control.get('global') && control.get('global').invalid) { - arr.push(`The field "global" is not valid.`); + arr.push(this.translate.instant('tasks.launch.builder.tooltip.invalidGlobal')); } taskLaunchConfig.apps.forEach(app => { if (control.get(app.name).invalid) { - arr.push(`The field "${app.name}" is not valid.`); + arr.push(this.translate.instant('tasks.launch.builder.tooltip.invalidField', {name: app.name})); } }); } else { @@ -993,7 +995,7 @@ export class BuilderComponent implements OnInit, OnDestroy { this.changeDetector.markForCheck(); }); this.groupsPropertiesModal.setData(groupPropertiesSources); - this.groupsPropertiesModal.title = `Deployment properties for platform`; + this.groupsPropertiesModal.title = this.translate.instant('tasks.launch.builder.deploymentPropertiesTitle'); this.groupsPropertiesModal.isOpen = true; } @@ -1033,7 +1035,7 @@ export class BuilderComponent implements OnInit, OnDestroy { }); this.ctrPropertiesModal.setData(propertiesSource); - this.ctrPropertiesModal.title = `Ctr properties`; + this.ctrPropertiesModal.title = this.translate.instant('tasks.launch.builder.ctrPropertiesTitle'); this.ctrPropertiesModal.isOpen = true; } @@ -1114,7 +1116,10 @@ export class BuilderComponent implements OnInit, OnDestroy { */ launchTask() { if (!this.isSubmittable(this.refBuilder)) { - this.notificationService.error('An error occurred', 'Some field(s) are invalid.'); + this.notificationService.error( + this.translate.instant('commons.message.invalidFieldsTitle'), + this.translate.instant('commons.message.invalidFieldsContent') + ); } else { this.launch.emit({props: this.getProperties(), args: this.getArguments()}); } @@ -1123,9 +1128,9 @@ export class BuilderComponent implements OnInit, OnDestroy { getLabelAppVersion(taskLaunchConfig, app) { const lastVersion = get(taskLaunchConfig?.lastExecution?.deploymentProperties, `version.${app.name}`); if (lastVersion && app.version !== lastVersion) { - return `Last launch (${lastVersion})`; + return this.translate.instant('tasks.launch.builder.lastVersionLabel', {version: lastVersion}); } - return `Default version (${app.version})`; + return this.translate.instant('tasks.launch.builder.defaultVersionLabel', {version: app.version}); } hasMigrations(): boolean { diff --git a/ui/src/app/tasks-jobs/tasks/launch/builder/errors/errors.component.spec.ts b/ui/src/app/tasks-jobs/tasks/launch/builder/errors/errors.component.spec.ts index c9effa369..feab93080 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/builder/errors/errors.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/launch/builder/errors/errors.component.spec.ts @@ -10,6 +10,8 @@ import {NotificationServiceMock} from '../../../../../tests/service/notification import {RuntimeServiceMock} from '../../../../../tests/api/runtime.service.mock.spec'; import {GrafanaServiceMock} from '../../../../../tests/service/grafana.service.mock'; import {RoleDirective} from '../../../../../security/directive/role.directive'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../../../assets/i18n/en.json'; describe('streams/deploy/builder/errors/errors.component.ts', () => { let component: ErrorsComponent; @@ -24,6 +26,7 @@ describe('streams/deploy/builder/errors/errors.component.ts', () => { ReactiveFormsModule, ClarityModule, RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), BrowserAnimationsModule ], providers: [ diff --git a/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.html b/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.html index 410f9b41e..178fca3b0 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.html +++ b/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.html @@ -1,5 +1,5 @@
-

Enter the list of properties into the text area field below.

+

{{ 'tasks.launch.freetext.propertiesDescription' | translate }}

@@ -28,23 +28,23 @@ #propertiesFile (change)="propertiesFileChange($event)" /> - Import a local file + {{ 'commons.importFile' | translate }} - Please provide a text file containing properties. This will be used to populate the text area above. + {{ 'tasks.launch.freetext.propertiesTooltip' | translate }} - +
-

Enter the list of arguments into the text area field below.

+

{{ 'tasks.launch.freetext.argumentsDescription' | translate }}

@@ -73,26 +73,26 @@ #argumentsFile (change)="argumentsFileChange($event)" /> - Import a local file + {{ 'commons.importFile' | translate }} - Please provide a text file containing arguments. This will be used to populate the text area above. + {{ 'tasks.launch.freetext.argumentsTooltip' | translate }} - +
- Cancel + {{ 'commons.cancel' | translate }}
diff --git a/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.spec.ts b/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.spec.ts index 03d2eddb0..af9b474c8 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/launch/free-text/free-text.component.spec.ts @@ -5,6 +5,8 @@ import {RouterTestingModule} from '@angular/router/testing'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {FreeTextComponent} from './free-text.component'; import {RoleDirective} from '../../../../security/directive/role.directive'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../../assets/i18n/en.json'; describe('tasks-jobs/tasks/launch/free-text/free-text.component.ts', () => { let component: FreeTextComponent; @@ -19,6 +21,7 @@ describe('tasks-jobs/tasks/launch/free-text/free-text.component.ts', () => { ReactiveFormsModule, ClarityModule, RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), BrowserAnimationsModule ], providers: [] diff --git a/ui/src/app/tasks-jobs/tasks/launch/launch.component.html b/ui/src/app/tasks-jobs/tasks/launch/launch.component.html index 5ed303f6e..54259ecd8 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/launch.component.html +++ b/ui/src/app/tasks-jobs/tasks/launch/launch.component.html @@ -1,19 +1,14 @@

- Launch task {{ task.name }} + {{ 'tasks.launch.main.title' | translate }} {{ task.name }}

-

- Please specify any optional deployment properties. You can either use the builder. -
- Alternatively, you can point to an external properties file containing the deployment properties. For more - information please see the Technical Documentation. -

+

- + - + -

Launch task

+

{{ 'tasks.launch.main.launch' | translate }}

  - Launching task ... + {{ 'tasks.launch.main.launching' | translate }}
- +
- Loading data ... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts b/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts index 91dae64d8..4e86a3be7 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts @@ -20,6 +20,8 @@ import {LoggerService} from '../../../shared/service/logger.service'; import {AppServiceMock} from '../../../tests/api/app.service.mock'; import {ParserService} from '../../../flo/shared/service/parser.service'; import {Task} from '../../../shared/model/task.model'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; @Component({ selector: 'app-launch-builder', @@ -65,7 +67,13 @@ describe('streams/streams/deploy/deploy.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [LaunchComponent, BuilderMockComponent, FreeTextMockComponent], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts b/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts index b2f327721..0e73595d6 100644 --- a/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts +++ b/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts @@ -10,6 +10,7 @@ import {HttpError} from '../../../shared/model/error.model'; import {ClipboardCopyService} from '../../../shared/service/clipboard-copy.service'; import {TaskService} from '../../../shared/api/task.service'; import {TaskLaunchService} from './task-launch.service'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-launch', @@ -32,7 +33,8 @@ export class LaunchComponent implements OnInit, OnDestroy { private notificationService: NotificationService, private taskService: TaskService, private router: Router, - private clipboardCopyService: ClipboardCopyService + private clipboardCopyService: ClipboardCopyService, + private translate: TranslateService ) {} /** @@ -115,7 +117,10 @@ export class LaunchComponent implements OnInit, OnDestroy { runPropertiesExport(value: Array): void { this.updateProperties(value); if (this.properties.length === 0) { - this.notificationService.error('An error occured', 'There are no properties to export.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.launch.main.message.errorExportPropertyContent') + ); } else { const propertiesText = this.properties.join('\n'); const date = DateTime.local().toFormat('yyyy-MM-HHmmss'); @@ -128,7 +133,10 @@ export class LaunchComponent implements OnInit, OnDestroy { runArgumentsExport(value: Array): void { this.updateArguments(value); if (this.arguments.length === 0) { - this.notificationService.error('An error occured', 'There are no arguments to export.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.launch.main.message.errorExportArgumentContent') + ); } else { const argumentsText = this.arguments.join('\n'); const date = DateTime.local().toFormat('yyyy-MM-HHmmss'); @@ -146,22 +154,34 @@ export class LaunchComponent implements OnInit, OnDestroy { runPropertiesCopy(value: Array): void { this.updateProperties(value); if (this.properties.length === 0) { - this.notificationService.error('An error occured', 'There are no properties to copy.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.launch.main.message.errorCopyPropertyContent') + ); } else { const propertiesText = this.properties.join('\n'); this.clipboardCopyService.executeCopy(propertiesText); - this.notificationService.success('Copy to clipboard', 'The properties have been copied to your clipboard.'); + this.notificationService.success( + this.translate.instant('tasks.launch.main.message.successCopyTitle'), + this.translate.instant('tasks.launch.main.message.successCopyContent') + ); } } runArgumentsCopy(value: Array): void { this.updateArguments(value); if (this.arguments.length === 0) { - this.notificationService.error('An error occured', 'There are no arguments to copy.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + this.translate.instant('tasks.launch.main.message.errorCopyArgumentContent') + ); } else { const argumentsText = this.arguments.join('\n'); this.clipboardCopyService.executeCopy(argumentsText); - this.notificationService.success('Copy to clipboard', 'The arguments have been copied to your clipboard.'); + this.notificationService.success( + this.translate.instant('tasks.launch.main.message.successCopyTitle'), + this.translate.instant('tasks.launch.main.message.successCopyArgsContent') + ); } } @@ -177,13 +197,19 @@ export class LaunchComponent implements OnInit, OnDestroy { const prepared = this.prepareParams(this.task.name, this.arguments, this.properties); this.taskService.launch(prepared.name, prepared.args, prepared.props).subscribe( executionId => { - this.notificationService.success('Launch success', `Successfully launched task definition "${this.task.name}"`); + this.notificationService.success( + this.translate.instant('tasks.launch.main.message.successTitle'), + this.translate.instant('tasks.launch.main.message.successContent', {name: this.task.name}) + ); this.router.navigate([`tasks-jobs/task-executions/${executionId}`]); }, error => { this.isLaunching = false; const err = error.message ? error.message : error.toString(); - this.notificationService.error('An error occurred', err ? err : 'An error occurred during the task launch.'); + this.notificationService.error( + this.translate.instant('commons.message.error'), + err ? err : this.translate.instant('tasks.launch.main.message.errorLaunchContent') + ); } ); } diff --git a/ui/src/app/tasks-jobs/tasks/task/task.component.html b/ui/src/app/tasks-jobs/tasks/task/task.component.html index 0c9bbe995..607269f2d 100644 --- a/ui/src/app/tasks-jobs/tasks/task/task.component.html +++ b/ui/src/app/tasks-jobs/tasks/task/task.component.html @@ -1,13 +1,13 @@

- Task {{ task.name }} + {{ 'tasks.task.title' | translate }} {{ task.name }}

- +
-
Description
+
{{ 'tasks.main.description' | translate }}
{{ task.description }}
-
Definition
+
{{ 'tasks.main.definition' | translate }}
{{ task.dslText }}
-
Status
+
{{ 'tasks.main.status' | translate }}
{{ task.status }}
-
Applications
+
{{ 'tasks.task.applications' | translate }}
@@ -60,7 +65,7 @@

- Loading application(s)... + {{ 'commons.loading' | translate }}
@@ -70,7 +75,12 @@

- + @@ -78,16 +88,21 @@

- +
-
Execution Id
+
{{ 'executions.main.executionId' | translate }}
{{ task.lastTaskExecution.executionId }}
-
Arguments
+
{{ 'executions.main.arguments' | translate }}
@@ -99,13 +114,13 @@

-
External Execution Id
+
{{ 'executions.main.externalExecutionId' | translate }}
{{ task.lastTaskExecution.externalExecutionId || 'N/A' }}
-
Batch Job
+
{{ 'executions.main.batchJob' | translate }}
-
Job Execution Ids
+
{{ 'executions.main.jobExecutionIds' | translate }}
-
Start Time
+
{{ 'executions.main.startTime' | translate }}
{{ task.lastTaskExecution.startTime | datetime }}
-
End Time
+
{{ 'executions.main.endTime' | translate }}
{{ task.lastTaskExecution.endTime | datetime }}
-
Duration
+
{{ 'executions.main.duration' | translate }}
{{ task.lastTaskExecution.startTime | duration: task.lastTaskExecution.endTime }}
-
Exit Code
+
{{ 'executions.main.exitCode' | translate }}
{{ task.lastTaskExecution.exitCode }}
-
Exit Message
+
{{ 'executions.main.exitMessage' | translate }}
{{ task.lastTaskExecution.exitMessage || 'N/A' }}
-
Resource URL
+
{{ 'executions.main.resourceUrl' | translate }}
{{ task.lastTaskExecution.resourceUrl || 'N/A' }}
-
Application Properties
+
{{ 'executions.main.applicationProperties' | translate }}
@@ -178,7 +193,7 @@

-
Platform Properties
+
{{ 'executions.main.platformProperties' | translate }}
@@ -190,36 +205,41 @@

-
No execution yet.
+
{{ 'executions.main.noExecution' | translate }}
- +
NameType{{ 'tasks.main.name' | translate }}{{ 'tasks.main.definition' | translate }}
- - - - - + + + + + @@ -236,26 +256,31 @@

Execution IDStart timeEnd timeDurationExit code{{ 'executions.main.executionId' | translate }}{{ 'executions.main.startTime' | translate }}{{ 'executions.main.endTime' | translate }}{{ 'executions.main.duration' | translate }}{{ 'executions.main.exitCode' | translate }}
-
No execution yet.
+
{{ 'executions.main.noExecution' | translate }}
- Loading execution(s)... + {{ 'commons.loading' | translate }}

- +
- - - + + + @@ -270,11 +295,11 @@

NamePlatformCron Expression{{ 'schedules.main.name' | translate }}{{ 'schedules.main.platform' | translate }}{{ 'schedules.main.cronExpression' | translate }}
-
No schedule yet.
+
{{ 'schedules.main.noSchedule' | translate }}
- Loading schedule(s)... + {{ 'commons.loading' | translate }}
@@ -284,7 +309,7 @@

- Loading task... + {{ 'commons.loading' | translate }}
diff --git a/ui/src/app/tasks-jobs/tasks/task/task.component.spec.ts b/ui/src/app/tasks-jobs/tasks/task/task.component.spec.ts index f59c1d650..ad983f990 100644 --- a/ui/src/app/tasks-jobs/tasks/task/task.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/task/task.component.spec.ts @@ -15,6 +15,8 @@ import {LogComponent} from '../../executions/execution/log/log.component'; import {ContextServiceMock} from '../../../tests/service/context.service.mock'; import {ScheduleServiceMock} from '../../../tests/api/schedule.service.mock'; import {CleanupComponent} from '../cleanup/cleanup.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../../assets/i18n/en.json'; describe('tasks-jobs/tasks/task/task.component.ts', () => { let component: TaskComponent; @@ -28,6 +30,7 @@ describe('tasks-jobs/tasks/task/task.component.ts', () => { FormsModule, ReactiveFormsModule, ClarityModule, + TranslateTestingModule.withTranslations('en', TRANSLATIONS), RouterTestingModule.withRoutes([]), BrowserAnimationsModule ], diff --git a/ui/src/app/tasks-jobs/tasks/task/task.component.ts b/ui/src/app/tasks-jobs/tasks/task/task.component.ts index 39d7cae6b..24d1a5e65 100644 --- a/ui/src/app/tasks-jobs/tasks/task/task.component.ts +++ b/ui/src/app/tasks-jobs/tasks/task/task.component.ts @@ -16,6 +16,7 @@ import {AboutState} from '../../../shared/store/about.reducer'; import {ScheduleService} from '../../../shared/api/schedule.service'; import {SchedulePage} from '../../../shared/model/schedule.model'; import {CleanupComponent} from '../cleanup/cleanup.component'; +import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-task', @@ -43,7 +44,8 @@ export class TaskComponent implements OnInit { private toolsService: ToolsService, private scheduleService: ScheduleService, private aboutService: AboutService, - private route: ActivatedRoute + private route: ActivatedRoute, + private translate: TranslateService ) {} ngOnInit(): void { @@ -82,7 +84,7 @@ export class TaskComponent implements OnInit { this.loading = false; }, error => { - this.notificationService.error('An error occurred', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); if (HttpError.is404(error)) { this.back(); } @@ -97,7 +99,7 @@ export class TaskComponent implements OnInit { this.loadingSchedules = false; }, error => { - this.notificationService.error('An error occured', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); this.loadingSchedules = false; } ); @@ -144,7 +146,7 @@ export class TaskComponent implements OnInit { }, error => { this.loadingExecution = false; - this.notificationService.error('An error occured', error); + this.notificationService.error(this.translate.instant('commons.message.error'), error); } ); } diff --git a/ui/src/app/tasks-jobs/tasks/tasks.component.html b/ui/src/app/tasks-jobs/tasks/tasks.component.html index 3595f416f..a8da819f9 100644 --- a/ui/src/app/tasks-jobs/tasks/tasks.component.html +++ b/ui/src/app/tasks-jobs/tasks/tasks.component.html @@ -1,11 +1,15 @@

- Tasks + {{ 'tasks.main.title' | translate }} + + - -

@@ -17,7 +21,9 @@

#datagrid > - + @@ -54,9 +60,11 @@

(click)="setMode(true)" [appRole]="['ROLE_DESTROY', 'ROLE_SCHEDULE']" > - Group Actions + {{ 'commons.groupActions' | translate }} + + - [style.width.px]="context.sizeName | datagridcolumn: datagrid:contextName:15 | async" [clrFilterValue]="context.taskName" > - Name + {{ 'tasks.main.name' | translate }} (clrDgColumnResize)="updateContext('sizeDsl', $event)" [style.width.px]="context.sizeDsl | datagridcolumn: datagrid:contextName:15 | async" > - Definition + {{ 'tasks.main.definition' | translate }} - Status + {{ 'tasks.main.status' | translate }} @@ -106,8 +114,10 @@

>{{ task.status }} - - + + - - + + - No results found. + {{ 'commons.noResultFound' | translate }} [clrDgPageSize]="context.size" [clrDgPage]="context.current" > - Tasks per page - {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of {{ page?.total }} tasks + {{ + 'tasks.main.tasksPerPage' | translate + }} + {{ + 'tasks.main.pagination' + | translate: {first: pagination.firstItem + 1, last: pagination.lastItem + 1, total: page?.total} + }} diff --git a/ui/src/app/tasks-jobs/tasks/tasks.component.spec.ts b/ui/src/app/tasks-jobs/tasks/tasks.component.spec.ts index 1f5d50f05..49c4f4a62 100644 --- a/ui/src/app/tasks-jobs/tasks/tasks.component.spec.ts +++ b/ui/src/app/tasks-jobs/tasks/tasks.component.spec.ts @@ -13,9 +13,10 @@ import {TaskServiceMock} from '../../tests/api/task.service.mock'; import {GroupServiceMock} from '../../tests/service/group.service.mock'; import {ContextServiceMock} from '../../tests/service/context.service.mock'; import {SettingsServiceMock} from '../../tests/service/settings.service.mock'; -import {ConfirmComponent} from '../../shared/component/confirm/confirm.component'; import {DatagridColumnPipe} from '../../shared/pipe/datagrid-column.pipe'; import {CleanupComponent} from './cleanup/cleanup.component'; +import {TranslateTestingModule} from 'ngx-translate-testing'; +import TRANSLATIONS from '../../../assets/i18n/en.json'; describe('tasks-jobs/tasks/tasks.component.ts', () => { let component: TasksComponent; @@ -25,7 +26,13 @@ describe('tasks-jobs/tasks/tasks.component.ts', () => { waitForAsync(() => { TestBed.configureTestingModule({ declarations: [TasksComponent, DestroyComponent, CleanupComponent, RoleDirective, DatagridColumnPipe], - imports: [FormsModule, ClarityModule, RouterTestingModule.withRoutes([]), BrowserAnimationsModule], + imports: [ + FormsModule, + ClarityModule, + RouterTestingModule.withRoutes([]), + TranslateTestingModule.withTranslations('en', TRANSLATIONS), + BrowserAnimationsModule + ], providers: [ SecurityServiceMock.provider, AboutServiceMock.provider, diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json new file mode 100644 index 000000000..b6bc6c707 --- /dev/null +++ b/ui/src/assets/i18n/en.json @@ -0,0 +1,1100 @@ +{ + "commons": { + "ok": "Ok", + "of": "of", + "yes": "Yes", + "ofType": "of type", + "refresh": "Refresh", + "cancel": "Cancel", + "remove": "Remove", + "edit": "Edit", + "close": "Close", + "loading": "loading", + "listedBelow": "listed below", + "areYouSure": "Are you sure?", + "setDefault": "Set default", + "makeDefault": "Make default", + "importFile": "Import a file", + "selectFile": "Select a file", + "minDate": "Min date", + "maxDate": "Max date", + "actions": "Actions", + "groupActions": "Group Actions", + "confirmAction": "Confirm action", + "noResultFound": "No results found.", + "message": { + "error": "An error occurred", + "copiedTitle": "Content copied", + "copiedContent": "The content have been copied to your clipboard.", + "invalidFieldsTitle": "Invalid field(s)", + "invalidFieldsContent": "Some field(s) are missing or invalid." + } + }, + "appRoot": { + "welcomeTo": "Welcome to", + "appTitle": "Data Flow UI", + "youHaveToLogin": "You have to log in to access the application.", + "title": "Data Flow", + "fullName": "Spring Cloud Data Flow" + }, + "layout": { + "logo": { + "title": "Spring Cloud Dataflow UI" + }, + "nav": { + "applications": "Applications", + "streams": "Streams", + "runtime": "Runtime", + "tasks": "Tasks", + "tasksJobs": "Tasks / Jobs", + "taskExecution": "Task executions", + "jobExecution": "Job executions", + "schedules": "Schedules", + "manage": "Manage", + "auditRecords": "Audit Records", + "tools": "Tools" + }, + "quicksearch": { + "input": "Search for keywords...", + "searching": "Searching for results...", + "application": "Application(s)", + "stream": "Stream(s)", + "task": "Task(s)", + "noResult": "There are no search results for" + } + }, + "applications": { + "main": { + "title": "Applications", + "addApplications": "Add application(s)", + "unregisterApplications": "Unregister application(s)", + "name": "Name", + "type": "Type", + "version": "Version", + "uri": "URI", + "metadataURI": "Metadata URI", + "manageVersion": "Manage Version", + "unregister": "Unregister", + "noResult": "No results found", + "applicationsPerPage": "Applications per page", + "application": "application", + "details": "Details", + "pagination": "{{ first }} - {{ last }} of {{ total }} applications" + }, + "add": { + "registerOneOrMore": "Register one or more applications", + "importFromHttp": "Import application coordinates from an HTTP URI location", + "importFromFile": "Import application coordinates from a properties file", + "importFromSpringDataFlow": "Import application starters from dataflow.spring.io", + "websiteStarters": { + "usePredefined": "Use predefined application-URIs (for either maven or docker) for all the out-of-the-box stream and task/batch apps", + "startersForKafkaMaven": "Stream application starters for Kafka/Maven", + "startersForKafkaDocker": "Stream application starters for Kafka/Docker", + "startersForRabbitMQMaven": "Stream application starters for RabbitMQ/Maven", + "startersForRabbitMQDocker": "Stream application starters for RabbitMQ/Docker", + "startersForMaven": "Task application starters for Maven", + "startersForDocker": "Task application starters for Docker", + "forceImport": "Force, the applications will be imported and installed even if it already exists but only if not being used already", + "importApplications": "Import Application(s)", + "importingApplications": "Importing application(s)", + "message": { + "successTitle": "Import starters", + "successContent": "Application(s) Imported.", + "noStarterTitle": "No starter selected", + "noStarterContent": "Please, select a starter pack." + } + }, + "props": { + "desc": "Enter the list of properties into the text area field below.", + "desc2": "Alternatively, you can also select a file in your local file system, which is used to populate the text area field.", + "appsAsProperties": "Apps as Properties", + "example": "Example", + "example1": "task.timestamp=maven://o.s.cloud.task.app:timestamp-task:1.2.3.RELEASE", + "example2": "task.spark-client=maven://o.s.cloud.task.app:spark-client-task:1.2.3.RELEASE", + "force": "Force, the applications will be imported and installed even if it already exists but only if not being used already.", + "import": "Import Application(s)", + "importing": "Importing application(s)", + "requiredApp": "One or more application(s) are required.", + "message": { + "successTitle": "Import application(s)", + "successContent": "Application(s) Imported.", + "errorContent": "An error occurred while importing Apps. Please check the server logs for more details." + } + }, + "register": { + "desc": "Register one or more applications by entering a Name, Type and App URI of the application Jar. You can also provide an optional metadata artifact URI.
The App URI & the Metadata Artifact URI are typically provided using the Maven coordinates of the Jar but can be a local file or a docker image URI.", + "invalidName": "Please provide a valid name for the app.", + "invalidType": "Please provide a valid type.", + "invalidUri": "Please provide a valid URI pointing to the respective properties file.", + "invalidMetadataURI": "Please provide a valid URI pointing to the respective properties file.", + "force": "Force, the applications will be imported and installed even if it already exists but only if not being used already.", + "newApp": "New application", + "import": "Import Application(s)", + "register": "Register Application(s)", + "registering": "Registering application(s)", + "message": { + "invalidAppTitle": "Invalid application", + "invalidAppContent": "Please, register at least one application.", + "successTitle": "Register application(s).", + "successContent": "{{count}} App(s) registered" + } + }, + "uri": { + "desc": "Provide a URI that points to the location of the properties file.
This properties file is formatted so that the keys represent the type and the name of the application, e.g. type.name. The property values are the URIs of the app.", + "placeholderUri": "https://url.to.properties", + "eg": "e.g.", + "egValue": "https://dataflow.spring.io/kafka-maven-latest", + "invalidUri": "Please provide a valid URI pointing to the respective properties file.", + "force": "Force, the applications will be imported and installed even if it already exists but only if not being used already.", + "importing": "Importing application(s)", + "import": "Import Application(s)", + "message": { + "successTitle": "Import Application(s)", + "successContent": "Application(s) Imported." + } + } + }, + "unregister": { + "title": "Confirm Unregister Application", + "title2": "Confirm Unregister Applications", + "content": "This action will unregister and delete application", + "content2": "This action will unregister and delete the", + "unregistering": "Unregistering application(s) ...", + "unregister": "Unregister the application", + "unregister2": "Unregister the applications", + "message": { + "successTitle": "Unregister application", + "successContent": "Successfully removed app \"{{name}}\" of type \"{{type}}\".", + "successTitle2": "Unregister applications", + "successContent2": "{{count}} app(s) unregistered." + } + }, + "details": { + "title": "Application", + "unregister": "Unregister Application", + "manageVersions": "Manage versions", + "notFound": "No application found.", + "information": "Information", + "appProperties": "Application properties", + "tooManyProperties": "There are more than 50 properties to display, the UI can be slow.", + "tooManyProperties2": "Do you want to display all the properties ?", + "showAll": "Show all the properties", + "default": "Default", + "deprecatedLevel": "Deprecation level", + "noDescription": "No Description Available", + "defaultValue": "Default value", + "noProperty": "No property" + }, + "version": { + "manageVersions": "Manage versions", + "loadingVersions": "Loading version(s) ...", + "thisActionWillUnregisterThe": "This action will unregister the", + "ofTheApplication": "of the application", + "thisActionWillMakeTheVersion": "This action will make the version", + "asTheDefaultVersion": "as the default version for the application", + "version": "version", + "message": { + "unregisterSuccessTitle": "Unregister version", + "unregisterSuccessContent": "Successfully removed version \"{{version}}\".", + "defaultSuccessTitle": "Default version", + "defaultSuccessContent": "The version \"{{version}}\" is now the default version of the application \"{{app}}\" ({{type}})." + } + } + }, + "settings": { + "title": "Settings", + "close": "Close", + "language": "Language", + "languageDescription": "You can choose your preferred language.", + "en": "English", + "de": "German", + "fr": "French", + "theme": "Theme", + "themeDescription": "You can choose between dark and default theme.", + "darkTheme": "dark", + "defaultTheme": "default", + "results": "Results", + "resultsDescription": "You can choose the number of results per page." + }, + "about": { + "user": { + "logOut": "Log out", + "logIn": "Log In" + }, + "signpost": { + "title": "Data Flow Server Implementation", + "name": "Name", + "version": "Version", + "moreInfo": "More info", + "projectPage": "Project Page", + "sourceCode": "Source Code", + "documentation": "Documentation", + "apiDocs": "API Docs", + "supportForum": "Support Forum", + "issueTracker": "Issue Tracker" + }, + "info": { + "title": "About Spring Cloud Data Flow", + "serverImpTitle": "Data Flow Server Implementation", + "name": "Name", + "version": "Version", + "features": "Features", + "streams": "Streams", + "tasks": "Tasks", + "schedules": "Schedules", + "monitoring": "Monitoring Dashboard", + "grafana": "Grafana", + "wavefront": "Wavefront", + "security": "Security", + "authentificationEnabled": "Authentication Enabled", + "authenticated": "Authenticated", + "username": "Username", + "roles": "Roles", + "impVersion": "Implementation Version", + "core": "Core", + "dashboard": "Dashboard", + "shell": "Shell", + "shellChecksumSha1": "Shell Checksum Sha1", + "shellChecksumSha256": "Shell Checksum Sha256", + "runtimeSkipperDeployer": "Runtime Environment - Skipper Deployer", + "spiVersion": "Spi Version", + "javaVersion": "Java Version", + "platformApiVersion": "Platform Api Version", + "platformClientVersion": "Platform Client Version", + "platformHostVersion": "Platform Host Version", + "platformType": "Platform Type", + "springBootVersion": "Spring Boot Version", + "springVersion": "Spring Version", + "platformSkipperDeployer": "Platform-specific Information of the Skipper Deployer", + "noPlatform": "No platform-specific app deployer information available.", + "runtimeTaskLauncher": "Runtime Environment - Task Launcher", + "noLauncher": "No Task Launcher information is available.", + "platformTaskLauncher": "Platform-specific Information of the Task Launcher", + "noPlatformTaskLauncher": "No platform-specific task launcher information available.", + "help": "Need Help or Found an Issue?", + "projectPageDesc": "Quick overview of Spring Cloud Data Flow Project.", + "sourceCodeDesc": "Spring Cloud Data Flow Project is an Open Source Project.", + "documentationDesc": "Learn more about the product features.", + "apiDocsDesc": "Learn more about the REST-APIs.", + "supportFormDesc": "You need help?", + "issueTrackerDesc": "Report an issue or request for a new feature.", + "copy": "Copy Details to Clipboard", + "message": { + "copyTitle": "Copy to clipboard", + "copyContent": "Copied About Details to Clipboard (As JSON)." + } + } + }, + "auditRecords": { + "title": "Audit Records", + "id": "ID", + "createdOn": "Created On", + "actions": "Actions", + "operations": "Operations", + "operationID": "Operation ID", + "createBy": "Create by", + "platformName": "Platform name", + "noResult": "No results found.", + "data": "Data", + "property": "Property", + "recordsPerPage": "Records per page", + "pagination": "{{ first }} - {{ last }} of {{ total }} records", + "allActions": "All actions", + "allOperations": "All operations" + }, + "tools": { + "title": "Tools", + "exportStreams": "Export stream(s): Create a JSON file with the selected streams", + "importStreams": "Import stream(s): Import streams from a JSON file", + "cleanUpAll": "Clean up all task/job executions", + "cleanUpCompleted": "Clean up all completed task/job executions", + "exportTasks": "Export task(s): Create a JSON file with the selected tasks", + "importTasks": "Import task(s): Import tasks from a JSON file", + "streams": "Streams", + "tasks": "Tasks", + "cleanUp": "Clean up Task Executions", + "modal": { + "cleanUp": { + "title": "Confirm Clean Up Task Execution(s)", + "content": "This action will remove {{ count }} execution(s). Are you sure?", + "processing": "Removing data", + "cleanUp": "Clean up Execution(s)", + "message": { + "warningNoExecutionTitle": "No execution", + "warningNoExecutionContent": "There is no execution.", + "successTitle": "Clean up execution(s)", + "successContent": "{{count}} execution(s) cleaned up." + } + }, + "exportStreams": { + "title": "Export stream(s)", + "content": "You can create an export of your selected streams.
This operation will generate and download a JSON file.", + "name": "Name", + "definition": "Definition", + "exporting": "Exporting stream(s)", + "export": "Export stream(s)", + "message": { + "errorNoStreamTitle": "No stream selected", + "errorNoStreamContent": "Please, select stream(s) to export.", + "successTitle": "Stream(s) export", + "successContent": "Stream(s) has been exported." + } + }, + "importStreams": { + "title": "Import stream(s)", + "content": "You can import your streams from a JSON file.
The file needs to be modified for sensitive properties before importing.", + "options": "Options", + "jsonFile": "JSON file", + "file": "File", + "optimize": "Optimize", + "duration": "Duration", + "errors": "{{count}} error(s)", + "description": "Description", + "errorMessage": "Message", + "index": "Index", + "success": "{{count}} stream(s) created", + "imnporting": "Importing stream(s)", + "import": "Import stream(s)", + "message": { + "errorInvalidFileTitle": "Invalid file", + "errorInvalidFileContent": "The file is not valid.", + "errorSelectFileTitle": "Invalid file", + "errorSelectFileContent": "Please, select a file." + } + }, + "exportTasks": { + "title": "Export task(s)", + "content": "You can create an export of your selected tasks.
This operation will generate and download a JSON file.", + "name": "Name", + "definition": "Definition", + "exporting": "Exporting task(s)", + "export": "Export task(s)", + "message": { + "errorNoTaskTitle": "No task selected", + "errorNoTaskContent": "Please, select task(s) to export.", + "successTitle": "Task(s) export", + "successContent": "Task(s) has been exported." + } + }, + "importTasks": { + "title": "Import task(s)", + "content": "You can import your tasks from a JSON file.
The file needs to be modified for sensitive properties before importing.", + "options": "Options", + "jsonFile": "JSON file", + "file": "File", + "excludeChildren": "Exclude children", + "duration": "Duration", + "errors": "{{count}} error(s)", + "description": "Description", + "errorMessage": "Message", + "index": "Index", + "success": "{{count}} task(s) created", + "imnporting": "Importing task(s)", + "import": "Import task(s)", + "message": { + "errorInvalidFileTitle": "Invalid file", + "errorInvalidFileContent": "The file is not valid.", + "errorSelectFileTitle": "Invalid file", + "errorSelectFileContent": "Please, select a file." + } + } + } + }, + "runtime": { + "main": { + "title": "Runtime", + "stream": "Stream {{ name }}", + "instance": "instance", + "instances": "instances", + "viewDetails": "View details", + "grafana": "Grafana dashboard", + "wavefront": "Wavefront dashboard", + "noApp": "There are currently no applications running.", + "loading": "Loading runtime" + }, + "details": { + "title": "Instances for app", + "instance": "Instance" + } + }, + "streams": { + "main": { + "title": "Streams", + "createStreams": "Create stream(s)", + "grafana": "Grafana Dashboard", + "wavefront": "Wavefront Dashboard", + "deployStreams": "Deploy stream(s)", + "undeployStreams": "Undeploy stream(s)", + "destroyStreams": "Destroy stream(s)", + "cloneStreams": "Clone stream(s)", + "name": "Name", + "description": "Description", + "definition": "Definition", + "status": "Status", + "details": "Details", + "deploy": "Deploy", + "update": "Update", + "undeploy": "Undeploy", + "destroy": "Destroy", + "clone": "Clone", + "noResult": "No results found.", + "streamsPerPage": "Streams per page", + "pagination": "{{ first }} - {{ last }} of {{ total }} streams" + }, + "clone": { + "title": "Clone Stream", + "title2": "Clone Streams", + "content": "This action will create the following stream(s)", + "duplicate": "Duplicate stream name, please check input names.", + "requiredName": "Stream name is required.", + "invalidName": "Invalid stream name (no space or special charaters).", + "maxLengthName": "Stream name must be less than 255 characters long.", + "uniqueName": "Stream name is already taken.", + "cloning": "Cloning stream(s)", + "clone": "Clone the stream", + "clone2": "Clone the streams", + "message": { + "partialSuccessTitle": "Stream(s) clone", + "partialSuccessContent": "Stream(s) have been cloned partially", + "successTitle": "Stream(s) clone", + "successContent": "Stream(s) have been cloned successfully", + "errorContent": "No stream(s) cloned." + } + }, + "destroy": { + "title": "Confirm Destroy Stream", + "title2": "Confirm Destroy Streams", + "content": "This action will destroy and delete the stream {{ name }}. Are you sure?", + "content2": "This action will destroy the {{ count }} stream definitions listed below. Are you sure?", + "destroying": "Destroying stream(s)", + "destroy": "Destroy the stream", + "destroy2": "Destroy the streams", + "message": { + "successTitle": "Destroy stream", + "successContent": "Successfully removed stream \"{{ name }}\".", + "successTitle2": "Destroy streams", + "successContent2": "{{ count }} stream(s) destroyed.", + "errorContent": "An error occurred while bulk deleting Streams. Please check the server logs for more details." + } + }, + "rollback": { + "title": "Confirm stream rollback", + "content": " This action will rollback the stream {{ name }} to the version {{ version }}. Are you sure?", + "rollbacking": "Rollback stream(s)", + "rollback": "Rollback", + "message": { + "successTitle": "Rollback success", + "successContent": "Successful stream rollback to version \"{{ version }}\"" + } + }, + "status": { + "title": "Stream status", + "deploying": "Deploying", + "deployingContent": "Deployment has been initiated", + "deployed": "Deployed", + "deployedContent": "Fully deployed based on each of the stream's apps' count properties", + "partial": "Partial", + "partialContent": "1 or more of the apps are not yet deployed.", + "incomplete": "Incomplete", + "incompleteContent": "At least 1 of each app, but 1 or more of them not at requested capacity", + "failed": "Failed", + "failedContent": "1 or more of the apps does not have even a single instance deployed", + "undeployed": "Undeployed", + "undeployedContent": "Intentionally undeployed, or created but not yet deployed" + }, + "undeploy": { + "title": "Confirm Undeploy Stream", + "title2": "Confirm Undeploy Streams", + "content": "This action will undeploy the stream {{ name }}. Are you sure?", + "content2": "This action will undeploy the {{ count }} stream definitions listed below. Are you sure?", + "undeploying": "Undeploying stream(s)", + "undeploy": "Undeploy the stream", + "undeploy2": "Undeploy the streams", + "message": { + "successTitle": "Undeploy stream", + "successContent": "Successfully undeploy stream \"{{ name }}\".", + "successTitle2": "Undeploy streams", + "successContent2": "{{ count }} stream(s) undeployed.", + "errorContent": "An error occurred while undeploying Streams. Please check the server logs for more details." + } + }, + "create": { + "title": "Create stream(s)", + "create": "Create stream(s)", + "modal": { + "title": "Create stream(s)", + "creating": "Creating Stream(s)", + "content": "This action will create the following stream(s):", + "create": "Create the stream(s)", + "placeholderName": "Stream Name", + "placeholderDescription": "Stream Description", + "duplicateName": "Duplicate stream name, please check input names.", + "requiredName": "Stream name is required", + "uniqueName": "Stream name is already taken", + "invalidName": "Invalid stream name", + "maxLengthName": "Stream name must be less than 255 characters long", + "maxLengthDescription": "Stream description must be less than 255 characters long", + "operation": { + "creating": "Create stream {{ name }}", + "completed": "Creation completed" + }, + "message": { + "invalidStreamTitle": "Invalid stream(s)", + "invalidStreamContent": "Please, enter one or more valid streams.", + "successTitle": "Stream(s) creation", + "successContent": "Stream(s) have been created successfully", + "errorContent": "Problem creating stream \"{{ name }}\": {{ message }}", + "errorContent2": "Failed to create stream \"{{ name }} \"" + } + } + }, + "stream": { + "title": "Stream", + "deploy": "Deploy stream", + "update": "Update stream", + "undeploy": "Undeploy stream", + "destroy": "Destroy stream", + "applications": "Applications", + "information": "Information", + "showPipeline": "Show Data Pipeline", + "relatedStreams": "Related stream(s)", + "deploymentInfo": "Deployment Info", + "runtime": "Runtime", + "instances": "instance(s)", + "viewLog": "View Log", + "history": "History", + "noHistory": "There is no history yet.", + "version": "Version", + "date": "Date", + "streamStatus": "StreamStatus", + "description": "Description", + "platform": "Platform", + "rollback": "Rollback", + "logStream": "Log {{ name }}", + "noLog": "No log." + }, + "multiDeploy": { + "title": "Deploy Streams", + "deploy": "Deploy", + "update": "Update", + "properties": "Properties", + "invalidPlatform": "Select a platform.", + "invalidProperties": "One or more arguments are invalid.
Example: myarg=myvalue.", + "deployStreams": "Deploy the streams", + "deployModal": "Deploy streams", + "deploying": "Deploying streams", + "message": { + "successTitle": "Deploy success", + "successContent": "Successfully deployed {{count}} stream(s)." + } + }, + "deploy": { + "main": { + "titleUpdate": "Update stream", + "titleDeploy": "Deploy stream", + "description": "Please specify any optional deployment properties. You can either use the builder.
Alternatively, you can point to an external properties file containing the deployment properties. For more information please see the Technical Documentation.", + "builder": "Builder", + "freetext": "Freetext", + "update": "Update stream", + "deploy": "Deploy stream", + "updating": "Updating stream", + "deploying": "Deploying stream(s)", + "export": "Export", + "copy": "Copy to Clipboard", + "message": { + "errorExportPropertyContent": "There are no properties to export.", + "errorCopyPropertyContent": "There are no properties to copy.", + "successCopyTitle": "Copy to clipboard", + "successCopyContent": "The properties have been copied to your clipboard.", + "successUpdateTitle": "Update success", + "successUpdateContent": "Successfully updated stream definition \"{{ name }}\"", + "successDeployTitle": "Deploy success", + "successDeployContent": "Successfully deployed stream definition \"{{ name }}\"", + "errorDeployContent": "An error occurred during the stream deployment update." + } + }, + "freetext": { + "description": "Enter the list of properties into the text area field below. Alternatively, you can also select a file in your local file system, which is used to populate the text area field.", + "tooltip": "Please provide a text file containing properties. This will be used to populate the text area above.", + "deploy": "Deploy the stream", + "update": "Update the stream", + "message": { + "errorDeployTitle": "Invalid properties", + "errorDeployContent": "Some line(s) are invalid." + } + }, + "builder": { + "platform": "Platform", + "invalidPlatform": "The define platform is not valid (unknown).", + "genericDeployerProperties": "Generic Deployer Properties", + "example": "Example", + "key": "Key", + "value": "Value", + "properties": "Properties", + "defaultVersion": "Default version", + "generatedProperty": "Generated property", + "deploymentPlatform": "Deployment Platform", + "applicationsProperties": "Applications Properties", + "version": "Version", + "global": "Global", + "invalid": "invalid", + "enterNumber": "Enter a number", + "enterValue": "Enter a value", + "errorLoading": "Error loading", + "invalidVersion": "Invalid version", + "noProperties": "No properties", + "deploy": "Deploy the stream", + "update": "Update the stream", + "tooltip": { + "invalidProperty": "The field \"property\" is not valid.", + "invalidGlobal": "The field \"global\" is not valid.", + "invalidField": "The field \"{{ name }}\" is not valid." + }, + "deploymentPropertiesTitle": "Deployment properties for platform" + } + } + }, + "tasks": { + "main": { + "title": "Tasks", + "create": "Create task", + "grafana": "Grafana Dashboard", + "wavefront": "Wavefront Dashboard", + "scheduleTasks": "Schedule task(s)", + "destroyTasks": "Destroy task(s)", + "cloneTasks": "Clone task(s)", + "name": "Name", + "description": "Description", + "definition": "Definition", + "status": "Status", + "applications": "Applications", + "schedule": "Schedule", + "destroy": "Destroy", + "clone": "Clone", + "cleanup": "Cleanup", + "details": "Details", + "launch": "Launch", + "tasksPerPage": "Tasks per page", + "pagination": "{{ first }} - {{ last }} of {{ total }} tasks" + }, + "cleanup": { + "title": "Confirm Clean Up Execution(s)", + "confirmContent": "This action will remove {{ count }} execution(s). Are you sure?", + "selectContent": "Please, selected the status of the execution to remove:", + "all": "All the {{ all }} execution(s)", + "completed": "{{ completed }} execution(s) completed", + "removing": "Removing data", + "cleanup": "Clean up Execution(s)", + "message": { + "warningNoExecutionTitle": "No execution", + "warningNoExecutionContent": "There is no execution for this task.", + "successTitle": "Clean up execution(s)", + "successContent": "{{ count }} execution(s) cleaned up." + } + }, + "clone": { + "cloneTitle": "Clone Task", + "cloneTitle2": "Clone Tasks", + "content": "This action will create the following task(s)", + "duplicate": "Duplicate task name, please check input names.", + "requiredName": "Task name is required.", + "invalidName": "Invalid task name (no space or special charaters).", + "maxLengthName": "Task name must be less than 255 characters long.", + "uniqueName": "Task name is already taken.", + "cloning": "Cloning task(s)", + "clone": "Clone the task", + "clone2": "Clone the task", + "message": { + "partialSuccessTitle": "Task(s) clone", + "partialSuccessContent": "Task(s) have been cloned partially", + "successTitle": "Task(s) clone", + "successContent": "Task(s) have been cloned successfully", + "errorContent": "No task(s) cloned." + } + }, + "destroy": { + "destroyTitle": "Confirm Destroy Task", + "destroyTitle2": "Confirm Destroy Tasks", + "content": "This action will destroy and delete the task {{ name }}. Are you sure?", + "content2": "This action will destroy the {{ count }} tasks listed below. Are you sure?", + "destroying": "Destroying task(s)", + "destroy": "Destroy the task", + "destroy2": "Destroy the tasks", + "message": { + "successTitle": "Destroy task", + "successContent": "Successfully removed task \"{{ name }}\".", + "successTitle2": "Destroy tasks", + "successContent2": "{{ count }} task definition(s) destroyed.", + "errorContent": "An error occurred while bulk deleting tasks. Please check the server logs for more details." + } + }, + "task": { + "title": "Task", + "launch": "Launch task", + "schedule": "Schedule task", + "destroy": "Destroy task", + "cleanup": "Cleanup", + "information": "Information", + "applications": "Applications", + "showPipeline": "Show Data Pipeline", + "lastExecution": "Last execution", + "viewTaskExecution": "View task execution", + "viewLog": "View log", + "latestExecutions": "Latest execution(s)", + "schedules": "Schedule(s)" + }, + "create": { + "title": "Create a task", + "createTask": "Create task", + "modal": { + "creating": "Creating task", + "create": "Create the task", + "taskName": "Task Name", + "taskDescription": "Task Description", + "content": "This action will create the following task:", + "duplicateName": "Duplicate task name, please check input names.", + "maxLengthName": "Task name must be less than 256 characters long.", + "invalidName": "Invalid task name.", + "requiredTask": "Task name is required.", + "maxLength63Name": "The task definition name should be less than 63 characters for Kubernetes or Cloud Foundry platforms.", + "uniqueTask": "Task name is already taken.", + "maxLengthDescription": "Task description must be less than 255 characters long." + }, + "message": { + "errorContent": "Please, enter a valid task.", + "successTitle": "Task creation", + "successContent": "Task Definition created for {{ name }}" + } + }, + "launch": { + "main": { + "title": "Launch task", + "description": "Please specify any optional deployment properties. You can either use the builder.
Alternatively, you can point to an external properties file containing the deployment properties. For more information please see the Technical Documentation.", + "builder": "Builder", + "freetext": "Freetext", + "export": "Export", + "copy": "Copy to Clipboard", + "launching": "Launching task", + "launch": "Launch task", + "message": { + "errorExportPropertyContent": "There are no properties to export.", + "errorExportArgumentContent": "There are no arguments to export.", + "errorCopyPropertyContent": "There are no properties to copy.", + "errorCopyArgumentContent": "There are no arguments to copy.", + "successCopyTitle": "Copy to clipboard", + "successCopyContent": "The properties have been copied to your clipboard.", + "successCopyArgsContent": "The arguments have been copied to your clipboard.", + "successTitle": "Launch success", + "successContent": "Successfully launched task definition \"{{ name }}\"", + "errorLaunchContent": "An error occurred during the task launch." + } + }, + "freetext": { + "propertiesDescription": "Enter the list of properties into the text area field below.", + "argumentsDescription": "Enter the list of arguments into the text area field below.", + "propertiesTooltip": "Please provide a text file containing properties. This will be used to populate the text area above.", + "argumentsTooltip": "Please provide a text file containing arguments. This will be used to populate the text area above.", + "launch": "Launch Task" + }, + "builder": { + "platform": "Platform", + "invalidPlatform": "The define platform is not valid (unknown).", + "genericDeployerProperties": "Generic Deployer Properties", + "arguments": "Arguments", + "properties": "Properties", + "defaultVersion": "Default version", + "deploymentPlatform": "Deployment Platform", + "applicationsProperties": "Applications Properties", + "version": "Version", + "ctrProperties": "Ctr Properties", + "global": "Global", + "invalid": "invalid", + "enterNumber": "Enter a number", + "enterValue": "Enter a value", + "selectValue": "Select a value", + "errorLoading": "Error loading", + "invalidVersion": "Invalid version", + "noProperties": "No properties", + "launch": "Launch task", + "deploymentPropertiesTitle": "Deployment properties for platform", + "ctrPropertiesTitle": "Ctr properties", + "lastVersionLabel": "Last launch {{ version }}", + "defaultVersionLabel": "Default version ({{ version }})", + "tooltip": { + "invalidProperty": "The field \"property\" is not valid.", + "invalidGlobal": "The field \"global\" is not valid.", + "invalidField": "The field \"{{ name }}\" is not valid." + }, + "alert": { + "migrateContent": "There are properties which can be migrated.", + "migrate": "Migrate" + } + } + } + }, + "executions": { + "main": { + "title": "Task executions", + "executionId": "Execution Id", + "taskName": "Task name", + "arguments": "Arguments", + "externalExecutionId": "External Execution Id", + "batchJob": "Batch Job", + "jobExecutionIds": "Job Execution Ids", + "startTime": "Start Time", + "endTime": "End Time", + "startDate": "Start Date", + "endDate": "End Date", + "duration": "Duration", + "exitCode": "Exit Code", + "exitMessage": "Exit Message", + "resourceUrl": "Resource URL", + "viewLog": "View log", + "applicationProperties": "Application Properties", + "platformProperties": "Platform Properties", + "noExecution": "No execution yet.", + "cleanupExecutions": "Clean Up task execution(s)", + "cleanup": "Clean up task execution", + "details": "Details", + "taskDetails": "Task details", + "relaunch": "Relaunch task", + "stop": "Stop task", + "grafana": "Grafana Dashboard", + "wavefront": "Wavefront Dashboard", + "executionPerPage": "Task executions per page", + "pagination": "{{ first }} - {{ last }} of {{ total }} task executions" + }, + "stop": { + "title": "Confirm Stop Task Execution", + "description": "This action will stop the task execution {{ id }} (task {{ taskName }}). Are you sure?", + "stopping": "Stopping task execution", + "stop": "Stop Task Execution(s)", + "message": { + "successTitle": "Stop task execution(s)", + "successContent": "Request submitted to stop task execution \"{{ id }}\".", + "errorContent": "An error occurred while stopping task executions. Please check the server logs for more details." + } + }, + "cleanup": { + "title": "Confirm Clean Up Task Execution(s)", + "description": "This action will remove the data of the task execution {{ executionId }} (task {{ taskName }}). Are you sure?", + "description2": "This action will remove the data of the {{ count }} task executions listed below. Are you sure?", + "removing": "Removing data", + "cleanupExecution": "Clean up Task Execution", + "cleanupExecutions": "Clean up Task Executions", + "message": { + "successTitle": "Clean up task execution(s)", + "successContent": "{{ count }} task execution(s) cleaned up." + } + }, + "execution": { + "title": "Task execution - Execution ID", + "relaunch": "Relaunch task", + "stop": "Stop execution", + "cleanup": "Clean up task execution", + "viewTask": "View task", + "noTask": "No task found.", + "task": "Task", + "information": "Information", + "logTitle": "Log task execution {{ id }}" + } + }, + "jobs": { + "main": { + "title": "Job Executions", + "executionId": "Execution Id", + "name": "Name", + "id": "Id", + "jobName": "Job Name", + "jobInstance": "Job Instance", + "taskId": "Task Id", + "taskExecutionId": "Task Execution Id", + "jobParameters": "Job Parameters", + "instanceId": "Instance Id", + "startTime": "Start Time", + "endTime": "End Time", + "duration": "Duration", + "exitCode": "Exit Code", + "exitMessage": "Exit Message", + "stepExecutionCount": "Step Execution Count", + "status": "Status", + "details": "Details", + "restart": "Restart", + "stop": "Stop", + "grafana": "Grafana Dashboard", + "jobPerPage": "Job executions per page", + "pagination": "{{ first }} - {{ last }} of {{ total }} job executions", + "restartConfirmTitle": "Confirm restart the job execution", + "restartConfirmContent": "This action will restart the steps failed of the job execution {{ name }} ({{ id }}).
Are you sure?", + "stopConfirmTitle": "Confirm stop the job execution", + "stopConfirmContent": "This action will stop the job execution {{ name }} ({{ id }}).
Are you sure?", + "message": { + "successRestartTitle": "Restart job", + "successRestartMessage": "Successfully restarted job \"{{ name }}\".", + "successStopTitle": "Stop job", + "successStopMessage": "Successfully stopped job \"{{ name }}\"." + } + }, + "execution": { + "title": "Job execution", + "restart": "Restart the job", + "stop": "Stop the job", + "noTaskFound": "No task found.", + "task": "Task", + "information": "Information", + "taskExecution": "Task execution", + "steps": "Steps", + "viewTask": "View task", + "relaunchTask": "Relaunch Task", + "viewExecution": "View task execution", + "viewLog": "View log" + }, + "step": { + "title": "Step Execution", + "stepId": "Step Id", + "stepName": "Step Name", + "stepExecutionId": "Step Execution Id", + "jobExecutionId": "Job Execution Id", + "stepType": "Step Type", + "reads": "Reads", + "writes": "Writes", + "commits": "Commits", + "rollbacks": "Rollbacks", + "duration": "Durations", + "status": "Status", + "filterCount": "Filter Count", + "processSkips": "Process Skips", + "readSkips": "Read Skips", + "skips": "Skips", + "writeSkips": "Write Skips", + "noStep": "No Step Execution available.", + "noExecutionContext": "No step execution context.", + "information": "Information", + "exitDescription": "Exit Description", + "stepExecutionContext": "Step Execution Context", + "stepExecutionHistory": "Step Execution History", + "task": "task", + "taskExecution": "Task execution", + "history": { + "name": "name", + "count": "count", + "min": "min", + "max": "max", + "mean": "mean", + "standardDeviation": "Standard Deviation", + "commitCount": "Commit Count", + "duration": "Duration", + "durationPerRead": "Duration per Read", + "filterCount": "Filter Count", + "processSkipCount": "Process Skip Count", + "readCount": "Read Count", + "readSkipCount": "Read Skip Count", + "rollbackCount": "Rollback Count", + "writeCount": "Write Count", + "writeSkipCoumt": "Write Skip Count" + } + } + }, + "schedules": { + "main": { + "title": "Sechdules", + "name": "Name", + "taskName": "Task name", + "scheduleName": "Schedule name", + "schedule": "Schedule", + "platform": "Platform", + "cronExpression": "Cron Expression", + "cronExp": "Cron Expr.", + "arguments": "Arguments", + "noSchedule": "No schedule yet.", + "deleteSchedules": "Delete schedules(s)", + "details": "Details", + "taskDetails": "Task details", + "addNewSchedule": "Add new schedule", + "destroy": "Destroy", + "pagination": "{{ count }} schedules" + }, + "destroy": { + "title": "Confirm Delete Schedule", + "title2": "Confirm Delete Schedules", + "description": "This action will delete the schedule {{ name }}. Are you sure?", + "description2": "This action will delete the {{ count }} scheduleslisted below.
Are you sure?", + "deleting": "Deleting schedule(s)", + "delete": "Delete the schedule", + "delete2": "Delete the schedules", + "message": { + "successTitle": "Delete schedule(s)", + "successContent": "{{ count }} schedule(s) deleted.", + "errorContent": "An error occurred while deleting schedule(s). Please check the server logs for more details." + } + }, + "create": { + "title": "Create schedule(s)", + "requiredName": "The name is required.", + "uniqueName": "The name already exists.", + "duplicateScheduleName": "Duplicate schedule name on the form.", + "requiredScheduleName": "The name is required.", + "uniqueScheduleName": "The name already exists.", + "requiredPlatform": "The platform is required.", + "requiredCronExpression": "The cron expression is required.", + "arguments": "arguments", + "argumentsDesc": "Arguments can be prefixed by -- (optional). Example:", + "invalidArguments": "One or more arguments are invalid.
Example: myarg=myvalue.", + "properties": "Properties", + "propertiesDesc": "Parameters should start with an app. or scheduler.. Example:", + "invalidProperties": "One or more parameters are invalid.
Example: app.myarg=myvalue.", + "create": "Create schedule(s)", + "creating": "Creating schedule(s)", + "message": { + "groupSeclectionNotFoundTitle": "Group selection not found.", + "scheculeSuccessTitle": "Schedule creation", + "scheculesSuccessTitle": "Schedule creation", + "scheculeSuccessContent": "Successfully schedule creation \"{{ name }}\"", + "scheculesSuccessContent": "Successfully {{ count }} schedules creation" + } + }, + "schedule": { + "title": "Schedule", + "taskDetails": "Task details", + "deleteSchedule": "Delete schedule", + "information": "Information", + "taskInformation": "Task Information" + } + }, + "security": { + "authenticationRequired": { + "title": "Authentication required", + "description": "Please sign in." + }, + "featureDisabled": { + "title": "Feature Disabled", + "description": "The requested feature is disabled on the server." + }, + "rolesMissing": { + "title": "Roles Missing", + "description": "It appears that you are missing the proper roles. Please contact your administrator to rectify the situation." + } + }, + "flo": { + "commons": { + "invalidValue": "Invalid value.", + "searchForApplications": "Search for applications", + "fitToContent": "Fit to Content", + "instanceDown": "App instance either is down or not deployed" + }, + "properties": { + "title": "Properties for", + "searchProperties": "Search properties" + }, + "stream": { + "invalidAppLabel": "Invalid app label.", + "invalidStreamName": "Invalid stream name.", + "uniqueStreamName": "Stream name already exists.", + "noneOfStreamName": "Stream name already exists on the canvas.", + "enterStreamDefinition": "Enter stream definition" + }, + "task": { + "enterTaskDefinition": "Enter task definition" + } + } +} diff --git a/ui/tsconfig.json b/ui/tsconfig.json index ccb4a059e..bc67369f1 100644 --- a/ui/tsconfig.json +++ b/ui/tsconfig.json @@ -10,13 +10,10 @@ "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, + "resolveJsonModule": true, + "esModuleInterop": true, "target": "es2015", - "typeRoots": [ - "node_modules/@types" - ], - "lib": [ - "es2018", - "dom" - ] + "typeRoots": ["node_modules/@types"], + "lib": ["es2018", "dom"] } }