generator-jhipster 7.3.1 → 7.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/jhipster-command.js +2 -2
- package/cli/program.js +31 -29
- package/generators/app/index.js +30 -25
- package/generators/aws/index.js +8 -8
- package/generators/aws/lib/eb.js +1 -1
- package/generators/azure-app-service/index.js +13 -9
- package/generators/azure-spring-cloud/index.js +13 -9
- package/generators/bootstrap/index.js +49 -59
- package/generators/ci-cd/index.js +10 -8
- package/generators/client/files-common.js +6 -2
- package/generators/client/files-react.js +10 -1
- package/generators/client/files-vue.js +40 -1
- package/generators/client/index.js +42 -31
- package/generators/client/needle-api/needle-client-vue.js +1 -1
- package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/angular/package.json +14 -14
- package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
- package/generators/client/templates/common/package.json +3 -3
- package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
- package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
- package/generators/client/templates/react/package.json +44 -43
- package/generators/client/templates/react/package.json.ejs +3 -0
- package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
- package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
- package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +1 -1
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
- package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
- package/generators/client/templates/react/webpack/webpack.dev.js.ejs +17 -1
- package/generators/client/templates/react/webpack/webpack.prod.js.ejs +13 -1
- package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
- package/generators/client/templates/vue/package.json +31 -38
- package/generators/client/templates/vue/package.json.ejs +8 -10
- package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +1 -2
- package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +12 -1
- package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
- package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +12 -0
- package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
- package/generators/client/templates/vue/src/main/webapp/app/index.ts.ejs +19 -0
- package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +25 -8
- package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +9 -4
- package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +44 -1
- package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +11 -0
- package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +0 -10
- package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +19 -8
- package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
- package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
- package/generators/client/templates/vue/tsconfig.json.ejs +5 -9
- package/generators/client/templates/vue/tsconfig.spec.json.ejs +37 -0
- package/generators/client/templates/vue/webpack/config.js.ejs +2 -0
- package/generators/client/templates/vue/webpack/vue.utils.js.ejs +13 -12
- package/generators/client/templates/vue/webpack/webpack.common.js.ejs +64 -50
- package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +17 -68
- package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
- package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +1 -30
- package/generators/cloudfoundry/index.js +9 -9
- package/generators/common/index.js +12 -10
- package/generators/common/templates/package.json +4 -4
- package/generators/cypress/index.js +12 -9
- package/generators/cypress/templates/cypress.json.ejs +3 -0
- package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +3 -3
- package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +2 -2
- package/generators/database-changelog/index.js +33 -22
- package/generators/database-changelog-liquibase/index.js +12 -8
- package/generators/docker-compose/index.js +11 -12
- package/generators/entities/index.js +35 -26
- package/generators/entities-client/index.js +10 -7
- package/generators/entity/index.js +25 -28
- package/generators/entity-client/files.js +6 -11
- package/generators/entity-client/index.js +9 -7
- package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +4 -4
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +1 -1
- package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +7 -7
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +2 -1
- package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
- package/generators/entity-i18n/index.js +7 -4
- package/generators/entity-server/index.js +11 -8
- package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +39 -41
- package/generators/gae/index.js +10 -10
- package/generators/generator-base-blueprint.js +7 -44
- package/generators/generator-base.js +7 -0
- package/generators/generator-constants.js +20 -18
- package/generators/generator-transforms.js +27 -23
- package/generators/heroku/index.js +12 -10
- package/generators/init/constants.cjs +1 -1
- package/generators/kubernetes/files.js +3 -0
- package/generators/kubernetes/index.js +10 -10
- package/generators/kubernetes/templates/db/couchbase.yml.ejs +1 -1
- package/generators/kubernetes/templates/deployment.yml.ejs +8 -3
- package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
- package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
- package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
- package/generators/kubernetes/templates/istio/gateway.yml.ejs +7 -5
- package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
- package/generators/kubernetes-base.js +1 -0
- package/generators/kubernetes-helm/files.js +3 -8
- package/generators/kubernetes-helm/index.js +10 -10
- package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +0 -1
- package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +5 -0
- package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +0 -11
- package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +5 -0
- package/generators/kubernetes-helm/templates/app/values.yml.ejs +68 -5
- package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +1 -1
- package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +1 -1
- package/generators/kubernetes-knative/index.js +10 -10
- package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +6 -4
- package/generators/kubernetes-knative/templates/service.yml.ejs +1 -1
- package/generators/languages/index.js +13 -13
- package/generators/openapi-client/index.js +13 -10
- package/generators/openshift/index.js +10 -11
- package/generators/openshift/templates/deployment.yml.ejs +1 -1
- package/generators/page/index.js +12 -10
- package/generators/server/__snapshots__/generator.spec.mjs.snap +12 -0
- package/generators/server/files.js +12 -0
- package/generators/server/index.js +32 -18
- package/generators/server/templates/gradle.properties.ejs +10 -10
- package/generators/server/templates/pom.xml.ejs +6 -6
- package/generators/server/templates/src/main/docker/app.yml.ejs +1 -1
- package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +2 -2
- package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +0 -1
- package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
- package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +29 -4
- package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +21 -9
- package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +13 -5
- package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
- package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
- package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +6 -1
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
- package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
- package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +16 -2
- package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +63 -0
- package/generators/spring-controller/index.js +9 -7
- package/generators/spring-service/index.js +10 -7
- package/generators/upgrade/index.js +3 -4
- package/generators/utils.js +2 -2
- package/generators/workspaces/index.js +16 -7
- package/jdl/jhipster/default-application-options.js +9 -7
- package/package.json +15 -15
- package/utils/entity.js +14 -0
- package/utils/multi-step-transform/index.js +8 -8
|
@@ -4,85 +4,86 @@
|
|
|
4
4
|
"@fortawesome/free-solid-svg-icons": "5.15.4",
|
|
5
5
|
"@fortawesome/react-fontawesome": "0.1.16",
|
|
6
6
|
"@reduxjs/toolkit": "1.6.2",
|
|
7
|
-
"axios": "0.
|
|
8
|
-
"bootstrap": "
|
|
7
|
+
"axios": "0.24.0",
|
|
8
|
+
"bootstrap": "5.1.3",
|
|
9
9
|
"bootswatch": "5.1.3",
|
|
10
10
|
"lodash": "4.17.21",
|
|
11
11
|
"path-browserify": "1.0.1",
|
|
12
|
-
"react": "17.0.
|
|
13
|
-
"react-dom": "17.0.
|
|
14
|
-
"react-hook-form": "7.
|
|
15
|
-
"react-jhipster": "0.
|
|
12
|
+
"react": "17.0.2",
|
|
13
|
+
"react-dom": "17.0.2",
|
|
14
|
+
"react-hook-form": "7.19.5",
|
|
15
|
+
"react-jhipster": "0.18.0",
|
|
16
16
|
"react-loadable": "5.5.0",
|
|
17
|
-
"react-redux": "7.2.
|
|
17
|
+
"react-redux": "7.2.6",
|
|
18
18
|
"react-redux-loading-bar": "5.0.2",
|
|
19
19
|
"react-router-dom": "5.3.0",
|
|
20
|
-
"react-toastify": "8.0
|
|
20
|
+
"react-toastify": "8.1.0",
|
|
21
21
|
"react-transition-group": "4.4.2",
|
|
22
|
-
"reactstrap": "
|
|
23
|
-
"redux": "4.1.
|
|
24
|
-
"redux-thunk": "2.
|
|
22
|
+
"reactstrap": "9.0.1",
|
|
23
|
+
"redux": "4.1.2",
|
|
24
|
+
"redux-thunk": "2.4.0",
|
|
25
25
|
"sonar-scanner": "3.1.0",
|
|
26
26
|
"tslib": "2.3.1",
|
|
27
27
|
"uuid": "8.3.2"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@testing-library/react": "12.1.2",
|
|
31
|
-
"@types/jest": "27.0.
|
|
32
|
-
"@types/lodash": "4.14.
|
|
33
|
-
"@types/node": "16.11.
|
|
34
|
-
"@types/react": "17.0.
|
|
35
|
-
"@types/react-dom": "17.0.
|
|
36
|
-
"@types/react-redux": "7.1.
|
|
37
|
-
"@types/react-router-dom": "5.3.
|
|
31
|
+
"@types/jest": "27.0.3",
|
|
32
|
+
"@types/lodash": "4.14.177",
|
|
33
|
+
"@types/node": "16.11.8",
|
|
34
|
+
"@types/react": "17.0.35",
|
|
35
|
+
"@types/react-dom": "17.0.11",
|
|
36
|
+
"@types/react-redux": "7.1.20",
|
|
37
|
+
"@types/react-router-dom": "5.3.2",
|
|
38
38
|
"@types/redux": "3.6.31",
|
|
39
39
|
"@types/webpack-env": "1.16.3",
|
|
40
|
-
"@typescript-eslint/eslint-plugin": "4.
|
|
41
|
-
"@typescript-eslint/parser": "4.
|
|
42
|
-
"autoprefixer": "10.
|
|
43
|
-
"browser-sync": "2.27.
|
|
40
|
+
"@typescript-eslint/eslint-plugin": "5.4.0",
|
|
41
|
+
"@typescript-eslint/parser": "5.4.0",
|
|
42
|
+
"autoprefixer": "10.4.0",
|
|
43
|
+
"browser-sync": "2.27.7",
|
|
44
44
|
"browser-sync-webpack-plugin": "2.3.0",
|
|
45
|
-
"copy-webpack-plugin": "9.0
|
|
46
|
-
"core-js": "3.
|
|
45
|
+
"copy-webpack-plugin": "9.1.0",
|
|
46
|
+
"core-js": "3.19.1",
|
|
47
47
|
"cross-env": "7.0.3",
|
|
48
|
-
"css-loader": "6.
|
|
49
|
-
"css-minimizer-webpack-plugin": "3.1.
|
|
50
|
-
"eslint": "
|
|
48
|
+
"css-loader": "6.5.1",
|
|
49
|
+
"css-minimizer-webpack-plugin": "3.1.4",
|
|
50
|
+
"eslint": "8.2.0",
|
|
51
51
|
"eslint-config-prettier": "8.3.0",
|
|
52
|
-
"eslint-plugin-react": "7.
|
|
53
|
-
"eslint-webpack-plugin": "3.
|
|
52
|
+
"eslint-plugin-react": "7.27.0",
|
|
53
|
+
"eslint-webpack-plugin": "3.1.1",
|
|
54
54
|
"folder-hash": "4.0.1",
|
|
55
|
-
"fork-ts-checker-webpack-plugin": "6.
|
|
56
|
-
"html-webpack-plugin": "5.
|
|
55
|
+
"fork-ts-checker-webpack-plugin": "6.4.0",
|
|
56
|
+
"html-webpack-plugin": "5.5.0",
|
|
57
57
|
"identity-obj-proxy": "3.0.0",
|
|
58
|
-
"jest": "27.3.
|
|
58
|
+
"jest": "27.3.1",
|
|
59
59
|
"jest-junit": "13.0.0",
|
|
60
60
|
"jest-sonar-reporter": "2.0.0",
|
|
61
61
|
"json-loader": "0.5.7",
|
|
62
62
|
"merge-jsons-webpack-plugin": "1.0.21",
|
|
63
|
-
"mini-css-extract-plugin": "2.4.
|
|
63
|
+
"mini-css-extract-plugin": "2.4.5",
|
|
64
64
|
"postcss-loader": "6.2.0",
|
|
65
|
+
"postcss-rtlcss": "3.5.0",
|
|
65
66
|
"react-infinite-scroller": "1.2.4",
|
|
66
67
|
"redux-mock-store": "1.5.4",
|
|
67
68
|
"rimraf": "3.0.2",
|
|
68
|
-
"sass": "1.43.
|
|
69
|
-
"sass-loader": "12.
|
|
69
|
+
"sass": "1.43.4",
|
|
70
|
+
"sass-loader": "12.3.0",
|
|
70
71
|
"simple-progress-webpack-plugin": "2.0.0",
|
|
71
|
-
"sinon": "
|
|
72
|
+
"sinon": "12.0.1",
|
|
72
73
|
"source-map-loader": "3.0.0",
|
|
73
74
|
"sourcemap-istanbul-instrumenter-loader": "0.2.0",
|
|
74
|
-
"style-loader": "3.3.
|
|
75
|
-
"swagger-ui-dist": "
|
|
76
|
-
"terser-webpack-plugin": "5.2.
|
|
75
|
+
"style-loader": "3.3.1",
|
|
76
|
+
"swagger-ui-dist": "4.1.0",
|
|
77
|
+
"terser-webpack-plugin": "5.2.5",
|
|
77
78
|
"thread-loader": "3.0.4",
|
|
78
79
|
"ts-jest": "27.0.7",
|
|
79
80
|
"ts-loader": "9.2.6",
|
|
80
|
-
"typescript": "4.
|
|
81
|
-
"webpack": "5.
|
|
81
|
+
"typescript": "4.5.2",
|
|
82
|
+
"webpack": "5.64.1",
|
|
82
83
|
"webpack-cli": "4.9.1",
|
|
83
|
-
"webpack-dev-server": "4.
|
|
84
|
+
"webpack-dev-server": "4.5.0",
|
|
84
85
|
"webpack-merge": "5.8.0",
|
|
85
86
|
"webpack-notifier": "1.14.1",
|
|
86
|
-
"workbox-webpack-plugin": "6.
|
|
87
|
+
"workbox-webpack-plugin": "6.4.1"
|
|
87
88
|
}
|
|
88
89
|
}
|
|
@@ -123,6 +123,9 @@
|
|
|
123
123
|
"mocha": "7.1.2",
|
|
124
124
|
<%_ } _%>
|
|
125
125
|
"postcss-loader": "<%= dependabotPackageJson.devDependencies['postcss-loader'] %>",
|
|
126
|
+
<%_ if (enableI18nRTL) { _%>
|
|
127
|
+
"postcss-rtlcss": "<%= dependabotPackageJson.devDependencies['postcss-rtlcss'] %>",
|
|
128
|
+
<%_ } _%>
|
|
126
129
|
"prettier": "<%= dependabotPackageJson.devDependencies['prettier'] %>",
|
|
127
130
|
<%_ if (!skipServer) { _%>
|
|
128
131
|
"prettier-plugin-java": "<%= dependabotPackageJson.devDependencies['prettier-plugin-java'] %>",
|
|
@@ -25,9 +25,6 @@
|
|
|
25
25
|
<%_ if (!clientThemeNone) { _%>
|
|
26
26
|
@import "~bootswatch/dist/<%= clientTheme %>/bootswatch";
|
|
27
27
|
<%_ } _%>
|
|
28
|
-
<%_ if (enableI18nRTL) { _%>
|
|
29
|
-
@import '../content/scss/rtl.scss';
|
|
30
|
-
<%_ } _%>
|
|
31
28
|
body {
|
|
32
29
|
<%_ if (clientThemeNone) { _%>
|
|
33
30
|
background: #fafafa;
|
|
@@ -88,7 +88,7 @@ export const ConfigurationPage = () => {
|
|
|
88
88
|
<Row key={index}>
|
|
89
89
|
<Col md="4">{propKey}</Col>
|
|
90
90
|
<Col md="8">
|
|
91
|
-
<Badge className="float-
|
|
91
|
+
<Badge className="float-end bg-secondary break">{JSON.stringify(property['properties'][propKey])}</Badge>
|
|
92
92
|
</Col>
|
|
93
93
|
</Row>
|
|
94
94
|
))}
|
|
@@ -118,7 +118,7 @@ export const ConfigurationPage = () => {
|
|
|
118
118
|
<tr key={propIndex}>
|
|
119
119
|
<td className="break">{propKey}</td>
|
|
120
120
|
<td className="break">
|
|
121
|
-
<span className="float-
|
|
121
|
+
<span className="float-end badge bg-secondary break">{envKey.properties[propKey].value}</span>
|
|
122
122
|
</td>
|
|
123
123
|
</tr>
|
|
124
124
|
))}
|
|
@@ -38,8 +38,8 @@ export const GatewayPage = () => {
|
|
|
38
38
|
Object.keys(instance).map((key, index) => {
|
|
39
39
|
spans.push((
|
|
40
40
|
<span key={key.toString() + 'value'}>
|
|
41
|
-
<Badge key={key.toString() + '-containerbadge'} className="
|
|
42
|
-
<Badge key={key.toString() + '-badge'} color="info" className="
|
|
41
|
+
<Badge key={key.toString() + '-containerbadge'} className="fw-normal">
|
|
42
|
+
<Badge key={key.toString() + '-badge'} color="info" className="fw-normal" pill>{key}</Badge>
|
|
43
43
|
{instance[key]}
|
|
44
44
|
</Badge>
|
|
45
45
|
</span>
|
|
@@ -74,11 +74,11 @@ export const MetricsPage = () => {
|
|
|
74
74
|
<h3>JVM Metrics</h3>
|
|
75
75
|
<Row>
|
|
76
76
|
<Col md="4">
|
|
77
|
-
{metrics
|
|
77
|
+
{metrics?.jvm ? <JvmMemory jvmMetrics={metrics.jvm} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} /> : ''}
|
|
78
78
|
</Col>
|
|
79
79
|
<Col md="4">{threadDump ? <JvmThreads jvmThreads={threadDump} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} /> : ''}</Col>
|
|
80
80
|
<Col md="4">
|
|
81
|
-
{metrics
|
|
81
|
+
{metrics?.processMetrics ? (
|
|
82
82
|
<SystemMetrics
|
|
83
83
|
systemMetrics={metrics.processMetrics}
|
|
84
84
|
wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT}
|
|
@@ -92,7 +92,7 @@ export const MetricsPage = () => {
|
|
|
92
92
|
</Col>
|
|
93
93
|
</Row>
|
|
94
94
|
|
|
95
|
-
{metrics
|
|
95
|
+
{metrics?.garbageCollector ? (
|
|
96
96
|
<GarbageCollectorMetrics garbageCollectorMetrics={metrics.garbageCollector} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} />
|
|
97
97
|
) : (
|
|
98
98
|
''
|
|
@@ -106,13 +106,13 @@ export const MetricsPage = () => {
|
|
|
106
106
|
) : (
|
|
107
107
|
''
|
|
108
108
|
)}
|
|
109
|
-
{metrics
|
|
109
|
+
{metrics?.services ? (
|
|
110
110
|
<EndpointsRequestsMetrics endpointsRequestsMetrics={metrics.services} wholeNumberFormat={APP_WHOLE_NUMBER_FORMAT} />
|
|
111
111
|
) : (
|
|
112
112
|
''
|
|
113
113
|
)}
|
|
114
114
|
|
|
115
|
-
{metrics
|
|
115
|
+
{metrics?.cache ? (
|
|
116
116
|
<Row>
|
|
117
117
|
<Col sm="12">
|
|
118
118
|
<CacheMetrics cacheMetrics={metrics.cache} twoDigitAfterPointFormat={APP_TWO_DIGITS_AFTER_POINT_NUMBER_FORMAT} />
|
|
@@ -122,7 +122,7 @@ export const MetricsPage = () => {
|
|
|
122
122
|
''
|
|
123
123
|
)}
|
|
124
124
|
|
|
125
|
-
{metrics
|
|
125
|
+
{metrics?.databases && JSON.stringify(metrics.databases) !== '{}' ? (
|
|
126
126
|
<Row>
|
|
127
127
|
<Col sm="12">
|
|
128
128
|
<DatasourceMetrics datasourceMetrics={metrics.databases} twoDigitAfterPointFormat={APP_TWO_DIGITS_AFTER_POINT_NUMBER_FORMAT} />
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
-%>
|
|
19
19
|
import React, { useState, useEffect } from 'react';
|
|
20
20
|
import { Link, RouteComponentProps } from 'react-router-dom';
|
|
21
|
-
import { Button, Table,
|
|
21
|
+
import { Button, Table, Badge } from 'reactstrap';
|
|
22
22
|
import {
|
|
23
23
|
Translate,
|
|
24
24
|
TextFormat,
|
|
@@ -108,7 +108,7 @@ export const UserManagement = (props: RouteComponentProps<any>) => {
|
|
|
108
108
|
<h2 id="user-management-page-heading" data-cy="userManagementPageHeading">
|
|
109
109
|
<Translate contentKey="userManagement.home.title">Users</Translate>
|
|
110
110
|
<div className="d-flex justify-content-end">
|
|
111
|
-
<Button className="
|
|
111
|
+
<Button className="me-2" color="info" onClick={handleSyncList} disabled={loading}>
|
|
112
112
|
<FontAwesomeIcon icon="sync" spin={loading} /> <Translate contentKey="userManagement.home.refreshListLabel">Refresh List</Translate>
|
|
113
113
|
</Button>
|
|
114
114
|
<Link to={`${match.url}/new`} className="btn btn-primary jh-create-entity">
|
|
@@ -188,7 +188,7 @@ export const UserManagement = (props: RouteComponentProps<any>) => {
|
|
|
188
188
|
) : null}
|
|
189
189
|
</td>
|
|
190
190
|
<%_ } _%>
|
|
191
|
-
<td className="text-
|
|
191
|
+
<td className="text-end">
|
|
192
192
|
<div className="btn-group flex-btn-group-container">
|
|
193
193
|
<Button
|
|
194
194
|
tag={Link} to={`${match.url}/${user.login}`}
|
|
@@ -216,11 +216,11 @@ export const UserManagement = (props: RouteComponentProps<any>) => {
|
|
|
216
216
|
</tbody>
|
|
217
217
|
</Table>
|
|
218
218
|
<%_ if (!databaseTypeCassandra) { _%>
|
|
219
|
-
{ totalItems ? (<div className={ users
|
|
220
|
-
<
|
|
219
|
+
{ totalItems ? (<div className={ users?.length > 0 ? '' : 'd-none' }>
|
|
220
|
+
<div className="justify-content-center d-flex">
|
|
221
221
|
<JhiItemCount page={pagination.activePage} total={totalItems} itemsPerPage={pagination.itemsPerPage} i18nEnabled />
|
|
222
|
-
</
|
|
223
|
-
<
|
|
222
|
+
</div>
|
|
223
|
+
<div className="justify-content-center d-flex">
|
|
224
224
|
<JhiPagination
|
|
225
225
|
activePage={pagination.activePage}
|
|
226
226
|
onSelect={handlePagination}
|
|
@@ -228,7 +228,7 @@ export const UserManagement = (props: RouteComponentProps<any>) => {
|
|
|
228
228
|
itemsPerPage={pagination.itemsPerPage}
|
|
229
229
|
totalItems={totalItems}
|
|
230
230
|
/>
|
|
231
|
-
</
|
|
231
|
+
</div>
|
|
232
232
|
</div>) : '' }
|
|
233
233
|
<%_ } _%>
|
|
234
234
|
</div>
|
|
@@ -53,7 +53,7 @@ export const Home = () => {
|
|
|
53
53
|
<h2><Translate contentKey="home.title">Welcome, <%= backendName %> Hipster!</Translate></h2>
|
|
54
54
|
<p className="lead"><Translate contentKey="home.subtitle">This is your homepage</Translate></p>
|
|
55
55
|
{
|
|
56
|
-
(account
|
|
56
|
+
(account?.login) ? (
|
|
57
57
|
<div>
|
|
58
58
|
<Alert color="success">
|
|
59
59
|
<Translate contentKey="home.logged.message" interpolate={{ username: account.login }}>You are logged in as user {account.login}.</Translate>
|
package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs
CHANGED
|
@@ -93,7 +93,7 @@ const Header = (props: IHeaderProps) => {
|
|
|
93
93
|
<NavbarToggler aria-label="Menu" onClick={toggleMenu} />
|
|
94
94
|
<Brand />
|
|
95
95
|
<Collapse isOpen={menuOpen} navbar>
|
|
96
|
-
<Nav id="header-tabs" className="
|
|
96
|
+
<Nav id="header-tabs" className="ms-auto" navbar>
|
|
97
97
|
<Home />
|
|
98
98
|
{props.isAuthenticated && <EntitiesMenu />}
|
|
99
99
|
{props.isAuthenticated && props.isAdmin &&
|
package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs
CHANGED
|
@@ -29,7 +29,7 @@ import { getLoginUrl } from 'app/shared/util/url-utils';
|
|
|
29
29
|
import { NavDropdown } from './menu-components';
|
|
30
30
|
|
|
31
31
|
|
|
32
|
-
const accountMenuItemsAuthenticated = (
|
|
32
|
+
const accountMenuItemsAuthenticated = () => (
|
|
33
33
|
<>
|
|
34
34
|
<%_ if (!skipUserManagement) { _%>
|
|
35
35
|
<MenuItem icon="wrench" to="/account/settings" data-cy="settings"><Translate contentKey="global.menu.account.settings">Settings</Translate></MenuItem>
|
|
@@ -42,7 +42,7 @@ const accountMenuItemsAuthenticated = (
|
|
|
42
42
|
</>
|
|
43
43
|
);
|
|
44
44
|
|
|
45
|
-
const accountMenuItems = (
|
|
45
|
+
const accountMenuItems = () => (
|
|
46
46
|
<>
|
|
47
47
|
<%_ if (!authenticationTypeOauth2) { _%>
|
|
48
48
|
<MenuItem id="login-item" icon="sign-in-alt" to="/login" data-cy="login"><Translate contentKey="global.menu.account.login">Sign in</Translate></MenuItem>
|
|
@@ -57,7 +57,7 @@ const accountMenuItems = (
|
|
|
57
57
|
|
|
58
58
|
export const AccountMenu = ({ isAuthenticated = false }) => (
|
|
59
59
|
<NavDropdown icon="user" name={translate('global.menu.account.main')} id="account-menu" data-cy="accountMenu">
|
|
60
|
-
{isAuthenticated ? accountMenuItemsAuthenticated : accountMenuItems}
|
|
60
|
+
{isAuthenticated ? accountMenuItemsAuthenticated() : accountMenuItems()}
|
|
61
61
|
</NavDropdown>
|
|
62
62
|
);
|
|
63
63
|
|
package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs
CHANGED
|
@@ -25,7 +25,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
|
25
25
|
import { NavDropdown } from './menu-components';
|
|
26
26
|
import { Translate, translate } from 'react-jhipster';
|
|
27
27
|
|
|
28
|
-
const adminMenuItems = (
|
|
28
|
+
const adminMenuItems = () => (
|
|
29
29
|
<>
|
|
30
30
|
<%_ if (applicationTypeGateway && serviceDiscoveryType) { _%>
|
|
31
31
|
<MenuItem icon="road" to="/admin/gateway"><Translate contentKey="global.menu.admin.gateway">Gateway</Translate></MenuItem>
|
|
@@ -44,14 +44,14 @@ const adminMenuItems = (
|
|
|
44
44
|
<%_ } _%>
|
|
45
45
|
{/* jhipster-needle-add-element-to-admin-menu - JHipster will add entities to the admin menu here */}
|
|
46
46
|
</>
|
|
47
|
-
|
|
47
|
+
);
|
|
48
48
|
|
|
49
|
-
const openAPIItem = (
|
|
49
|
+
const openAPIItem = () => (
|
|
50
50
|
<MenuItem icon="book" to="/admin/docs"><Translate contentKey="global.menu.admin.apidocs">API</Translate></MenuItem>
|
|
51
51
|
);
|
|
52
52
|
|
|
53
53
|
<% if (devDatabaseTypeH2Any) { %>
|
|
54
|
-
const databaseItem = (
|
|
54
|
+
const databaseItem = () => (
|
|
55
55
|
<DropdownItem tag="a" href="<% if (reactive) { %>http://localhost:8092/<% } else { %>./h2-console/<% } %>" target="_tab">
|
|
56
56
|
<FontAwesomeIcon icon="database" fixedWidth /> <Translate contentKey="global.menu.admin.database">Database</Translate>
|
|
57
57
|
</DropdownItem>
|
|
@@ -60,10 +60,10 @@ const databaseItem = (
|
|
|
60
60
|
|
|
61
61
|
export const AdminMenu = ({ showOpenAPI <% if (devDatabaseTypeH2Any) { %>, showDatabase <%_ } _%>}) => (
|
|
62
62
|
<NavDropdown icon="users-cog" name={translate('global.menu.admin.main')} id="admin-menu" data-cy="adminMenu">
|
|
63
|
-
{adminMenuItems}
|
|
64
|
-
{showOpenAPI && openAPIItem}
|
|
63
|
+
{adminMenuItems()}
|
|
64
|
+
{showOpenAPI && openAPIItem()}
|
|
65
65
|
<% if (devDatabaseTypeH2Any) { %>
|
|
66
|
-
{showDatabase && databaseItem}
|
|
66
|
+
{showDatabase && databaseItem()}
|
|
67
67
|
<%_ } _%>
|
|
68
68
|
</NavDropdown>
|
|
69
69
|
);
|
|
@@ -27,7 +27,7 @@ export const NavDropdown = props => (
|
|
|
27
27
|
<FontAwesomeIcon icon={props.icon} />
|
|
28
28
|
<span>{props.name}</span>
|
|
29
29
|
</DropdownToggle>
|
|
30
|
-
<DropdownMenu
|
|
30
|
+
<DropdownMenu end style={props.style}>
|
|
31
31
|
{props.children}
|
|
32
32
|
</DropdownMenu>
|
|
33
33
|
</UncontrolledDropdown>
|
|
@@ -23,6 +23,9 @@ const SimpleProgressWebpackPlugin = require('simple-progress-webpack-plugin');
|
|
|
23
23
|
const WebpackNotifierPlugin = require('webpack-notifier');
|
|
24
24
|
const path = require('path');
|
|
25
25
|
const sass = require('sass');
|
|
26
|
+
<%_ if (enableI18nRTL) { _%>
|
|
27
|
+
const postcssRTLCSS = require('postcss-rtlcss');
|
|
28
|
+
<%_ } _%>
|
|
26
29
|
|
|
27
30
|
const utils = require('./utils.js');
|
|
28
31
|
const commonConfig = require('./webpack.common.js');
|
|
@@ -47,7 +50,20 @@ module.exports = async (options) => webpackMerge(await commonConfig({ env: ENV }
|
|
|
47
50
|
rules: [
|
|
48
51
|
{
|
|
49
52
|
test: /\.(sa|sc|c)ss$/,
|
|
50
|
-
use: [
|
|
53
|
+
use: [
|
|
54
|
+
'style-loader',
|
|
55
|
+
'css-loader',
|
|
56
|
+
{
|
|
57
|
+
loader: 'postcss-loader',
|
|
58
|
+
<%_ if (enableI18nRTL) { _%>
|
|
59
|
+
options: {
|
|
60
|
+
postcssOptions: {
|
|
61
|
+
plugins: [postcssRTLCSS()],
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
<%_ } _%>
|
|
65
|
+
},
|
|
66
|
+
{
|
|
51
67
|
loader: 'sass-loader',
|
|
52
68
|
options: { implementation: sass }
|
|
53
69
|
}
|
|
@@ -23,6 +23,9 @@ const WorkboxPlugin = require('workbox-webpack-plugin');
|
|
|
23
23
|
const TerserPlugin = require('terser-webpack-plugin');
|
|
24
24
|
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
|
|
25
25
|
const sass = require('sass');
|
|
26
|
+
<%_ if (enableI18nRTL) { _%>
|
|
27
|
+
const postcssRTLCSS = require('postcss-rtlcss');
|
|
28
|
+
<%_ } _%>
|
|
26
29
|
|
|
27
30
|
const utils = require('./utils.js');
|
|
28
31
|
const commonConfig = require('./webpack.common.js');
|
|
@@ -52,7 +55,16 @@ module.exports = async () => webpackMerge(await commonConfig({ env: ENV }), {
|
|
|
52
55
|
}
|
|
53
56
|
},
|
|
54
57
|
'css-loader',
|
|
55
|
-
|
|
58
|
+
{
|
|
59
|
+
loader: 'postcss-loader',
|
|
60
|
+
<%_ if (enableI18nRTL) { _%>
|
|
61
|
+
options: {
|
|
62
|
+
postcssOptions: {
|
|
63
|
+
plugins: [postcssRTLCSS()],
|
|
64
|
+
},
|
|
65
|
+
},
|
|
66
|
+
<%_ } _%>
|
|
67
|
+
},
|
|
56
68
|
{
|
|
57
69
|
loader: 'sass-loader',
|
|
58
70
|
options: { implementation: sass }
|
|
@@ -19,26 +19,29 @@
|
|
|
19
19
|
module.exports = {
|
|
20
20
|
root: true,
|
|
21
21
|
env: {
|
|
22
|
-
node: true
|
|
22
|
+
node: true,
|
|
23
23
|
},
|
|
24
24
|
extends: [
|
|
25
25
|
'plugin:vue/essential',
|
|
26
26
|
'eslint:recommended',
|
|
27
27
|
'@vue/typescript/recommended',
|
|
28
28
|
'@vue/prettier',
|
|
29
|
-
'@vue/prettier/@typescript-eslint'
|
|
29
|
+
'@vue/prettier/@typescript-eslint',
|
|
30
30
|
],
|
|
31
31
|
parserOptions: {
|
|
32
|
-
ecmaVersion: 2020
|
|
32
|
+
ecmaVersion: 2020,
|
|
33
|
+
project: ['./tsconfig.spec.json'],
|
|
33
34
|
},
|
|
34
35
|
rules: {
|
|
35
36
|
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
|
36
37
|
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
|
38
|
+
'vue/multi-word-component-names': 'off',
|
|
37
39
|
'@typescript-eslint/no-explicit-any': 'off',
|
|
38
40
|
'@typescript-eslint/no-unused-vars': 'off',
|
|
39
41
|
'@typescript-eslint/explicit-module-boundary-types': 'off',
|
|
40
42
|
'@typescript-eslint/no-empty-function': 'off',
|
|
41
|
-
'@typescript-eslint/ban-ts-comment': 'off'
|
|
43
|
+
'@typescript-eslint/ban-ts-comment': 'off',
|
|
44
|
+
'@typescript-eslint/no-var-requires': 'off',
|
|
42
45
|
},
|
|
43
|
-
|
|
46
|
+
'ignorePatterns': ['<%= BUILD_DIR %>'],
|
|
44
47
|
};
|
|
@@ -3,77 +3,70 @@
|
|
|
3
3
|
"@fortawesome/fontawesome-svg-core": "1.2.36",
|
|
4
4
|
"@fortawesome/free-solid-svg-icons": "5.15.4",
|
|
5
5
|
"@fortawesome/vue-fontawesome": "2.0.6",
|
|
6
|
-
"axios": "0.
|
|
7
|
-
"bootstrap": "4.6.
|
|
6
|
+
"axios": "0.24.0",
|
|
7
|
+
"bootstrap": "4.6.1",
|
|
8
8
|
"bootstrap-vue": "2.21.2",
|
|
9
9
|
"bootswatch": "5.1.3",
|
|
10
|
-
"swagger-ui-dist": "
|
|
10
|
+
"swagger-ui-dist": "4.1.0",
|
|
11
11
|
"vue": "2.6.14",
|
|
12
12
|
"vue-class-component": "7.2.6",
|
|
13
13
|
"vue-cookie": "1.1.4",
|
|
14
14
|
"vue-infinite-loading": "2.4.5",
|
|
15
|
-
"vue-router": "3.5.
|
|
16
|
-
"vue-i18n": "8.26.
|
|
15
|
+
"vue-router": "3.5.3",
|
|
16
|
+
"vue-i18n": "8.26.7",
|
|
17
17
|
"vue-property-decorator": "9.1.2",
|
|
18
18
|
"vuelidate": "0.7.6",
|
|
19
19
|
"vuex": "3.6.2",
|
|
20
20
|
"vue2-filters": "0.13.0"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@types/jest": "27.0.
|
|
24
|
-
"@types/node": "16.11.
|
|
25
|
-
"@types/sinon": "10.0.
|
|
23
|
+
"@types/jest": "27.0.3",
|
|
24
|
+
"@types/node": "16.11.8",
|
|
25
|
+
"@types/sinon": "10.0.6",
|
|
26
26
|
"@types/vuelidate": "0.7.15",
|
|
27
|
-
"@typescript-eslint/eslint-plugin": "4.
|
|
28
|
-
"@typescript-eslint/parser": "4.
|
|
27
|
+
"@typescript-eslint/eslint-plugin": "5.4.0",
|
|
28
|
+
"@typescript-eslint/parser": "5.4.0",
|
|
29
29
|
"@vue/eslint-config-prettier": "6.0.0",
|
|
30
|
-
"@vue/eslint-config-typescript": "
|
|
31
|
-
"@vue/
|
|
32
|
-
"@vue/
|
|
33
|
-
"@vue/cli-service": "4.5.14",
|
|
34
|
-
"@vue/test-utils": "1.2.2",
|
|
30
|
+
"@vue/eslint-config-typescript": "9.1.0",
|
|
31
|
+
"@vue/vue2-jest": "27.0.0-alpha.3",
|
|
32
|
+
"@vue/test-utils": "1.3.0",
|
|
35
33
|
"axios-mock-adapter": "1.20.0",
|
|
36
|
-
"autoprefixer": "10.
|
|
37
|
-
"babel-core": "7.0.0-bridge.0",
|
|
38
|
-
"browser-sync": "2.27.5",
|
|
34
|
+
"autoprefixer": "10.4.0",
|
|
39
35
|
"browser-sync-webpack-plugin": "2.3.0",
|
|
40
|
-
"copy-webpack-plugin": "
|
|
41
|
-
"css-loader": "6.
|
|
42
|
-
"css-minimizer-webpack-plugin": "3.1.
|
|
43
|
-
"file-loader": "6.2.0",
|
|
36
|
+
"copy-webpack-plugin": "10.0.0",
|
|
37
|
+
"css-loader": "6.5.1",
|
|
38
|
+
"css-minimizer-webpack-plugin": "3.1.4",
|
|
44
39
|
"folder-hash": "4.0.1",
|
|
45
|
-
"fork-ts-checker-webpack-plugin": "6.
|
|
46
|
-
"html-webpack-plugin": "5.
|
|
47
|
-
"jest": "27.3.
|
|
40
|
+
"fork-ts-checker-webpack-plugin": "6.4.0",
|
|
41
|
+
"html-webpack-plugin": "5.5.0",
|
|
42
|
+
"jest": "27.3.1",
|
|
48
43
|
"jest-junit": "13.0.0",
|
|
49
44
|
"jest-serializer-vue": "2.0.2",
|
|
50
45
|
"jest-sonar-reporter": "2.0.0",
|
|
51
46
|
"jest-vue-preprocessor": "1.7.1",
|
|
52
47
|
"merge-jsons-webpack-plugin": "1.0.21",
|
|
53
|
-
"mini-css-extract-plugin": "2.4.
|
|
48
|
+
"mini-css-extract-plugin": "2.4.5",
|
|
54
49
|
"numeral": "2.0.6",
|
|
55
|
-
"postcss": "8.3.9",
|
|
56
50
|
"postcss-import": "14.0.2",
|
|
57
51
|
"postcss-loader": "6.2.0",
|
|
58
52
|
"postcss-url": "10.1.3",
|
|
59
53
|
"rimraf": "3.0.2",
|
|
60
|
-
"sass": "1.43.
|
|
61
|
-
"sass-loader": "12.
|
|
62
|
-
"sinon": "
|
|
63
|
-
"terser-webpack-plugin": "5.2.
|
|
54
|
+
"sass": "1.43.4",
|
|
55
|
+
"sass-loader": "12.3.0",
|
|
56
|
+
"sinon": "12.0.1",
|
|
57
|
+
"terser-webpack-plugin": "5.2.5",
|
|
64
58
|
"ts-jest": "27.0.7",
|
|
65
59
|
"ts-loader": "9.2.6",
|
|
66
|
-
"eslint": "
|
|
60
|
+
"eslint": "8.2.0",
|
|
67
61
|
"eslint-plugin-prettier": "3.4.1",
|
|
68
|
-
"eslint-plugin-vue": "
|
|
69
|
-
"typescript": "4.
|
|
70
|
-
"
|
|
71
|
-
"webpack": "5.58.2",
|
|
62
|
+
"eslint-plugin-vue": "8.1.1",
|
|
63
|
+
"typescript": "4.5.2",
|
|
64
|
+
"webpack": "5.64.1",
|
|
72
65
|
"webpack-bundle-analyzer": "4.5.0",
|
|
73
66
|
"webpack-cli": "4.9.1",
|
|
74
|
-
"webpack-dev-server": "4.
|
|
67
|
+
"webpack-dev-server": "4.5.0",
|
|
75
68
|
"webpack-merge": "5.8.0",
|
|
76
|
-
"workbox-webpack-plugin": "6.
|
|
69
|
+
"workbox-webpack-plugin": "6.4.1",
|
|
77
70
|
"vue-jest": "3.0.7",
|
|
78
71
|
"vue-loader": "15.9.8"
|
|
79
72
|
}
|