(nifi) branch main updated (9e11c1a788 -> 5c62b67ea7)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 9e11c1a788 NIFI-13367: (#8933) add 5c62b67ea7 NIFI-13368: (#8931) No new revisions were added by this update. Summary of changes: .../pages/flow-designer/service/canvas-utils.service.ts | 16 +++- .../service/manager/port-manager.service.ts | 4 .../service/manager/process-group-manager.service.ts | 4 .../service/manager/processor-manager.service.ts | 4 .../manager/remote-process-group-manager.service.ts | 4 .../app/pages/flow-designer/state/flow/flow.effects.ts | 4 +++- 6 files changed, 34 insertions(+), 2 deletions(-)
(nifi) branch main updated (5c335cbbec -> 9e11c1a788)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 5c335cbbec NIFI-13364 Removed autorefresh and banner UI properties add 9e11c1a788 NIFI-13367: (#8933) No new revisions were added by this update. Summary of changes: .../src/app/pages/flow-designer/state/flow/flow.effects.ts | 5 +++-- .../ui/common/breadcrumbs/breadcrumbs.component.ts | 14 ++ .../nifi/src/app/pages/logout/feature/logout.module.ts | 6 +- 3 files changed, 14 insertions(+), 11 deletions(-)
(nifi) branch main updated (0a5be35357 -> 5727116aa0)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0a5be35357 NIFI-13030 Adding endpoint for comparing versions of registered flows add 5727116aa0 NIFI-13313: Remove old UI (#8906) No new revisions were added by this update. Summary of changes: .github/PULL_REQUEST_TEMPLATE.md |4 - LICENSE| 22 - .../src/main/resources/META-INF/LICENSE| 589 --- .../src/main/resources/META-INF/NOTICE |9 - nifi-assembly/LICENSE | 294 -- nifi-code-coverage/pom.xml |6 - nifi-commons/nifi-jetty-configuration/pom.xml |4 + .../src/main/resources/META-INF/LICENSE| 21 + .../src/main/resources/META-INF/LICENSE| 22 + .../src/main/resources/META-INF/LICENSE| 83 +- .../src/main/resources/META-INF/LICENSE| 22 + .../src/main/resources/META-INF/LICENSE| 594 +-- .../src/main/resources/META-INF/NOTICE | 10 - .../org/apache/nifi/web/server/JettyServer.java| 46 +- .../nifi-framework/nifi-web/nifi-web-error/pom.xml | 34 - .../org/apache/nifi/web/filter/CatchAllFilter.java | 63 - .../nifi-web-error/src/main/webapp/WEB-INF/web.xml | 37 - .../nifi-web-error/src/main/webapp/index.jsp | 46 - .../apache/nifi/web/filter/CatchAllFilterTest.java | 106 - .../nifi-web-frontend/src/main/nifi/README.md |9 +- .../src/main/nifi/apps/nifi/project.json |6 +- .../src/main/nifi/apps/nifi/proxy.config.mjs |2 +- .../nifi/apps/nifi/src/app/app-routing.module.ts | 10 + .../feature/_logout.component-theme.scss} | 23 +- .../feature/logout-routing.module.ts} |6 +- .../feature/logout.component.html} |7 +- .../feature/logout.component.scss} |0 .../feature/logout.component.spec.ts} | 10 +- .../feature/logout.component.ts} |8 +- .../feature/logout.module.ts} | 16 +- .../src/main/nifi/apps/nifi/src/styles.scss|3 + .../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 937 - .../src/main/frontend/package-lock.json| 761 .../nifi-web-ui/src/main/frontend/package.json | 65 - .../org/apache/nifi/web/filter/LoginFilter.java| 77 - .../org/apache/nifi/web/filter/LogoutFilter.java | 86 - .../src/main/resources/META-INF/LICENSE| 798 .../nifi-web-ui/src/main/resources/META-INF/NOTICE | 11 - .../filters/bulletin-board-min.properties | 19 - .../resources/filters/bulletin-board.properties| 33 - .../main/resources/filters/canvas-min.properties | 19 - .../src/main/resources/filters/canvas.properties | 99 - .../main/resources/filters/cluster-min.properties | 19 - .../src/main/resources/filters/cluster.properties | 30 - .../main/resources/filters/counters-min.properties | 19 - .../src/main/resources/filters/counters.properties | 30 - .../main/resources/filters/history-min.properties | 19 - .../src/main/resources/filters/history.properties | 32 - .../main/resources/filters/login-min.properties| 19 - .../src/main/resources/filters/login.properties| 29 - .../main/resources/filters/logout-min.properties | 19 - .../src/main/resources/filters/logout.properties | 29 - .../resources/filters/provenance-min.properties| 19 - .../main/resources/filters/provenance.properties | 34 - .../main/resources/filters/summary-min.properties | 19 - .../src/main/resources/filters/summary.properties | 47 - .../main/resources/filters/users-min.properties| 19 - .../src/main/resources/filters/users.properties| 31 - .../main/webapp/WEB-INF/pages/bulletin-board.jsp | 62 - .../src/main/webapp/WEB-INF/pages/canvas.jsp | 173 - .../src/main/webapp/WEB-INF/pages/cluster.jsp | 68 - .../src/main/webapp/WEB-INF/pages/counters.jsp | 66 - .../src/main/webapp/WEB-INF/pages/history.jsp | 69 - .../src/main/webapp/WEB-INF/pages/login.jsp| 66 - .../src/main/webapp/WEB-INF/pages/logout.jsp | 57 - .../src/main/webapp/WEB-INF/pages/message-page.jsp | 62 - .../src/main/webapp/WEB-INF/pages/provenance.jsp | 81 - .../src/main/webapp/WEB-INF/pages/summary.jsp | 98 - .../src/main/webapp/WEB-INF/pages/users.jsp| 75 - .../main/webapp/WEB-INF/partials/banners-main.jsp | 19 - .../webapp/WEB-INF/partials/banners-utility.jsp| 19 - .../bulletin-board/bulletin-board-content.jsp | 43 - .../WEB-INF/partials/canvas/about-dialog.jsp | 44 - .../WEB-INF/partials/canvas/canvas-header.jsp | 193 - .../partials/canvas/component-state-dialog.jsp | 49 - .../partials
(nifi) branch main updated: [NIFI-13360] rename nifi theme to supplemental theme (#8926)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 21f0ca47b0 [NIFI-13360] rename nifi theme to supplemental theme (#8926)
21f0ca47b0 is described below
commit 21f0ca47b0c24e16dc4544a0568ebcc1033efd0a
Author: Scott Aslan
AuthorDate: Tue Jun 4 16:00:53 2024 -0500
[NIFI-13360] rename nifi theme to supplemental theme (#8926)
* [NIFI-13360] rename nifi theme to supplemental theme
* Update
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_app.scss
Co-authored-by: Rob Fellows
* Update
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_app.scss
Co-authored-by: Rob Fellows
-
Co-authored-by: Rob Fellows
This closes #8926
---
.../ui/canvas/_canvas.component-theme.scss | 144 -
.../_change-color-dialog.component-theme.scss | 41 +++---
.../ui/canvas/footer/_footer.component-theme.scss | 6 +-
.../_navigation-control.component-theme.scss | 21 ++-
.../birdseye/_birdseye.component-theme.scss| 21 ++-
.../_operation-control.component-theme.scss| 21 ++-
.../flow-status/_flow-status.component-theme.scss | 33 +++--
.../_new-canvas-item.component-theme.scss | 24 +++-
.../header/search/_search.component-theme.scss | 27 ++--
.../login/feature/_login.component-theme.scss | 21 ++-
.../feature/_provenance.component-theme.scss | 29 +++--
.../_provenance-event-table.component-theme.scss | 21 ++-
.../lineage/_lineage.component-theme.scss | 8 +-
.../_processor-status-table.component-theme.scss | 21 ++-
.../_context-menu.component-theme.scss | 29 +++--
.../text-editor/_text-editor.component-theme.scss | 2 +-
.../navigation/_navigation.component-theme.scss| 2 +-
.../nf-editor/_nf-editor.component-theme.scss | 2 +-
.../_status-history.component-theme.scss | 20 +--
.../_property-hint-tip.component-theme.scss| 17 ++-
.../nifi/apps/nifi/src/assets/styles/_app.scss | 124 +++---
.../nifi/src/assets/styles/_codemirror-theme.scss | 44 ---
.../nifi/src/assets/styles/_listing-table.scss | 15 ++-
.../assets/themes/{nifi.scss => supplemental.scss} | 4 +-
.../src/main/nifi/apps/nifi/src/styles.scss| 95 +++---
25 files changed, 477 insertions(+), 315 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
index f471c88d41..e713edfde3 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
@@ -18,18 +18,18 @@
@use 'sass:map';
@use '@angular/material' as mat;
-@mixin generate-theme($material-theme, $nifi-theme) {
+@mixin generate-theme($material-theme, $supplemental-theme) {
// Get the color config from the theme.
$material-theme-color-config: mat.get-color-config($material-theme);
-$nifi-theme-color-config: mat.get-color-config($nifi-theme);
+$supplemental-theme-color-config:
mat.get-color-config($supplemental-theme);
// Get the palettes from the color-config.
$material-theme-primary-palette: map.get($material-theme-color-config,
'primary');
$material-theme-accent-palette: map.get($material-theme-color-config,
'accent');
$material-theme-warn-palette: map.get($material-theme-color-config,
'warn');
-$nifi-theme-surface-palette: map.get($nifi-theme-color-config, 'primary');
-$nifi-theme-success-palette: map.get($nifi-theme-color-config, 'accent');
-$nifi-theme-caution-palette: map.get($nifi-theme-color-config, 'warn');
+$supplemental-theme-surface-palette:
map.get($supplemental-theme-color-config, 'primary');
+$supplemental-theme-success-palette:
map.get($supplemental-theme-color-config, 'accent');
+$supplemental-theme-caution-palette:
map.get($supplemental-theme-color-config, 'warn');
// Get hues from palette
$material-theme-primary-palette-darker:
mat.get-color-from-palette($material-theme-primary-palette, darker);
@@ -38,49 +38,62 @@
$material-theme-accent-palette-default:
mat.get-color-from-palette($material-theme-accent-palette, default);
// Canvas colors
-$nifi-theme-surf
(nifi) branch main updated: [NIFI-13361] determine extension description height base on $body-2 line-height configuration (#8927)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a9c01903ee [NIFI-13361] determine extension description height base on
$body-2 line-height configuration (#8927)
a9c01903ee is described below
commit a9c01903ee06d7ca6bef23dafcc06ed4a27a8fd0
Author: Scott Aslan
AuthorDate: Tue Jun 4 14:28:46 2024 -0500
[NIFI-13361] determine extension description height base on $body-2
line-height configuration (#8927)
This closes #8927
---
.../_extension-creation.component-theme.scss | 27 ++
.../extension-creation.component.scss | 1 -
.../src/main/nifi/apps/nifi/src/styles.scss| 3 +++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/_extension-creation.component-theme.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/_extension-creation.component-theme.scss
new file mode 100644
index 00..9862441c99
--- /dev/null
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/_extension-creation.component-theme.scss
@@ -0,0 +1,27 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+@mixin generate-theme($material-theme) {
+.extension-creation-dialog {
+.selected-type-description {
+height: #{mat.get-theme-typography($material-theme, body-2,
line-height) * 3};
+}
+}
+}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
index e9067c2d5d..bc67058ab5 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
@@ -50,7 +50,6 @@
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
-height: 72px;
}
.no-selected-type {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/styles.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/styles.scss
index 5f33b953e8..8709f533cd 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/styles.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/styles.scss
@@ -41,6 +41,7 @@
@use
'app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component-theme'
as
lineage;
@use 'app/ui/common/context-menu/context-menu.component-theme' as context-menu;
+@use 'app/ui/common/extension-creation/extension-creation.component-theme' as
extension-creation;
@use 'app/ui/common/navigation/navigation.component-theme' as navigation;
@use
'app/ui/common/property-table/editors/nf-editor/nf-editor.component-theme' as
nf-editor;
@use 'app/ui/common/status-history/status-history.component-theme' as
status-history;
@@ -86,6 +87,7 @@
@include listing-table.generate-theme($material-theme-light,
$nifi-theme-light);
@include canvas.generate-theme($material-theme-light, $nifi-theme-light);
@include footer.generate-theme($nifi-theme-light);
+@include extension-creation.generate-theme($material-theme-light);
@include navigation-control.generate-theme($nifi-theme-light);
@include birdseye-control.generate-theme($material-theme-light
(nifi) branch main updated: [NIFI-13331] set default table density to -4 for all listings in nifi (#8925)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new e22ca038ed [NIFI-13331] set default table density to -4 for all
listings in nifi (#8925)
e22ca038ed is described below
commit e22ca038edec75f04b72d2e7083ed648fad93351
Author: Scott Aslan
AuthorDate: Tue Jun 4 14:07:55 2024 -0500
[NIFI-13331] set default table density to -4 for all listings in nifi
(#8925)
This closes #8925
---
.../ui/manage-remote-ports/manage-remote-ports.component.scss | 4
.../parameter-table/parameter-table.component.scss| 8
.../common/extension-creation/extension-creation.component.scss | 2 --
.../src/main/nifi/apps/nifi/src/assets/styles/_listing-table.scss | 1 +
4 files changed, 1 insertion(+), 14 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss
index b1f7b3d121..52c8a99828 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss
@@ -15,12 +15,8 @@
* limitations under the License.
*/
-@use '@angular/material' as mat;
-
.manage-remote-ports-table {
.listing-table {
-@include mat.table-density(-4);
-
table {
.mat-column-moreDetails {
width: 52px;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
index 6bd6193d64..2944f98194 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
@@ -14,11 +14,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-@use '@angular/material' as mat;
-
-.parameter-table {
-.listing-table {
-@include mat.table-density(-4);
-}
-}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
index 5730380b32..e9067c2d5d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss
@@ -21,8 +21,6 @@
@include mat.button-density(-1);
.listing-table {
-@include mat.table-density(-4);
-
table {
.fa.fa-shield {
width: 10px;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_listing-table.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_listing-table.scss
index 76903e20f6..761d94cd44 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_listing-table.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_listing-table.scss
@@ -20,6 +20,7 @@
@mixin styles() {
.listing-table {
+@include mat.table-density(-4);
border-width: 1px;
border-style: solid;
(nifi) branch main updated: [NIFI-13349] align angular material and tailwind typography (#8918)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 6206f0f008 [NIFI-13349] align angular material and tailwind typography (#8918) 6206f0f008 is described below commit 6206f0f008accde44666dedd26f53d243c9053a3 Author: Scott Aslan AuthorDate: Tue Jun 4 12:08:17 2024 -0500 [NIFI-13349] align angular material and tailwind typography (#8918) * [NIFI-13349] align angular material and tailwind typography * override default tailwind fontSize configurations to match up with angular material typography configuration * cleanup duplicate style * add text-3xl tailwind configuration * update primary-node-only to use text-sm * replace .refresh-container with text-sm * add comments for $subtitle-2 material typography config * adjust $subtitle-2 font size and line height This closes #8918 --- .../component-access-policies.component.html | 2 +- .../component-access-policies.component.scss | 4 -- .../global-access-policies.component.html | 2 +- .../global-access-policies.component.scss | 4 -- .../bulletin-board-list.component.scss | 4 -- .../bulletin-board/bulletin-board.component.html | 2 +- .../pages/cluster/feature/cluster.component.html | 2 +- .../cluster-node-detail-dialog.component.html | 2 +- .../counter-listing/counter-listing.component.html | 2 +- .../app/pages/error/feature/error.component.html | 4 +- ...ow-configuration-history-listing.component.html | 2 +- .../change-color-dialog.component.html | 2 +- .../change-color-dialog.component.scss | 9 --- .../navigation-control.component.html | 2 +- .../navigation-control.component.scss | 5 -- .../operation-control.component.html | 2 +- .../operation-control.component.scss | 5 -- .../header/flow-status/flow-status.component.scss | 1 - .../new-canvas-item/new-canvas-item.component.html | 4 +- .../new-canvas-item/new-canvas-item.component.scss | 2 - .../ui/canvas/header/search/search.component.html | 2 +- .../ui/canvas/header/search/search.component.scss | 2 - .../import-from-registry.component.scss| 4 -- .../save-version-dialog.component.scss | 4 -- .../create-process-group.component.scss| 4 -- .../edit-processor/edit-processor.component.html | 2 +- .../no-registry-clients-dialog.component.html | 2 +- .../controller-services.component.html | 2 +- .../manage-remote-ports.component.html | 2 +- .../app/pages/login/feature/login.component.html | 2 +- .../edit-parameter-context.component.html | 2 +- .../parameter-context-listing.component.html | 2 +- .../provenance-event-listing.component.html| 2 +- .../provenance-event-table.component.html | 2 +- .../flowfile-dialog/flowfile-dialog.component.html | 6 +- .../flowfile-dialog/flowfile-dialog.component.scss | 5 -- .../ui/queue-listing/queue-listing.component.html | 2 +- .../feature/route-not-found.component.html | 2 +- .../edit-flow-analysis-rule.component.html | 2 +- .../flow-analysis-rules.component.html | 2 +- .../management-controller-services.component.html | 2 +- .../edit-parameter-provider.component.html | 2 +- .../parameter-providers.component.html | 2 +- .../edit-registry-client.component.html| 2 +- .../registry-clients.component.html| 2 +- .../edit-reporting-task.component.html | 2 +- .../reporting-tasks/reporting-tasks.component.html | 2 +- .../cluster-summary-dialog.component.html | 2 +- .../port-status-table.component.html | 2 +- .../connection-status-table.component.html | 2 +- .../process-group-status-table.component.html | 2 +- .../processor-status-table.component.html | 4 +- .../processor-status-table.component.scss | 7 +-- ...emote-process-group-status-table.component.html | 2 +- .../ui/user-listing/user-listing.component.html| 2 +- .../about-dialog/about-dialog.component.html | 6 +- .../cancel-dialog/cancel-dialog.component.html | 2 +- .../component-context.component.html | 2 +- .../context-menu/context-menu.component.html | 8 ++- .../context-menu/context-menu.component.scss | 18 ++ .../disable-controller-service.component.html | 6 +- .../edit-controller-service.component.html | 2 +- .../enable-controller-service.component.html | 6 +- .../edit-parameter-dialog.component.scss | 4 -- .../edit-tenant/edit-tenant-dialog.component.scss | 4 -- .../extension
(nifi) branch main updated: [NIFI-13353] improve anchor tag hover state styles in dark mode (#8920)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3ef85e3347 [NIFI-13353] improve anchor tag hover state styles in dark
mode (#8920)
3ef85e3347 is described below
commit 3ef85e3347f89056435ed77a729bd8856cd5e15f
Author: Scott Aslan
AuthorDate: Tue Jun 4 09:56:21 2024 -0500
[NIFI-13353] improve anchor tag hover state styles in dark mode (#8920)
This closes #8920
---
.../src/main/nifi/apps/nifi/src/assets/styles/_app.scss| 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_app.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_app.scss
index 1b54543f51..d1ba78f779 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_app.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/styles/_app.scss
@@ -294,7 +294,11 @@
}
a:hover {
-text-decoration-color: $material-theme-primary-palette-darker;
+text-decoration-color: if(
+$is-dark,
+$material-theme-primary-palette-default,
+$material-theme-primary-palette-darker
+);
}
.has-errors,
@@ -316,7 +320,6 @@
$material-theme-accent-palette-darker,
$material-theme-accent-palette-lighter
)};
-//font-family: mat.get-theme-typography($material-theme, body-1,
font-family);
}
.mat-h2,
(nifi) branch main updated (5e3f1dbaf6 -> 210e0b1655)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 5e3f1dbaf6 Update BinFiles not to write attributes to FlowFiles for auto-terminated ORIGINAL relationship add 210e0b1655 NIFI-13350: (#8912) No new revisions were added by this update. Summary of changes: .../manager/process-group-manager.service.ts | 15 -- .../controller-services.effects.ts | 5 .../pages/flow-designer/state/flow/flow.effects.ts | 5 .../parameter-context-listing.effects.ts | 32 ++ .../edit-parameter-context.component.ts| 3 +- .../nifi/src/app/service/nifi-common.service.ts| 6 ++-- 6 files changed, 60 insertions(+), 6 deletions(-)
(nifi) branch main updated (34c24f759a -> f9aefc2d5e)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 34c24f759a NIFI-13342 restored sts dependency in aws service api add f9aefc2d5e NIFI-11078: Adds Component UUID to Flow Configuration History Table (#8909) No new revisions were added by this update. Summary of changes: .../flow-configuration-history-table.component.html | 15 ++- .../flow-configuration-history-table.component.ts | 17 +++-- .../src/main/webapp/js/nf/history/nf-history-table.js | 8 3 files changed, 37 insertions(+), 3 deletions(-)
(nifi) branch main updated: [NIFI-13325] update dark mode theme density to match light mode (#8904)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 30a44464f7 [NIFI-13325] update dark mode theme density to match light mode (#8904) 30a44464f7 is described below commit 30a44464f709ea68b39897f930e20a3feb382073 Author: Scott Aslan AuthorDate: Mon Jun 3 08:14:57 2024 -0400 [NIFI-13325] update dark mode theme density to match light mode (#8904) * [NIFI-13325] update dark mode theme density to match light mode * remove density from nifi themes as only colors are used from this theme This closes #8904 --- .../src/main/nifi/apps/nifi/src/assets/themes/material.scss | 2 +- .../src/main/nifi/apps/nifi/src/assets/themes/nifi.scss | 6 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss index a87c77e4d5..c07460535f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/material.scss @@ -164,6 +164,6 @@ $material-theme-dark: mat.define-dark-theme( warn: $warn-dark ), typography: $typography-config, -density: 0 +density: -3 ) ); diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss index 829f6965c0..8b243eb13d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/assets/themes/nifi.scss @@ -116,8 +116,7 @@ $nifi-theme-light: mat.define-light-theme( primary: $surface-light-palette, accent: $success-light-palette, warn: $caution-light-palette -), -density: -3 +) ) ); @@ -133,7 +132,6 @@ $nifi-theme-dark: mat.define-dark-theme( primary: $surface-dark-palette, accent: $success-dark-palette, warn: $caution-dark-palette -), -density: -3 +) ) );
(nifi) branch main updated (e66c1643d1 -> 983f209083)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from e66c1643d1 [NIFI-13246] move actions from details columns into menu (#8900) add 983f209083 NIFI-13321: (#8901) No new revisions were added by this update. Summary of changes: .../feature/access-policies.component.spec.ts | 19 ++ .../bulletins/feature/bulletins.component.spec.ts | 18 ++ .../cluster/feature/cluster.component.spec.ts | 18 +- .../counters/feature/counters.component.spec.ts| 21 +-- .../pages/error/feature/error.component.spec.ts| 21 +-- .../flow-configuration-history.component.spec.ts | 20 +-- .../ui/canvas/canvas.component.spec.ts | 42 ++ .../graph-controls.component.spec.ts | 31 .../graph-controls/graph-controls.component.ts | 2 -- .../navigation-control.component.spec.ts | 26 +- .../flow-status/flow-status.component.spec.ts | 20 +-- .../ui/canvas/header/header.component.spec.ts | 31 ++-- .../edit-processor.component.spec.ts | 24 ++--- .../controller-services.component.spec.ts | 20 +-- .../manage-remote-ports.component.spec.ts | 17 - .../feature/parameter-contexts.component.spec.ts | 24 + .../feature/provenance.component.spec.ts | 20 +-- .../provenance-event-table.component.spec.ts | 19 ++ .../pages/queue/feature/queue.component.spec.ts| 19 ++ .../flowfile-table.component.spec.ts | 19 ++ .../settings/feature/settings.component.spec.ts| 20 +-- .../edit-flow-analysis-rule.component.spec.ts | 17 ++--- .../edit-registry-client.component.spec.ts | 17 ++--- .../edit-reporting-task.component.spec.ts | 17 ++--- .../summary/feature/summary.component.spec.ts | 20 +-- .../pages/users/feature/users.component.spec.ts| 23 ++-- .../advanced-ui/advanced-ui.component.spec.ts | 12 ++- .../edit-controller-service.component.spec.ts | 17 ++--- .../edit-tenant-dialog.component.spec.ts | 17 ++--- .../src/main/nifi/package-lock.json| 16 + .../nifi-web-frontend/src/main/nifi/package.json | 1 + 31 files changed, 229 insertions(+), 379 deletions(-)
(nifi) branch main updated: NIFI-13289 add tooltips to NewCanvasItem (#8870)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new e3cf0a67bc NIFI-13289 add tooltips to NewCanvasItem (#8870)
e3cf0a67bc is described below
commit e3cf0a67bc9781ecd14dc49ed0c019ab328fce5c
Author: Shane <8338013+ze...@users.noreply.github.com>
AuthorDate: Wed May 29 19:34:26 2024 -0400
NIFI-13289 add tooltips to NewCanvasItem (#8870)
This closes #8870
---
.../ui/canvas/header/header.component.html | 24 ++
.../new-canvas-item/new-canvas-item.component.html | 9 +++-
.../new-canvas-item/new-canvas-item.component.ts | 16 ++-
.../ui/common/tooltips/nifi-tooltip.directive.ts | 19 +
4 files changed, 58 insertions(+), 10 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.html
index 6f037531fd..d77493993a 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.html
@@ -22,42 +22,50 @@
[type]="ComponentType.Processor"
[disabled]="!canvasPermissions.canWrite"
iconClass="icon-processor"
-iconHoverClass="icon-processor-add">
+iconHoverClass="icon-processor-add"
+tooltip="Processor">
+iconHoverClass="icon-port-in-add"
+tooltip="Input Port">
+iconHoverClass="icon-port-out-add"
+tooltip="Output Port">
+iconHoverClass="icon-group-add"
+tooltip="Process Group">
+iconHoverClass="icon-group-remote-add"
+tooltip="Remote Process Group">
+iconHoverClass="icon-funnel-add"
+tooltip="Funnel">
+iconHoverClass="icon-import-from-registry-add"
+tooltip="Import from Registry">
+iconHoverClass="icon-label-add"
+tooltip="Label">
}
-
+
implements OnDestroy {
@Input() tooltipComponentType!: Type;
+@Input() tooltipDisabled = false;
@Input() tooltipInputData: any;
@Input() position: ConnectedPosition | undefined;
@Input() delayClose = true;
@@ -58,11 +59,29 @@ export class NifiTooltipDirective implements OnDestroy {
}
}
+@HostListener('mousemove')
+mouseMove() {
+if (this.overlayRef?.hasAttached() && this.tooltipDisabled) {
+this.overlayRef?.detach();
+}
+}
+
+@HostListener('mouseup')
+mouseup() {
+if (!this.overlayRef?.hasAttached()) {
+this.attach();
+}
+}
+
ngOnDestroy(): void {
this.overlayRef?.dispose();
}
private attach(): void {
+if (this.tooltipDisabled) {
+return;
+}
+
if (!this.overlayRef) {
const positionStrategy = this.getPositionStrategy();
this.overlayRef = this.overlay.create({ positionStrategy });
(nifi) branch main updated: NIFI-13299: (#8894)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 2cd4624825 NIFI-13299: (#8894)
2cd4624825 is described below
commit 2cd462482567e6be13cbee71b80d942933f0b68f
Author: Matt Gilman
AuthorDate: Wed May 29 16:23:15 2024 -0400
NIFI-13299: (#8894)
- Adding min validators where appropriate.
This closes #8894
---
.../create-connection.component.html | 60 +++---
.../create-connection.component.ts | 5 +-
.../edit-connection/edit-connection.component.html | 3 +-
.../edit-connection/edit-connection.component.ts | 5 +-
.../edit-processor/edit-processor.component.html | 3 +-
.../edit-processor/edit-processor.component.ts | 50 +++---
.../relationship-settings.component.html | 5 +-
7 files changed, 113 insertions(+), 18 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.html
index 2626d70b1c..f06a5111f4 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.html
@@ -100,20 +100,45 @@
-FlowFile Expiration
+
+FlowFile Expiration
+
+
-Back Pressure Object
Threshold
-
+
+Back Pressure Object Threshold
+
+
+
-Size Threshold
+
+Size Threshold
+
+
@@ -121,7 +146,14 @@
-Load Balance
Strategy
+
+Load Balance Strategy
+
+
@@ -141,7 +173,14 @@
@if (loadBalancePartitionAttributeRequired) {
-Attribute
Name
+
+Attribute Name
+
+
@@ -150,7 +189,14 @@
@if (loadBalanceCompressionRequired) {
-Load Balance
Compression
+
+Load Balance Compression
+
+
@for (option of
loadBalanceCompressionStrategies; track option) {
+tooltipInputData="The maximum
number of ob
(nifi) branch main updated: NIFI-13284: (#8891)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 0660616864 NIFI-13284: (#8891)
0660616864 is described below
commit 0660616864df27a238363036cc2a20414c39fb3b
Author: Matt Gilman
AuthorDate: Wed May 29 14:36:49 2024 -0400
NIFI-13284: (#8891)
- Only saving canvas routes that are not edit or history.
This closes #8891
---
.../nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
index b38327ffa6..bae0940872 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
@@ -102,7 +102,9 @@ export class Canvas implements OnInit, OnDestroy {
.select(selectUrl)
.pipe(takeUntilDestroyed())
.subscribe((route) => {
-this.storage.setItem('current-canvas-route', route);
+if (!route.endsWith('/edit') && !route.endsWith('/history')) {
+this.storage.setItem('current-canvas-route', route);
+}
});
// load the process group from the route
(nifi) branch main updated: NIFI-13285: If there is no transform to restore for the current viewport, executing a zoom fit (#8874)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ffa5e8473d NIFI-13285: If there is no transform to restore for the
current viewport, executing a zoom fit (#8874)
ffa5e8473d is described below
commit ffa5e8473d568cc31fc3cf9261b81a316c2bb64d
Author: Matt Gilman
AuthorDate: Tue May 28 20:29:04 2024 -0400
NIFI-13285: If there is no transform to restore for the current viewport,
executing a zoom fit (#8874)
* NIFI-13285:
- If there is no transform to restore for the current viewport, executing a
zoom fit.
* NIFI-13285:
- Adjusting the canvas position styles and zoom fit calculations.
This closes #8874
---
.../flow-designer/service/canvas-view.service.ts | 19 ++-
.../state/transform/transform.actions.ts | 2 +-
.../state/transform/transform.effects.ts | 9 +++--
.../flow-designer/ui/canvas/canvas.component.scss | 6 +++---
.../navigation-control.component.ts | 2 +-
5 files changed, 22 insertions(+), 16 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
index 4488516e08..ea4e211101 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
@@ -609,7 +609,7 @@ export class CanvasView {
/**
* Zooms to fit the entire graph on the canvas.
*/
-public fit(): void {
+public fit(allowTransition: boolean): void {
const translate = [this.x, this.y];
const scale: number = this.k;
let newScale: number;
@@ -617,8 +617,8 @@ export class CanvasView {
// get the canvas normalized width and height
const canvasContainer: any =
document.getElementById('canvas-container');
const canvasBoundingBox: any = canvasContainer.getBoundingClientRect();
-const canvasWidth = canvasBoundingBox.width;
-const canvasHeight = canvasBoundingBox.height;
+const canvasWidth = canvasBoundingBox.width - 50;
+const canvasHeight = canvasBoundingBox.height - 50;
// get the bounding box for the graph
const graph: any = d3.select('#canvas');
@@ -627,6 +627,8 @@ export class CanvasView {
const graphHeight: number = graphBox.height / scale;
let graphLeft: number = graphBox.left / scale;
let graphTop: number = (graphBox.top - canvasBoundingBox.top) / scale;
+const x = translate[0] / scale;
+const y = translate[1] / scale;
// adjust the scale to ensure the entire graph is visible
if (graphWidth > canvasWidth || graphHeight > canvasHeight) {
@@ -637,15 +639,14 @@ export class CanvasView {
} else {
newScale = 1;
-// since the entire graph will fit on the canvas, offset origin
appropriately
-graphLeft -= 100;
-graphTop -= 50;
+graphLeft -= (canvasWidth - graphWidth) / 2;
+graphTop -= (canvasHeight - graphHeight) / 2;
}
-this.allowTransition = true;
+this.allowTransition = allowTransition;
this.centerBoundingBox({
-x: graphLeft - translate[0] / scale,
-y: graphTop - translate[1] / scale,
+x: graphLeft - x,
+y: graphTop - y,
width: canvasWidth / newScale,
height: canvasHeight / newScale,
scale: newScale
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.actions.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.actions.ts
index d211ad5f94..d8c851310d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.actions.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.actions.ts
@@ -33,6 +33,6 @@ export const zoomIn = createAction('[Transform] Zoom In');
export const zoomOut = createAction('[Transform] Zoom Out');
-export const zoomFit = createAction('[Transform] Zoom Fit');
+export const zoomFit = createAction('[Transform] Zoom Fit', props<{
transition: boolean }>());
export const zoomActual =
(nifi) branch main updated (e1920dace0 -> 90dee66101)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from e1920dace0 NIFI-13270: (#8877) - Persisting the select tab index add 90dee66101 NIFI-13286: (#8872) - Conditionally reloading the child PG or current PG when emptying all queues based on the context of the request. No new revisions were added by this update. Summary of changes: .../flow-designer/state/queue/queue.effects.ts | 34 +++--- 1 file changed, 23 insertions(+), 11 deletions(-)
(nifi) branch main updated (fa8dc4f1a0 -> e1920dace0)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from fa8dc4f1a0 NIFI-13295 Removed Apache Knox SSO Authentication This
closes #8876
add e1920dace0 NIFI-13270: (#8877) - Persisting the select tab index
No new revisions were added by this update.
Summary of changes:
.../edit-connection/edit-connection.component.html | 2 +-
.../edit-connection/edit-connection.component.ts | 7 ++---
.../edit-process-group.component.html | 2 +-
.../edit-process-group.component.ts| 7 ++---
.../edit-processor/edit-processor.component.html | 2 +-
.../edit-processor/edit-processor.component.ts | 7 ++---
.../edit-parameter-context.component.html | 2 +-
.../edit-parameter-context.component.ts| 7 ++---
.../flowfile-dialog/flowfile-dialog.component.html | 2 +-
.../flowfile-dialog/flowfile-dialog.component.ts | 6 ++---
.../edit-flow-analysis-rule.component.html | 2 +-
.../edit-flow-analysis-rule.component.ts | 7 ++---
.../edit-parameter-provider.component.html | 2 +-
.../edit-parameter-provider.component.ts | 7 ++---
.../edit-registry-client.component.html| 2 +-
.../edit-registry-client.component.ts | 7 ++---
.../edit-reporting-task.component.html | 2 +-
.../edit-reporting-task.component.ts | 7 ++---
.../edit-controller-service.component.html | 2 +-
.../edit-controller-service.component.ts | 7 ++---
.../provenance-event-dialog.component.html | 2 +-
.../provenance-event-dialog.component.ts | 6 ++---
.../system-diagnostics-dialog.component.html | 2 +-
.../system-diagnostics-dialog.component.ts | 6 ++---
.../tabbed-dialog.component.ts}| 31 --
25 files changed, 74 insertions(+), 62 deletions(-)
copy
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/{ok-dialog/ok-dialog.component.ts
=> tabbed-dialog/tabbed-dialog.component.ts} (55%)
(nifi) branch main updated (a963c2ce45 -> a971f94015)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from a963c2ce45 [NIFI-13276] improve property editor to handle large amounts of text (#8866) add a971f94015 NIFI-13278: (#8862) No new revisions were added by this update. Summary of changes: .../nifi-framework/nifi-web/nifi-web-frontend/pom.xml | 7 +++ 1 file changed, 7 insertions(+)
(nifi) branch main updated (ac023db555 -> a963c2ce45)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from ac023db555 [NIFI-13280] hide flash of textarea when opening nf-editor (#8865) add a963c2ce45 [NIFI-13276] improve property editor to handle large amounts of text (#8866) No new revisions were added by this update. Summary of changes: .../editors/nf-editor/nf-editor.component.html | 2 +- .../editors/nf-editor/nf-editor.component.scss | 45 +- .../editors/nf-editor/nf-editor.component.ts | 19 +++-- .../property-table/property-table.component.ts | 2 +- .../nifi/src/assets/styles/_codemirror-theme.scss | 5 +++ 5 files changed, 25 insertions(+), 48 deletions(-)
(nifi) branch main updated: [NIFI-13280] hide flash of textarea when opening nf-editor (#8865)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ac023db555 [NIFI-13280] hide flash of textarea when opening nf-editor
(#8865)
ac023db555 is described below
commit ac023db555f8845d7414fdda37e39a96ceb4ded8
Author: Scott Aslan
AuthorDate: Wed May 22 11:07:40 2024 -0400
[NIFI-13280] hide flash of textarea when opening nf-editor (#8865)
This closes #8865
---
.../src/main/nifi/src/assets/styles/_codemirror-theme.scss| 4
1 file changed, 4 insertions(+)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_codemirror-theme.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_codemirror-theme.scss
index 2f76db66fd..abe97a1150 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_codemirror-theme.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_codemirror-theme.scss
@@ -47,6 +47,10 @@
lighter-contrast
);
+.ngx-codemirror {
+display: none;
+}
+
.cm-s-nifi.CodeMirror {
@extend .surface-contrast;
background-color: if($is-dark, $nifi-theme-surface-palette-darker,
$nifi-theme-surface-palette-lighter);
(nifi) branch main updated (f625d4c6c1 -> 3467f6d1d5)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from f625d4c6c1 [NIFI-13277] - Make the main menu more compact in terms of spacing. (#8861) add 3467f6d1d5 [NIFI-13257] codemirror light and dark mode theme (#8855) No new revisions were added by this update. Summary of changes: .../nf-editor/_nf-editor.component-theme.scss | 74 +-- .../editors/nf-editor/nf-editor.component.ts | 1 + .../nifi/src/assets/styles/_codemirror-theme.scss | 227 + .../src/main/nifi/src/styles.scss | 4 + 4 files changed, 233 insertions(+), 73 deletions(-) create mode 100644 nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_codemirror-theme.scss
(nifi) branch main updated (3f9ef07e3c -> 3a78575b9a)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 3f9ef07e3c NIFI-13227 Upgraded Spring and various dependencies
add 3a78575b9a NIFI-12968: Simplify login sequence (#8843)
No new revisions were added by this update.
Summary of changes:
.../org/apache/nifi/web/filter/LoginFilter.java| 87 ---
.../org/apache/nifi/web/filter/LogoutFilter.java | 91
.../src/main/nifi/src/app/app-routing.module.ts| 5 +
.../src/main/nifi/src/app/app.module.ts| 28 +---
.../src/app/pages/error/feature/error.component.ts | 9 +-
.../change-color-dialog.component.html | 4 +-
.../ui/canvas/header/header.component.spec.ts | 6 +
.../label/edit-label/edit-label.component.spec.ts | 6 +-
.../port/create-port/create-port.component.spec.ts | 11 +-
.../port/edit-port/edit-port.component.spec.ts | 6 +-
.../create-process-group.component.spec.ts | 11 +-
.../create-processor.component.spec.ts | 11 +-
.../create-remote-process-group.component.spec.ts | 11 +-
.../app/pages/login/feature/login.component.html | 40 ++---
.../src/app/pages/login/feature/login.component.ts | 29 +++-
.../src/app/pages/login/feature/login.module.ts| 2 +
.../app/pages/login/state/access/access.actions.ts | 17 +--
.../app/pages/login/state/access/access.effects.ts | 113 --
.../app/pages/login/state/access/access.reducer.ts | 35 +
.../pages/login/state/access/access.selectors.ts | 4 +-
.../nifi/src/app/pages/login/state/access/index.ts | 25 +---
.../login/ui/login-form/login-form.component.html | 4 +-
.../ui/login-form/login-form.component.spec.ts | 9 +-
.../login/ui/login-form/login-form.component.ts| 32 ++--
.../feature/route-not-found.component.spec.ts | 12 +-
.../user-access-policies.component.spec.ts | 10 +-
.../user-table/user-table.component.spec.ts| 3 +-
.../src/app/service/auth-storage.service.spec.ts | 33 -
.../nifi/src/app/service/auth-storage.service.ts | 75 --
.../src/main/nifi/src/app/service/auth.service.ts | 82 +--
.../nifi/src/app/service/error-helper.service.ts | 5 +-
.../src/app/service/guard/authentication.guard.ts | 164 +
...ation.guard.ts => login-configuration.guard.ts} | 38 ++---
.../service/interceptors/auth.interceptor.spec.ts | 41 --
.../app/service/interceptors/auth.interceptor.ts | 103 +++--
.../interceptors/loading.interceptor.spec.ts | 33 -
.../service/interceptors/loading.interceptor.ts| 22 +--
.../interceptors/polling.interceptor.spec.ts | 37 -
.../service/interceptors/polling.interceptor.ts| 37 ++---
.../app/state/current-user/current-user.actions.ts | 8 +
.../app/state/current-user/current-user.effects.ts | 51 ++-
.../app/state/current-user/current-user.reducer.ts | 6 +-
.../state/current-user/current-user.selectors.ts | 7 +-
.../main/nifi/src/app/state/current-user/index.ts | 1 +
.../main/nifi/src/app/state/error/error.actions.ts | 5 +
.../main/nifi/src/app/state/error/error.reducer.ts | 15 +-
.../nifi/src/app/state/error/error.selectors.ts| 5 +
.../src/main/nifi/src/app/state/error/index.ts | 1 +
.../src/main/nifi/src/app/state/index.ts | 4 +
.../state/{about => login-configuration}/index.ts | 25 ++--
.../login-configuration.actions.ts}| 10 +-
.../login-configuration.effects.ts}| 18 +--
.../login-configuration.reducer.ts}| 16 +-
.../login-configuration.selectors.ts} | 22 +--
.../advanced-ui/advanced-ui.component.spec.ts | 6 +
.../extension-creation.component.spec.ts | 9 +-
.../ui/common/navigation/navigation.component.html | 6 +-
.../common/navigation/navigation.component.spec.ts | 6 +
.../ui/common/navigation/navigation.component.ts | 25 ++--
.../page-content/page-content.component.html | 4 +-
.../page-content/page-content.component.spec.ts| 12 +-
.../common/page-content/page-content.component.ts | 22 +--
.../status-history.component.spec.ts | 11 +-
.../system-diagnostics-dialog.component.spec.ts| 9 +-
.../src/main/webapp/WEB-INF/web.xml| 41 --
65 files changed, 598 insertions(+), 1038 deletions(-)
delete mode 100644
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/java/org/apache/nifi/web/filter/LoginFilter.java
delete mode 100644
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/java/org/apache/nifi/web/filter/LogoutFilter.java
delete mode 100644
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/auth-storage.service.spec.ts
delete mode 100644
nifi-framework-bundl
(nifi) branch main updated: [NIFI-13212] handle canvas overflow on shorter screens (#8810)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 74731b5a59 [NIFI-13212] handle canvas overflow on shorter screens
(#8810)
74731b5a59 is described below
commit 74731b5a596a1df295e4cb5a3ec0ffa5521fb134
Author: Scott Aslan
AuthorDate: Fri May 10 17:49:46 2024 -0400
[NIFI-13212] handle canvas overflow on shorter screens (#8810)
* [NIFI-13212] handle canvas overflow on shorter screens
* add z-index to drag/drop new canvas items
This closes #8810
---
.../app/pages/flow-designer/ui/canvas/canvas.component.html| 10 --
.../app/pages/flow-designer/ui/canvas/canvas.component.scss| 7 ++-
.../ui/canvas/footer/_footer.component-theme.scss | 5 +
.../ui/canvas/graph-controls/graph-controls.component.scss | 2 +-
.../header/new-canvas-item/new-canvas-item.component.scss | 1 +
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.html
index 85fb83e8ab..2df323691e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.html
@@ -15,15 +15,13 @@
~ limitations under the License.
-->
-
+
-
+
+
+
-
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.scss
index e4ed4efaba..064d18477c 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.scss
@@ -16,6 +16,11 @@
*/
.canvas-background {
+position: absolute;
+top: 98px;
+left: 0;
+bottom: 0;
+right: 0;
background-size: 14px 14px;
z-index: 1;
overflow: hidden;
@@ -25,7 +30,7 @@
:host ::ng-deep svg.canvas-svg {
width: 100%;
-height: 100%;
+height: calc(100% - 33px);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/footer/_footer.component-theme.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/footer/_footer.component-theme.scss
index 7300b9b2f6..a914896c6d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/footer/_footer.component-theme.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/footer/_footer.component-theme.scss
@@ -28,6 +28,11 @@
// Get hues from palette
.breadcrumb-container {
+position: absolute;
+bottom: 0;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
+height: 33px;
+width: 100%;
+background-color: var(--mat-app-background-color);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.scss
index 86ecc2d822..e400df89e1 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.scss
@@ -18,6 +18,6 @@
div.graph-controls {
position: absolute;
left: 0;
-top: 110px;
+top: 22px;
z-index: 2;
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/
(nifi) branch main updated (c09144051f -> 6b48e61295)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from c09144051f NIFI-13206 Updated S3 Integration Tests to delete bucket encryption add 6b48e61295 [NIFI-13177] ensure consistent typography rendering (#8786) No new revisions were added by this update. Summary of changes: .../component-access-policies.component.html | 22 -- .../component-access-policies.component.scss | 14 - .../component-access-policies.component.ts | 20 ++--- .../component-access-policies.module.ts| 4 ++- .../operation-control.component.html | 18 +++ .../operation-control.component.scss | 28 - .../operation-control.component.ts | 26 .../controller-services.component.scss | 4 --- .../manage-remote-ports.component.scss | 4 --- .../management-controller-services.component.scss | 4 --- .../nifi/src/app/pipes/component-type-name.pipe.ts | 4 +-- .../component-context.component.html | 12 .../component-context.component.scss | 25 .../component-context.component.ts | 13 .../property-table/property-table.component.html | 8 +++-- .../src/main/nifi/src/assets/styles/_app.scss | 35 ++ 16 files changed, 94 insertions(+), 147 deletions(-)
(nifi) branch main updated (87776e369e -> dcf66fd105)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 87776e369e NIFI-13171 Removed nifi-kafka-connector in nifi-external module add dcf66fd105 NIFI-13204: (#8798) No new revisions were added by this update. Summary of changes: .../service/canvas-context-menu.service.ts | 50 +++--- .../pages/flow-designer/service/flow.service.ts| 19 +++ .../pages/flow-designer/state/flow/flow.actions.ts | 18 +++ .../pages/flow-designer/state/flow/flow.effects.ts | 60 ++ .../app/pages/flow-designer/state/flow/index.ts| 6 +++ 5 files changed, 121 insertions(+), 32 deletions(-)
(nifi) branch main updated: NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 326df914bc NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779) 326df914bc is described below commit 326df914bc1169267e88d3286ef27551d56d05aa Author: Matt Gilman AuthorDate: Thu May 9 14:41:06 2024 -0400 NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779) * NIFI-13175: - Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes. Now the dialog content is set to 50vh and content scrolls as needed. * NIFI-13175: - Removing some unneeded padding. * NIFI-13175: - Fixing double scroll bar issues in non tabbed dialogs. * NIFI-13175: - Fixing double scroll bar issues in more non tabbed dialogs. * NIFI-13175: - Renaming dialog content style in status history to avoid conflicting with new general style. This closes #8779 --- .../action-details/action-details.component.scss | 11 +- .../create-connection.component.html | 22 +- .../create-connection.component.scss | 10 - .../edit-connection/edit-connection.component.html | 22 +- .../edit-connection/edit-connection.component.scss | 10 - .../change-version-dialog.html | 6 +- .../local-changes-dialog/local-changes-dialog.html | 2 +- .../local-changes-table/local-changes-table.html | 4 +- .../label/edit-label/edit-label.component.html | 2 +- .../edit-process-group.component.html | 22 +- .../edit-process-group.component.scss | 10 - .../edit-processor/edit-processor.component.html | 48 +-- .../edit-processor/edit-processor.component.scss | 10 - .../create-remote-process-group.component.html | 2 +- .../edit-remote-process-group.component.html | 6 +- .../edit-parameter-context.component.html | 32 +- .../edit-parameter-context.component.scss | 15 - .../parameter-table/parameter-table.component.html | 6 +- .../flowfile-dialog/flowfile-dialog.component.html | 70 ++-- .../flowfile-dialog/flowfile-dialog.component.scss | 17 +- .../edit-flow-analysis-rule.component.html | 32 +- .../edit-flow-analysis-rule.component.scss | 10 - .../edit-parameter-provider.component.html | 35 +- .../edit-parameter-provider.component.scss | 10 - ...ch-parameter-provider-parameters.component.html | 2 +- ...ch-parameter-provider-parameters.component.scss | 10 - .../edit-registry-client.component.html| 24 +- .../edit-registry-client.component.scss| 10 - .../edit-reporting-task.component.html | 32 +- .../edit-reporting-task.component.scss | 10 - .../cluster-summary-dialog.component.html | 6 +- .../cluster-summary-dialog.component.scss | 17 +- .../connection-cluster-table.component.html| 4 +- .../port-cluster-table.component.html | 4 +- .../process-group-cluster-table.component.html | 4 +- .../processor-cluster-table.component.html | 4 +- ...mote-process-group-cluster-table.component.html | 4 +- .../user-access-policies.component.html| 6 +- .../component-state/component-state.component.html | 80 +++-- .../disable-controller-service.component.scss | 5 - .../edit-controller-service.component.html | 32 +- .../edit-controller-service.component.scss | 10 - .../enable-controller-service.component.scss | 5 - .../extension-creation.component.html | 144 .../property-table/property-table.component.html | 6 +- .../provenance-event-dialog.component.html | 81 +++-- .../provenance-event-dialog.component.scss | 15 +- .../status-history-chart.component.ts | 4 +- .../status-history/status-history.component.html | 2 +- .../system-diagnostics-dialog.component.html | 398 +++-- .../system-diagnostics-dialog.component.scss | 9 +- .../src/main/nifi/src/assets/styles/_app.scss | 9 + 52 files changed, 618 insertions(+), 733 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss index e54ff14552..41941962bd 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app
(nifi) branch main updated (a840c14c84 -> a61bf2afc2)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from a840c14c84 [NIFI-13158] - Fix: need to prevent/diable keyboard hotkeys when a dialog is open or when typeing in the search bar. (#8781) add a61bf2afc2 [NIFI-13183] add drop shadow to connections to increase visibility on… (#8778) No new revisions were added by this update. Summary of changes: .../flow-designer/ui/canvas/_canvas.component-theme.scss| 13 - 1 file changed, 8 insertions(+), 5 deletions(-)
(nifi) branch main updated: [NIFI-13165] hide resize handle is status history when insufficient h… (#8768)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new fc8f072e0a [NIFI-13165] hide resize handle is status history when
insufficient h… (#8768)
fc8f072e0a is described below
commit fc8f072e0a87c5fc627050f39089c58c4e9b11b2
Author: Scott Aslan
AuthorDate: Wed May 8 14:08:22 2024 -0400
[NIFI-13165] hide resize handle is status history when insufficient h…
(#8768)
* [NIFI-13165] hide resize handle is status history when insufficient
history
* hide last updated/refresh button when insufficient history
* Update
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
Co-authored-by: Rob Fellows
-
Co-authored-by: Rob Fellows
This closes #8768
---
.../app/ui/common/resizable/resizable.component.html | 18 ++
.../app/ui/common/resizable/resizable.component.scss | 1 +
.../src/app/ui/common/resizable/resizable.component.ts | 1 +
.../status-history/status-history.component.html | 10 --
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
index dfa2a33325..42cd51b7e1 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
@@ -16,12 +16,14 @@
-->
-
-@if (sub$ | async) {
-
+@if (!resizeDisabled) {
+
+@if (sub$ | async) {
+
+}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
index 3ac2025b19..65b66b11b2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
@@ -24,6 +24,7 @@ $handle-size: 15px;
}
.resizable-handle {
+background: unset;
position: absolute;
width: $handle-size;
height: $handle-size;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
index 76ba77693c..cdbb9c709b 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
@@ -33,6 +33,7 @@ export class Resizable {
@Output() resized = new EventEmitter();
@Input() minHeight = 0;
@Input() minWidth = 0;
+@Input() resizeDisabled = false;
private startSize$ = new Subject();
private dragMove$ = new Subject();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
index e86b03d2da..82c9a6e982 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
@@ -14,7 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
@if (statusHistoryState$ | async; as statusHistoryState) {
Status History
@@ -164,7 +170,7 @@
-@if (instances.length > 0) {
+@if (instances.length > 0 && fieldDescriptors.length >
0) {
(nifi) branch main updated (0f39428209 -> 43aca6597e)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0f39428209 [NIFI-13158] support for keyboard shortcuts (#8770) add 43aca6597e [NIFI-13117] update label resize handle to match other resize handles and replace comments indicator with icon (#8774) No new revisions were added by this update. Summary of changes: .../service/manager/label-manager.service.ts | 11 .../service/manager/port-manager.service.ts| 24 + .../manager/process-group-manager.service.ts | 20 --- .../service/manager/processor-manager.service.ts | 20 --- .../remote-process-group-manager.service.ts| 30 -- .../ui/canvas/_canvas.component-theme.scss | 10 .../flow-designer/ui/canvas/canvas.component.scss | 12 - 7 files changed, 61 insertions(+), 66 deletions(-)
(nifi) branch main updated (eda98121ce -> 45098ed859)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from eda98121ce NIFI-13155: (#8771) add 45098ed859 [NIFI-13174] increase drag/drop preview hieght to not display scroll bar (#8769) No new revisions were added by this update. Summary of changes: .../ui/canvas/items/connection/prioritizers/prioritizers.component.scss | 2 +- .../parameter-context-inheritance.component.scss| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(nifi) branch main updated (0ab5e2f741 -> eda98121ce)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0ab5e2f741 NIFI-13179 Upgraded oauth2-oidc-sdk from 9.43.4 to 11.10.1 add eda98121ce NIFI-13155: (#8771) No new revisions were added by this update. Summary of changes: .../nifi-web-frontend/src/main/nifi/README.md | 4 +- .../pages/flow-designer/state/flow/flow.effects.ts | 13 +- .../pages/flow-designer/state/flow/flow.reducer.ts | 241 + .../app/pages/flow-designer/state/flow/index.ts| 4 + .../cluster-summary/cluster-summary.actions.ts | 2 + .../cluster-summary/cluster-summary.reducer.ts | 11 + .../cluster-summary/cluster-summary.selectors.ts | 5 + .../nifi/src/app/state/cluster-summary/index.ts| 1 + 8 files changed, 238 insertions(+), 43 deletions(-)
(nifi) branch main updated (030435d996 -> e7facda912)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 030435d996 NIFI-13149 Removed nifi-datadog-bundle add e7facda912 NIFI-13141: (#8752) - Adding a dragging flag to not reset positioning for labels and connection bends if the user is currently performing an action. No new revisions were added by this update. Summary of changes: .../service/manager/connection-manager.service.ts | 347 - .../service/manager/label-manager.service.ts | 147 + .../source-processor.component.html| 2 +- 3 files changed, 294 insertions(+), 202 deletions(-)
(nifi) branch main updated: NIFI-13140: (#8743)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ab5025c652 NIFI-13140: (#8743)
ab5025c652 is described below
commit ab5025c652182a67730037b3d28bb75fbd363cde
Author: Matt Gilman
AuthorDate: Fri May 3 18:09:55 2024 -0400
NIFI-13140: (#8743)
- Cleaning up error handling in guards.
This closes #8743
---
.../nifi/src/app/service/error-helper.service.ts | 3 ++-
.../src/app/service/guard/authorization.guard.ts | 17 +--
.../app/service/guard/flow-configuration.guard.ts | 25 --
.../main/nifi/src/app/state/error/error.actions.ts | 5 -
.../main/nifi/src/app/state/error/error.effects.ts | 10 +++--
5 files changed, 47 insertions(+), 13 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/error-helper.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/error-helper.service.ts
index 1d6a9940ac..82b2c856e6 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/error-helper.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/error-helper.service.ts
@@ -25,7 +25,7 @@ import { NiFiCommon } from './nifi-common.service';
export class ErrorHelper {
constructor(private nifiCommon: NiFiCommon) {}
-fullScreenError(errorResponse: HttpErrorResponse): Action {
+fullScreenError(errorResponse: HttpErrorResponse, skipReplaceUrl?:
boolean): Action {
let title: string;
let message: string;
@@ -56,6 +56,7 @@ export class ErrorHelper {
}
return ErrorActions.fullScreenError({
+skipReplaceUrl,
errorDetail: {
title,
message
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts
index 3de1b625e5..ab8a1e8fa5 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts
@@ -21,6 +21,7 @@ import { map } from 'rxjs';
import { Store } from '@ngrx/store';
import { CurrentUser, CurrentUserState } from '../../state/current-user';
import { selectCurrentUser } from
'../../state/current-user/current-user.selectors';
+import { fullScreenError } from '../../state/error/error.actions';
export const authorizationGuard = (
authorizationCheck: (user: CurrentUser) => boolean,
@@ -36,8 +37,20 @@ export const authorizationGuard = (
return true;
}
-// TODO - replace with 403 error page
-return router.parseUrl(fallbackUrl || '/');
+if (fallbackUrl) {
+return router.parseUrl(fallbackUrl);
+}
+
+store.dispatch(
+fullScreenError({
+skipReplaceUrl: true,
+errorDetail: {
+title: 'Unable to load',
+message: 'Authorization check failed. Contact the
system administrator.'
+}
+})
+);
+return false;
})
);
};
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts
index 70439c0daa..8bd3afde19 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { CanMatchFn, Router } from '@angular/router';
+import { CanMatchFn } from '@angular/router';
import { inject } from '@angular/core';
import { catchError, map, of, switchMap, tap } from 'rxjs';
import { Store } from '@ngrx/store';
@@ -23,14 +23,17 @@ import { FlowConfiguration, FlowConfigurationState } from
'../../state/flow-conf
import { selectFlowConfiguration } from
'../../state/flow-configuration/flow-configuration.selectors';
import { FlowConfigurationService } from '../flow-configuration.service';
imp
(nifi) branch main updated: [NIFI-13132] show banner error in import flow dialog when registry is… (#8737)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3192bc85ef [NIFI-13132] show banner error in import flow dialog when
registry is… (#8737)
3192bc85ef is described below
commit 3192bc85ef212775753637bdba80496da8fa68f6
Author: Scott Aslan
AuthorDate: Fri May 3 16:31:43 2024 -0400
[NIFI-13132] show banner error in import flow dialog when registry is…
(#8737)
* [NIFI-13132] show banner error in import flow dialog when registry is
configured but unreachable
* address review comments
This closes #8737
---
.../pages/flow-designer/state/flow/flow.effects.ts | 44 --
1 file changed, 40 insertions(+), 4 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
index 2d71be11a5..c35dc570d4 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
@@ -805,7 +805,16 @@ export class FlowEffects {
): Observable => {
return
this.registryService.getBuckets(registryId).pipe(
take(1),
-map((response) => response.buckets)
+map((response) => response.buckets),
+tap({
+error: (errorResponse: HttpErrorResponse)
=> {
+this.store.dispatch(
+FlowActions.flowBannerError({
+error:
this.errorHelper.getErrorString(errorResponse)
+})
+);
+}
+})
);
};
@@ -815,7 +824,16 @@ export class FlowEffects {
): Observable => {
return this.registryService.getFlows(registryId,
bucketId).pipe(
take(1),
-map((response) => response.versionedFlows)
+map((response) => response.versionedFlows),
+tap({
+error: (errorResponse: HttpErrorResponse)
=> {
+this.store.dispatch(
+FlowActions.flowBannerError({
+error:
this.errorHelper.getErrorString(errorResponse)
+})
+);
+}
+})
);
};
@@ -826,7 +844,16 @@ export class FlowEffects {
): Observable
=> {
return
this.registryService.getFlowVersions(registryId, bucketId, flowId).pipe(
take(1),
-map((response) =>
response.versionedFlowSnapshotMetadataSet)
+map((response) =>
response.versionedFlowSnapshotMetadataSet),
+tap({
+error: (errorResponse: HttpErrorResponse)
=> {
+this.store.dispatch(
+FlowActions.flowBannerError({
+error:
this.errorHelper.getErrorString(errorResponse)
+})
+);
+}
+})
);
};
@@ -3096,7 +3123,16 @@ export class FlowEffects {
dialogReference.componentInstance.getBuckets =
(registryId: string): Observable => {
return
this.registryService.getBuckets(registryId).pipe(
take(1),
-map((response) => response.buckets)
+map((response) => response.buckets),
+tap({
+
(nifi) branch main updated: [NIFI-13130] disabled autofocus for dialog with no form fields to prevent dialog from being focused on page refresh (#8742)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 9ddf8ffdd0 [NIFI-13130] disabled autofocus for dialog with no form
fields to prevent dialog from being focused on page refresh (#8742)
9ddf8ffdd0 is described below
commit 9ddf8ffdd0644d745447eccb11455d9f0a16194d
Author: Scott Aslan
AuthorDate: Fri May 3 16:27:30 2024 -0400
[NIFI-13130] disabled autofocus for dialog with no form fields to prevent
dialog from being focused on page refresh (#8742)
This closes #8742
---
.../state/controller-services/controller-services.effects.ts | 3 ++-
.../src/app/pages/flow-designer/state/flow/flow.effects.ts | 12
.../flow/change-version-dialog/change-version-dialog.html| 2 +-
.../state/flow-analysis-rules/flow-analysis-rules.effects.ts | 3 ++-
.../management-controller-services.effects.ts| 3 ++-
.../state/parameter-providers/parameter-providers.effects.ts | 3 ++-
.../state/reporting-tasks/reporting-tasks.effects.ts | 3 ++-
.../fetch-parameter-provider-parameters.component.html | 2 +-
.../component-cluster-status.effects.ts | 3 ++-
.../cluster-summary-dialog.component.html| 4 ++--
.../pages/users/state/user-listing/user-listing.effects.ts | 3 ++-
.../user-access-policies/user-access-policies.component.html | 2 +-
.../src/main/nifi/src/app/state/about/about.effects.ts | 3 ++-
.../src/app/state/component-state/component-state.effects.ts | 3 ++-
.../app/ui/common/about-dialog/about-dialog.component.html | 2 +-
.../ui/common/component-state/component-state.component.html | 2 +-
16 files changed, 33 insertions(+), 20 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
index 9d64fbe2a1..abc711fc48 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
@@ -622,7 +622,8 @@ export class ControllerServicesEffects {
tap((request) => {
const dialogRequest =
this.dialog.open(ChangeComponentVersionDialog, {
...LARGE_DIALOG,
-data: request
+data: request,
+autoFocus: false
});
dialogRequest.componentInstance.changeVersion.pipe(take(1)).subscribe((newVersion)
=> {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
index c50e5c93a2..2d71be11a5 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
@@ -3398,7 +3398,8 @@ export class FlowEffects {
tap((request) => {
const dialogRef = this.dialog.open(ChangeVersionDialog, {
...LARGE_DIALOG,
-data: request
+data: request,
+autoFocus: false
});
dialogRef.componentInstance.changeVersion.pipe(take(1)).subscribe((selectedVersion)
=> {
@@ -3427,7 +3428,8 @@ export class FlowEffects {
const dialogRef =
this.dialog.open(ChangeVersionProgressDialog, {
...SMALL_DIALOG,
minWidth: 365,
-disableClose: true
+disableClose: true,
+autoFocus: false
});
dialogRef.componentInstance.flowUpdateRequest$ =
this.store.select(selectChangeVersionRequest);
dialogRef.componentInstance.changeVersionComplete.pipe(take(1)).subscribe((entity)
=> {
@@ -3602,7 +3604,8 @@ export class FlowEffects {
const dialogRef =
this.dialog.open(ChangeVersionProgressDialog, {
...SMALL_DIALOG,
minWidth: 365,
-dis
(nifi) branch main updated (37937ffa15 -> 914e2b1057)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 37937ffa15 [NIFI-13129] - Fix: selected prioritizer order is not honored when displayed in the UI (#8736) add 914e2b1057 NIFI-13136: Allowing users to unset optional property values (#8734) No new revisions were added by this update. Summary of changes: .../edit-process-group.component.ts| 2 - .../edit-processor.component.spec.ts | 2 + .../edit-parameter-context.component.spec.ts | 2 + .../edit-flow-analysis-rule.component.spec.ts | 2 + .../edit-registry-client.component.spec.ts | 2 + .../edit-reporting-task.component.spec.ts | 2 + .../disable-controller-service.component.ts| 2 - .../edit-controller-service.component.spec.ts | 2 + .../enable-controller-service.component.ts | 2 - .../nf-editor/_nf-editor.component-theme.scss | 15 +++ .../property-table/editors/nf-editor/modes/nfel.ts | 1 - .../editors/nf-editor/nf-editor.component.html | 5 +-- .../editors/nf-editor/nf-editor.component.scss | 8 +--- .../editors/nf-editor/nf-editor.component.spec.ts | 2 + .../editors/nf-editor/nf-editor.component.ts | 50 -- .../property-table.component.spec.ts | 2 + .../property-table/property-table.component.ts | 2 +- .../nifi-web-frontend/src/main/nifi/src/main.ts| 9 18 files changed, 74 insertions(+), 38 deletions(-)
(nifi) branch main updated: [NIFI-13128] add missing caution-color to invalid input port (#8731)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f7dc324701 [NIFI-13128] add missing caution-color to invalid input
port (#8731)
f7dc324701 is described below
commit f7dc3247018abc5de9d3abb07ab08d38c88df13e
Author: Scott Aslan
AuthorDate: Fri May 3 10:07:21 2024 -0400
[NIFI-13128] add missing caution-color to invalid input port (#8731)
This closes #8731
---
.../src/app/pages/flow-designer/service/manager/port-manager.service.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
index d2b8b39a62..5e8de72ab0 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
@@ -387,7 +387,7 @@ export class PortManager {
let clazz = 'primary-color';
if (d.status.aggregateSnapshot.runStatus === 'Invalid') {
-clazz = 'invalid';
+clazz = 'invalid caution-color';
} else if (d.status.aggregateSnapshot.runStatus === 'Running')
{
clazz = 'running success-color-lighter';
} else if (d.status.aggregateSnapshot.runStatus === 'Stopped')
{
(nifi) branch main updated: [NIFI-13122] use accent color for checkbox on top of primary color (#8730)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 3f2c0a39db [NIFI-13122] use accent color for checkbox on top of primary color (#8730) 3f2c0a39db is described below commit 3f2c0a39dbeb45ed1d418289ea041fad6e125b64 Author: Scott Aslan AuthorDate: Fri May 3 10:06:17 2024 -0400 [NIFI-13122] use accent color for checkbox on top of primary color (#8730) This closes #8730 --- .../fetch-parameter-provider-parameters.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html index 7931e1ec7d..064d0daae5 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html @@ -238,7 +238,7 @@
(nifi) branch main updated (b608e5a2f0 -> 160c7ae24b)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from b608e5a2f0 NIFI-12831: Add PutOpenSearchVector and QueryOpenSearchVector processors add 160c7ae24b NIFI-13119: When evaluating dependent Properties, the UI should identify when the Property value is a parameter reference and resolve the value accordingly (#8724) No new revisions were added by this update. Summary of changes: .../service/parameter-helper.service.ts| 59 +++ .../controller-services.effects.ts | 34 +++-- .../pages/flow-designer/state/flow/flow.effects.ts | 32 +++-- .../app/pages/flow-designer/state/flow/index.ts| 2 +- .../edit-process-group.component.ts| 3 +- .../edit-processor/edit-processor.component.html | 1 - .../edit-processor/edit-processor.component.ts | 13 ++-- .../service/parameter-contexts.service.ts | 10 +-- .../state/parameter-context-listing/index.ts | 34 + .../parameter-context-listing.selectors.ts | 3 +- .../edit-parameter-context.component.spec.ts | 3 +- .../edit-parameter-context.component.ts| 3 +- .../parameter-context-inheritance.component.ts | 3 +- .../parameter-context-listing.component.ts | 3 +- .../parameter-context-table.component.ts | 2 +- .../process-group-references.component.ts | 2 +- .../feature/route-not-found.component.spec.ts | 6 +- .../edit-registry-client.component.html| 1 - .../edit-registry-client.component.ts | 2 - .../service/interceptors/polling.interceptor.ts| 2 + .../src/main/nifi/src/app/state/shared/index.ts| 26 +++ .../edit-controller-service.component.html | 1 - .../edit-controller-service.component.ts | 13 ++-- .../combo-editor/combo-editor.component.html | 83 ++ .../combo-editor/combo-editor.component.spec.ts| 9 +-- .../editors/combo-editor/combo-editor.component.ts | 71 -- .../editors/nf-editor/nf-editor.component.ts | 32 - .../property-table/property-table.component.html | 4 +- .../property-table/property-table.component.ts | 80 + 29 files changed, 305 insertions(+), 232 deletions(-)
(nifi) branch main updated: NIFI-13114: (#8713)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new be4c003cd7 NIFI-13114: (#8713)
be4c003cd7 is described below
commit be4c003cd73222b9e566b9c3b18f05d0018b6c88
Author: Matt Gilman
AuthorDate: Wed May 1 12:04:40 2024 -0400
NIFI-13114: (#8713)
- Code clean up and removing TODO regarding enforcing isClustered to see
the Primary Node indicator.
This closes #8713
---
.../service/manager/processor-manager.service.ts | 154 +++--
1 file changed, 79 insertions(+), 75 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
index e06b06cc20..bb336dcbff 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
@@ -157,33 +157,32 @@ export class ProcessorManager {
return processor;
}
-private updateProcessors(updated: any) {
+private updateProcessors(updated: d3.Selection) {
if (updated.empty()) {
return;
}
-const self: ProcessorManager = this;
// processor border authorization
updated
.select('rect.border')
-.classed('unauthorized', function (d: any) {
+.classed('unauthorized', (d: any) => {
return d.permissions.canRead === false;
})
-.classed('ghost', function (d: any) {
+.classed('ghost', (d: any) => {
return d.permissions.canRead === true &&
d.component.extensionMissing === true;
});
// processor body authorization
-updated.select('rect.body').classed('unauthorized', function (d: any) {
+updated.select('rect.body').classed('unauthorized', (d: any) => {
return d.permissions.canRead === false;
});
-updated.each(function (this: any, processorData: any) {
-const processor: any = d3.select(this);
+updated.each((processorData: any, i, nodes) => {
+const processor: d3.Selection =
d3.select(nodes[i]);
let details: any = processor.select('g.processor-canvas-details');
// update the component behavior as appropriate
-self.editableBehavior.editable(processor);
+this.editableBehavior.editable(processor);
// if this processor is visible, render everything
if (processor.classed('visible')) {
@@ -227,7 +226,7 @@ export class ProcessorManager {
details
.append('rect')
.attr('class', 'processor-stats-in-out odd')
-.attr('width', function () {
+.attr('width', () => {
return processorData.dimensions.width;
})
.attr('height', 19)
@@ -238,7 +237,7 @@ export class ProcessorManager {
details
.append('rect')
.attr('class', 'processor-stats-border')
-.attr('width', function () {
+.attr('width', () => {
return processorData.dimensions.width;
})
.attr('height', 1)
@@ -249,7 +248,7 @@ export class ProcessorManager {
details
.append('rect')
.attr('class', 'processor-read-write-stats even')
-.attr('width', function () {
+.attr('width', () => {
return processorData.dimensions.width;
})
.attr('height', 19)
@@ -260,7 +259,7 @@ export class ProcessorManager {
details
.append('rect')
.attr('class', 'processor-stats-border')
-.attr('width', function () {
+.attr('width', () => {
return processorData.dimensions.width;
})
.attr('height', 1)
@@ -271,7 +270,7 @@ export class ProcessorManager {
details
.append('rect')
.attr('cla
(nifi) branch main updated: NIFI-13102: (#8704)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 67b387e5c7 NIFI-13102: (#8704)
67b387e5c7 is described below
commit 67b387e5c7a5e5bef82bcacd26c2be9ffc34f0c5
Author: Matt Gilman
AuthorDate: Tue Apr 30 13:02:50 2024 -0400
NIFI-13102: (#8704)
- Updating API error handling for Convert to Parameter and Empty Queue.
This closes #8704
---
.../state/parameter/parameter.effects.ts | 56 +-
.../app/pages/flow-designer/state/queue/index.ts | 3 +-
.../flow-designer/state/queue/queue.effects.ts | 22 +
.../flow-designer/state/queue/queue.reducer.ts | 8
.../property-table/property-table.component.ts | 2 +-
5 files changed, 37 insertions(+), 54 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
index e59ad344a9..9413370b2f 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
@@ -21,8 +21,8 @@ import { concatLatestFrom } from '@ngrx/operators';
import * as ParameterActions from './parameter.actions';
import { Store } from '@ngrx/store';
import { CanvasState } from '../index';
-import { asyncScheduler, catchError, from, interval, map, NEVER, of,
switchMap, takeUntil } from 'rxjs';
-import { ParameterContextUpdateRequest } from '../../../../state/shared';
+import { asyncScheduler, catchError, filter, from, interval, map, of,
switchMap, takeUntil } from 'rxjs';
+import { isDefinedAndNotNull, ParameterContextUpdateRequest } from
'../../../../state/shared';
import { selectUpdateRequest } from './parameter.selectors';
import { ParameterService } from '../../service/parameter.service';
import { HttpErrorResponse } from '@angular/common/http';
@@ -86,29 +86,25 @@ export class ParameterEffects {
pollParameterContextUpdateRequest$ = createEffect(() =>
this.actions$.pipe(
ofType(ParameterActions.pollParameterContextUpdateRequest),
-concatLatestFrom(() => this.store.select(selectUpdateRequest)),
-switchMap(([, updateRequest]) => {
-if (updateRequest) {
-return
from(this.parameterService.pollParameterContextUpdate(updateRequest.request)).pipe(
-map((response) =>
-
ParameterActions.pollParameterContextUpdateRequestSuccess({
-response: {
-requestEntity: response
-}
+concatLatestFrom(() =>
this.store.select(selectUpdateRequest).pipe(isDefinedAndNotNull())),
+switchMap(([, updateRequest]) =>
+
from(this.parameterService.pollParameterContextUpdate(updateRequest.request)).pipe(
+map((response) =>
+
ParameterActions.pollParameterContextUpdateRequestSuccess({
+response: {
+requestEntity: response
+}
+})
+),
+catchError((errorResponse: HttpErrorResponse) =>
+of(
+ParameterActions.parameterApiError({
+error: errorResponse.error
})
-),
-catchError((error) =>
-of(
-ParameterActions.parameterApiError({
-error: error.error
-})
-)
)
-);
-} else {
-return NEVER;
-}
-})
+)
+)
+)
)
);
@@ -116,14 +112,8 @@ export class ParameterEffects {
this.actions$.pipe(
ofType(ParameterActions.pollParameterContextUpdateRequestSuccess),
map((action) => action.response),
-switchMap((response) => {
-const updateRequest: ParameterContextUpdateRequest =
response.requestEntity.request;
-if (updateRequest.complete) {
-return
of(ParameterActions.stopPollingParameterContextUpdateRe
(nifi) branch main updated: NIFI-13100: Updating API response error handling for canvas based actions (#8702)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a230eba67b NIFI-13100: Updating API response error handling for canvas
based actions (#8702)
a230eba67b is described below
commit a230eba67ba29f7c6a2aa9042a74245d1195e0d2
Author: Matt Gilman
AuthorDate: Mon Apr 29 14:15:28 2024 -0400
NIFI-13100: Updating API response error handling for canvas based actions
(#8702)
* NIFI-13100:
- Updating API response error handling for canvas based actions.
* NIFI-13100:
- Stopping polling when change version and revert changes fails.
* NIFI-13100:
- Fixing formatting.
This closes #8702
---
.../service/behavior/draggable-behavior.service.ts | 6 +-
.../service/canvas-context-menu.service.ts | 18 +-
.../service/manager/connection-manager.service.ts | 6 +-
.../service/manager/label-manager.service.ts | 5 +-
.../pages/flow-designer/state/flow/flow.actions.ts | 11 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 363 +
.../pages/flow-designer/state/flow/flow.reducer.ts | 21 +-
.../flow-designer/state/flow/flow.selectors.ts | 4 -
.../app/pages/flow-designer/state/flow/index.ts| 16 +-
.../operation-control.component.ts | 12 +-
.../new-canvas-item/new-canvas-item.component.ts | 19 +-
.../create-connection.component.html | 1 +
.../create-connection.component.ts | 4 +-
.../edit-connection/edit-connection.component.html | 1 +
.../edit-connection/edit-connection.component.ts | 7 +-
.../items/label/edit-label/edit-label.component.ts | 3 +-
.../items/port/edit-port/edit-port.component.ts| 3 +-
.../edit-process-group.component.html | 1 +
.../edit-process-group.component.spec.ts | 3 +
.../edit-process-group.component.ts| 4 +-
20 files changed, 293 insertions(+), 215 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
index c68f692c87..5404e91769 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
@@ -322,7 +322,8 @@ export class DraggableBehavior {
},
restoreOnFailure: {
position: d.position
-}
+},
+errorStrategy: 'snackbar'
};
}
@@ -361,7 +362,8 @@ export class DraggableBehavior {
},
restoreOnFailure: {
bends: connection.bends
-}
+},
+errorStrategy: 'snackbar'
};
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
index 938152634a..3e707b2853 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
@@ -599,7 +599,8 @@ export class CanvasContextMenu implements
ContextMenuDefinitionProvider {
id: d.id,
uri: d.uri,
type: d.type,
-revision: this.client.getRevision(d)
+revision: this.client.getRevision(d),
+errorStrategy: 'snackbar'
});
});
this.store.dispatch(
@@ -640,7 +641,8 @@ export class CanvasContextMenu implements
ContextMenuDefinitionProvider {
id: d.id,
uri: d.uri,
type: d.type,
-revision: this.client.getRevision(d)
+revision: this.client.getRevision(d),
+errorStrategy: 'snackbar'
});
});
this.store.dispatch
(nifi) branch main updated: NIFI-13098: (#8701)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a1610cf129 NIFI-13098: (#8701)
a1610cf129 is described below
commit a1610cf1292620b6f504fbace9cb5b765706cdf7
Author: Matt Gilman
AuthorDate: Fri Apr 26 15:19:39 2024 -0400
NIFI-13098: (#8701)
- Updating error handling in Global and Component Policy pages.
This closes #8701
---
.../state/access-policy/access-policy.actions.ts | 4 +-
.../state/access-policy/access-policy.effects.ts | 51 +-
.../state/access-policy/access-policy.reducer.ts | 10 ++---
.../access-policies/state/access-policy/index.ts | 1 -
.../state/policy-component/index.ts| 3 +-
.../policy-component/policy-component.actions.ts | 5 ---
.../policy-component/policy-component.effects.ts | 10 +++--
.../policy-component/policy-component.reducer.ts | 13 +-
.../pages/access-policies/state/tenants/index.ts | 3 +-
.../state/tenants/tenants.actions.ts | 2 -
.../state/tenants/tenants.effects.ts | 8 ++--
.../state/tenants/tenants.reducer.ts | 8 +---
.../component-access-policies.component.html | 7 ++-
.../component-access-policies.component.ts | 2 +
.../component-access-policies.module.ts| 4 +-
.../global-access-policies.component.html | 1 +
.../global-access-policies.component.ts| 2 +
.../global-access-policies.module.ts | 4 +-
18 files changed, 69 insertions(+), 69 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
index 182b975bff..2bb1c79fd2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
@@ -97,8 +97,8 @@ export const resetAccessPolicy = createAction(
props<{ response: ResetAccessPolicy }>()
);
-export const accessPolicyApiError = createAction(
-`${ACCESS_POLICY_PREFIX} Access Policy Api Error`,
+export const accessPolicyApiBannerError = createAction(
+`${ACCESS_POLICY_PREFIX} Access Policy Api Banner Error`,
props<{ response: LoadAccessPolicyError }>()
);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
index c2d1595c2a..9037ed0ece 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
@@ -22,6 +22,7 @@ import { NiFiState } from '../../../../state';
import { Store } from '@ngrx/store';
import { Router } from '@angular/router';
import * as AccessPolicyActions from './access-policy.actions';
+import * as ErrorActions from '../../../../state/error/error.actions';
import { catchError, from, map, of, switchMap, take, tap } from 'rxjs';
import { MatDialog } from '@angular/material/dialog';
import { AccessPolicyService } from '../../service/access-policy.service';
@@ -34,6 +35,7 @@ import { AddTenantsToPolicyRequest } from './index';
import { selectUserGroups, selectUsers } from '../tenants/tenants.selectors';
import { OverridePolicyDialog } from
'../../ui/common/override-policy-dialog/override-policy-dialog.component';
import { MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index';
+import { HttpErrorResponse } from '@angular/common/http';
@Injectable()
export class AccessPolicyEffects {
@@ -105,11 +107,11 @@ export class AccessPolicyEffects {
}
});
}),
-catchError((error) => {
+catchError((errorResponse: HttpErrorResponse) => {
let policyStatus: PolicyStatus | undefined;
-if (error.status === 404) {
+if (errorResponse.status === 404) {
policyStatus = PolicyStatus.NotFound;
-} else if (er
(nifi) branch main updated: NIFI-13094: About dialog (#8698)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 36bf498340 NIFI-13094: About dialog (#8698)
36bf498340 is described below
commit 36bf49834047cf5ec0a1b2f85522ff374445a90c
Author: Matt Gilman
AuthorDate: Thu Apr 25 12:25:22 2024 -0400
NIFI-13094: About dialog (#8698)
* NIFI-13094:
- Adding the about dialog.
- Adding favicon.
* NIFI-13094:
- Addressing review feedback.
This closes #8698
---
...flow-configuration-history-listing.component.ts | 2 -
.../manage-remote-ports.component.ts | 9 +---
.../provenance/feature/provenance.component.ts | 2 -
.../src/app/pages/queue/feature/queue.component.ts | 13 +
.../main/nifi/src/app/state/about/about.actions.ts | 4 +-
.../main/nifi/src/app/state/about/about.effects.ts | 27 +--
.../main/nifi/src/app/state/about/about.reducer.ts | 14 +-
.../src/main/nifi/src/app/state/about/index.ts | 11 ++---
.../about-dialog/about-dialog.component.html | 50 +++
.../about-dialog/about-dialog.component.scss} | 13 ++---
.../about-dialog/about-dialog.component.spec.ts| 42
.../common/about-dialog/about-dialog.component.ts | 56 ++
.../ui/common/navigation/navigation.component.html | 2 +-
.../ui/common/navigation/navigation.component.ts | 6 +++
.../src/main/nifi/src/assets/icons/nifi-drop.svg | 17 +++
.../main/nifi/src/assets/icons/nifi-logo-about.svg | 17 +++
.../nifi-web-frontend/src/main/nifi/src/index.html | 2 +-
17 files changed, 229 insertions(+), 58 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
index ade586ed38..23ab09d939 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
@@ -44,7 +44,6 @@ import { MatOptionModule } from '@angular/material/core';
import { MatSelectModule } from '@angular/material/select';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { selectAbout } from '../../../../state/about/about.selectors';
-import { loadAbout } from '../../../../state/about/about.actions';
import { debounceTime } from 'rxjs';
import { NiFiCommon } from '../../../../service/nifi-common.service';
import { MatButtonModule } from '@angular/material/button';
@@ -133,7 +132,6 @@ export class FlowConfigurationHistoryListing implements
OnInit, OnDestroy {
ngOnInit(): void {
this.refresh();
-this.store.dispatch(loadAbout());
this.onFormChanges();
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
index 505a97172a..58a24fb390 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
import { Store } from '@ngrx/store';
import { filter, switchMap, take, tap } from 'rxjs';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -52,13 +52,12 @@ import {
selectTimeOffset
} from '../../../../state/flow-configuration/flow-configuration.selectors';
import { selectAbout } from '../../../../state/about/about.selectors';
-import { loadAbout } from '../../../../state/about/about.actions';
@Component({
templateUrl: './manage-remote-ports.component.html',
styleUrls: ['./manage-remote
(nifi) branch main updated: NIFI-13055: Moving the loading of flow configuration out of individual pages and into the navigation component (#8695)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new b06c1779a3 NIFI-13055: Moving the loading of flow configuration out of
individual pages and into the navigation component (#8695)
b06c1779a3 is described below
commit b06c1779a37b55332f3a6b2d95f0c2738d5e3fbb
Author: Matt Gilman
AuthorDate: Wed Apr 24 15:20:19 2024 -0400
NIFI-13055: Moving the loading of flow configuration out of individual
pages and into the navigation component (#8695)
* NIFI-13055:
- Moving the loading of flow configuration out of individual pages and into
the navigation component which requires it for rendering the Users and Policies
menu item.
* NIFI-13055:
- Moving the loading of current user out of each page and into the
Navigation component.
This closes #8695
---
.../feature/access-policies.component.ts| 3 ---
.../component-access-policies.component.ts | 2 --
.../global-access-policies.component.ts | 2 --
.../pages/bulletins/feature/bulletins.component.spec.ts | 4 ++--
.../app/pages/bulletins/feature/bulletins.component.ts | 17 ++---
.../app/pages/counters/feature/counters.component.ts| 10 ++
.../flow-designer/feature/flow-designer.component.ts| 10 ++
.../pages/flow-designer/ui/canvas/canvas.component.ts | 2 --
.../controller-service/controller-services.component.ts | 9 ++---
.../manage-remote-ports.component.ts| 2 --
.../feature/parameter-contexts.component.ts | 3 ---
.../parameter-context-listing.component.ts | 2 --
.../pages/provenance/feature/provenance.component.ts| 10 ++
.../nifi/src/app/pages/queue/feature/queue.component.ts | 10 ++
.../app/pages/settings/feature/settings.component.ts| 3 ---
.../management-controller-services.component.ts | 2 --
.../parameter-providers.component.ts| 2 --
.../ui/reporting-tasks/reporting-tasks.component.ts | 2 --
.../src/app/pages/summary/feature/summary.component.ts | 3 ---
.../nifi/src/app/pages/users/feature/users.component.ts | 3 ---
.../users/ui/user-listing/user-listing.component.ts | 2 --
.../app/ui/common/navigation/navigation.component.ts| 15 +--
22 files changed, 27 insertions(+), 91 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.ts
index 150899f686..7fac3cb07d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.ts
@@ -18,7 +18,6 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
-import { startCurrentUserPolling, stopCurrentUserPolling } from
'../../../state/current-user/current-user.actions';
import {
loadClusterSummary,
startClusterSummaryPolling,
@@ -35,12 +34,10 @@ export class AccessPolicies implements OnInit, OnDestroy {
ngOnInit(): void {
this.store.dispatch(loadClusterSummary());
-this.store.dispatch(startCurrentUserPolling());
this.store.dispatch(startClusterSummaryPolling());
}
ngOnDestroy(): void {
this.store.dispatch(stopClusterSummaryPolling());
-this.store.dispatch(stopCurrentUserPolling());
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
index 256b11be91..bd64b36227 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
@@ -42,7 +42,6 @@ import { NiFiCommon } from
'../../../../service/nifi-common.service';
import
(nifi) branch main updated: NIFI-13078: Adding support to Enable and Disable through the context menu and operation control (#8680)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 562eece6e3 NIFI-13078: Adding support to Enable and Disable through
the context menu and operation control (#8680)
562eece6e3 is described below
commit 562eece6e3c1eec8d3eec15fd15d9fb986cbc433
Author: Matt Gilman
AuthorDate: Tue Apr 23 16:47:25 2024 -0400
NIFI-13078: Adding support to Enable and Disable through the context menu
and operation control (#8680)
* NIFI-13078:
- Adding support to Enable and Disable through the context menu and
operation control.
* NIFI-13078:
- Addressing review feedback.
This closes #8680
---
.../service/canvas-context-menu.service.ts | 74 +-
.../flow-designer/service/canvas-utils.service.ts | 83 +++
.../pages/flow-designer/service/flow.service.ts| 40 +++
.../pages/flow-designer/state/flow/flow.actions.ts | 54
.../pages/flow-designer/state/flow/flow.effects.ts | 272 +++--
.../pages/flow-designer/state/flow/flow.reducer.ts | 65 +++--
.../app/pages/flow-designer/state/flow/index.ts| 62 -
.../operation-control.component.ts | 110 ++---
8 files changed, 683 insertions(+), 77 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
index 8e6ec08eee..938152634a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
@@ -58,13 +58,19 @@ import {
copy,
paste,
terminateThreads,
-navigateToParameterContext
+navigateToParameterContext,
+enableCurrentProcessGroup,
+enableComponents,
+disableCurrentProcessGroup,
+disableComponents
} from '../state/flow/flow.actions';
import { ComponentType } from '../../../state/shared';
import {
ConfirmStopVersionControlRequest,
CopyComponentRequest,
DeleteComponentRequest,
+DisableComponentRequest,
+EnableComponentRequest,
MoveComponentRequest,
OpenChangeVersionDialogRequest,
OpenLocalChangesDialogRequest,
@@ -573,8 +579,9 @@ export class CanvasContextMenu implements
ContextMenuDefinitionProvider {
// are runnable or can start transmitting. However, if all
the startable components are RGPs, we will defer
// to the Enable Transmission menu option and not show the
start option.
const allRpgs =
+!startable.empty() &&
startable.filter((d: any) => d.type ===
ComponentType.RemoteProcessGroup).size() ===
-startable.size();
+startable.size();
return this.canvasUtils.areAnyRunnable(selection) &&
!allRpgs;
},
@@ -613,8 +620,9 @@ export class CanvasContextMenu implements
ContextMenuDefinitionProvider {
// are runnable or can stop transmitting. However, if all
the stoppable components are RGPs, we will defer
// to the Disable Transmission menu option and not show
the start option.
const allRpgs =
+!stoppable.empty() &&
stoppable.filter((d: any) => d.type ===
ComponentType.RemoteProcessGroup).size() ===
-stoppable.size();
+stoppable.size();
return this.canvasUtils.areAnyStoppable(selection) &&
!allRpgs;
},
@@ -685,25 +693,65 @@ export class CanvasContextMenu implements
ContextMenuDefinitionProvider {
}
},
{
-condition: (selection: any) => {
-// TODO - canEnable
-return false;
+condition: (selection: d3.Selection) => {
+return this.canvasUtils.canEnable(selection);
},
clazz: 'fa fa-flash',
text: 'Enable',
-action: () => {
-// TODO - enable
+action: (selection: d3.Selection) => {
+if (selection.empty()) {
+// attempting to enable the current process group
+this.store.dispatch(enableC
(nifi) branch main updated: NIFI-13089: Updating PR Template and README for new UI (#8693)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new cde820673c NIFI-13089: Updating PR Template and README for new UI (#8693) cde820673c is described below commit cde820673cbd448880e75ff1ff2eef2a2e01f5f9 Author: Matt Gilman AuthorDate: Tue Apr 23 15:42:29 2024 -0400 NIFI-13089: Updating PR Template and README for new UI (#8693) * NIFI-13089: - Updating PR Template and README for new UI. * Update nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md Reformatting the code structure layout. Co-authored-by: Rob Fellows - Co-authored-by: Rob Fellows This closes #8693 --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++ .../nifi-web-frontend/src/main/nifi/README.md | 73 +++--- .../nifi-web-frontend/src/main/nifi/project.json | 6 ++ 3 files changed, 62 insertions(+), 21 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 49aa9895be..4d507003bf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -42,6 +42,10 @@ Please indicate the verification steps performed prior to pull request creation. - [ ] Build completed using `mvn clean install -P contrib-check` - [ ] JDK 21 +### UI Contributions + +- [ ] NiFi is modernizing its UI. Any contributions that update the [current UI](https://github.com/apache/nifi/tree/main/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui) also need to be implemented in the [new UI](https://github.com/apache/nifi/tree/main/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi). + ### Licensing - [ ] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md index 4926a56843..a846a526db 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md @@ -1,28 +1,58 @@ # NiFi -https://nx.dev; target="_blank" rel="noreferrer">https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png; width="45"> - ## General Info -### Nx - -If you are unfamiliar Nx, you can learn more at https://nx.dev/getting-started/intro. They provide many solid resources to get you up to speed. - -_From Nx:_ - -> We created Nx because developers struggle to configure, maintain and especially integrate various tools and frameworks. -> Setting up a system that works well for a handful of developers and at the same time, easily scales up to an entire organization is hard. -> This includes setting up low-level build tooling, configuring fast CI, and keeping your codebase healthy, up-to-date, and maintainable. +This module is the primary UI for NiFi. It contains the canvas and all UI's for managing the NiFi instance. There are other modules within the codebase +that support other UIs that intergate with this. These include documentation, data viewers, advanced configuration UIs, error handling, and Registry UIs. +Overtime, these will all be modernized and possibly brought into this Nx repo to co-locate all the front end code. + +In its current state it is not quite ready to replace the existing UI as there are a few features that are not implemented yet. The new UI will not +be available with the default build. However, if the build activates the `include-new-ui` profile the new UI will be built and included. On startup, +NiFi has been updated to locate the new UI and if present deploy it to a new context path (`/nf`). If the new UI is not found, nothing is deployed to +the new context path and the application functions as it does today. + +One thing to note, when using the new UI running in NiFi at `/nf`, the user can log in and use the application. When logging out however, there is +a hardcoded redirect that happens from the back end which sends the user to the old UI (`/nifi`). + +Once the remaining features have been implemented, the look and feel has be polished, and it is ready for release the old UI will be removed, update +the context path for the new UI to use `/nifi`, and remove the `include-new-ui` Maven profile. At that point, the logout redirection issue called out above won’t +be a problem any
(nifi) branch main updated: [NIFI-13051] update dialog action buttons (#8688)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3e0dcf7342 [NIFI-13051] update dialog action buttons (#8688)
3e0dcf7342 is described below
commit 3e0dcf7342ef0690e3c8c58b82048f256ec5b187
Author: Scott Aslan
AuthorDate: Tue Apr 23 11:36:02 2024 -0400
[NIFI-13051] update dialog action buttons (#8688)
This closes #8688
---
.../edit-remote-process-group/edit-remote-process-group.component.html | 2 +-
.../src/app/ui/common/edit-tenant/edit-tenant-dialog.component.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.html
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.html
index 2f8eff3d03..55a72230e9 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.html
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.html
@@ -112,7 +112,7 @@
color="primary"
(click)="submitForm()"
mat-button>
-Add
+Apply
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.html
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.html
index 7fa169864b..963cb70579 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.html
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.html
@@ -70,7 +70,7 @@
[disabled]="editTenantForm.invalid || saving.value"
(click)="okClicked()"
color="primary">
-Ok
+{{ isNew ? 'Add' : 'Apply'
}}
}
(nifi) branch main updated: NIFI-13065: Adding initial bend points for self looping connections and connections that collide with existing connections (#8671)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new d9e48f8645 NIFI-13065: Adding initial bend points for self looping
connections and connections that collide with existing connections (#8671)
d9e48f8645 is described below
commit d9e48f8645a66cd9088b6566e706dfdda775e300
Author: Matt Gilman
AuthorDate: Fri Apr 19 17:58:26 2024 -0400
NIFI-13065: Adding initial bend points for self looping connections and
connections that collide with existing connections (#8671)
* NIFI-13065:
- Adding initial bend points for self looping connections and connections
that collide with existing connections.
- Merging two actions into one for opening the new connection dialog.
* NIFI-13065:
- Only considering self looping connections when automatically moving bends
when the source component moves.
* NIFI-13065:
- Making collision check for more lenient.
- Setting initial label index to 0.
This closes #8671
---
.../behavior/connectable-behavior.service.ts | 181 +++--
.../service/behavior/draggable-behavior.service.ts | 34 ++--
.../service/manager/connection-manager.service.ts | 3 +
.../pages/flow-designer/state/flow/flow.actions.ts | 8 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 41 +++--
.../app/pages/flow-designer/state/flow/index.ts| 1 +
.../create-connection.component.ts | 5 +
7 files changed, 214 insertions(+), 59 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
index b553a1ad7b..31a6f1d76a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
@@ -20,9 +20,11 @@ import * as d3 from 'd3';
import { CanvasUtils } from '../canvas-utils.service';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
-import { getDefaultsAndOpenNewConnectionDialog, selectComponents } from
'../../state/flow/flow.actions';
+import { openNewConnectionDialog, selectComponents } from
'../../state/flow/flow.actions';
import { ConnectionManager } from '../manager/connection-manager.service';
import { Position } from '../../state/shared';
+import { CreateConnectionRequest } from '../../state/flow';
+import { NiFiCommon } from '../../../../service/nifi-common.service';
@Injectable({
providedIn: 'root'
@@ -33,7 +35,8 @@ export class ConnectableBehavior {
constructor(
private store: Store,
-private canvasUtils: CanvasUtils
+private canvasUtils: CanvasUtils,
+private nifiCommon: NiFiCommon
) {
const self: ConnectableBehavior = this;
@@ -222,26 +225,174 @@ export class ConnectableBehavior {
// create the connection
const destinationData = destination.datum();
+// prepare the connection request
+const request: CreateConnectionRequest = {
+source: {
+id: sourceData.id,
+componentType: sourceData.type,
+entity: sourceData
+},
+destination: {
+id: destinationData.id,
+componentType: destinationData.type,
+entity: destinationData
+}
+};
+
+// add initial bend points if necessary
+const bends: Position[] =
self.calculateInitialBendPoints(sourceData, destinationData);
+if (bends) {
+request.bends = bends;
+}
+
self.store.dispatch(
-getDefaultsAndOpenNewConnectionDialog({
-request: {
-source: {
-id: sourceData.id,
-componentType: sourceData.type,
-entity: sourceData
-},
-destination: {
-id: destinationData.id
(nifi) branch main updated: NIFI-13054: Tooltip improvements (#8657)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8d8aebc5be NIFI-13054: Tooltip improvements (#8657)
8d8aebc5be is described below
commit 8d8aebc5be77743c40107751014aea6a22f834df
Author: Matt Gilman
AuthorDate: Thu Apr 18 16:11:05 2024 -0400
NIFI-13054: Tooltip improvements (#8657)
* NIFI-13054:
- Using Overlay for tooltips which correctly handle z-index and improvement
positioning logic.
* NIFI-13054:
- Removing wrapped elements that are no longer needed with the use of
Overlay for dialog handling.
This closes #8657
---
.../flow-designer/service/canvas-utils.service.ts | 63 ++-
.../flow-designer/service/canvas-view.service.ts | 14 ++--
.../service/manager/connection-manager.service.ts | 23 ++
.../service/manager/port-manager.service.ts| 24 ++
.../manager/process-group-manager.service.ts | 23 ++
.../service/manager/processor-manager.service.ts | 23 ++
.../remote-process-group-manager.service.ts| 35 +++-
.../flow-designer/ui/canvas/canvas.component.ts| 5 +-
.../header/flow-status/flow-status.component.html | 2 +-
.../header/flow-status/flow-status.component.ts| 14 +++-
.../manage-remote-ports.component.html | 28 +++
.../parameter-table/parameter-table.component.html | 16 ++--
.../flow-analysis-rule-table.component.html| 42 +-
.../parameter-providers-table.component.html | 14 ++--
.../reporting-task-table.component.html| 42 +-
.../controller-service-references.component.html | 41 +-
.../controller-service-table.component.html| 42 +-
.../parameter-references.component.html| 40 +-
.../property-table/property-table.component.html | 14 ++--
.../bulletins-tip/bulletins-tip.component.html | 2 +-
.../bulletins-tip/bulletins-tip.component.ts | 2 -
.../controller-service-api-tip.component.html | 2 +-
.../controller-service-api-tip.component.ts| 2 -
.../el-function-tip/el-function-tip.component.html | 2 +-
.../el-function-tip/el-function-tip.component.ts | 2 -
.../ui/common/tooltips/nifi-tooltip.directive.ts | 92 ++
.../parameter-tip/parameter-tip.component.html | 2 +-
.../parameter-tip/parameter-tip.component.ts | 2 -
.../property-hint-tip.component.html | 2 +-
.../property-hint-tip.component.ts | 2 -
.../property-tip/property-tip.component.html | 2 +-
.../property-tip/property-tip.component.ts | 2 -
.../restrictions-tip.component.html| 2 +-
.../restrictions-tip/restrictions-tip.component.ts | 2 -
.../tooltips/text-tip/text-tip.component.html | 2 +-
.../common/tooltips/text-tip/text-tip.component.ts | 2 -
.../unordered-list-tip.component.html | 2 +-
.../unordered-list-tip.component.ts| 2 -
.../validation-errors-tip.component.html | 2 +-
.../validation-errors-tip.component.ts | 2 -
.../src/main/nifi/src/assets/styles/_app.scss | 2 -
41 files changed, 296 insertions(+), 343 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
index e57e390991..37b4e7adb8 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { ComponentRef, DestroyRef, inject, Injectable, Type, ViewContainerRef
} from '@angular/core';
+import { DestroyRef, inject, Injectable, Type } from '@angular/core';
import * as d3 from 'd3';
import { humanizer, Humanizer } from 'humanize-duration';
import { Store } from '@ngrx/store';
@@ -40,6 +40,8 @@ import { FlowConfiguration } from
'../../../state/flow-configuration';
import { initialState as initialFlowConfigurationState } from
'../../../state/flow-configuration/flow-configuration.reducer';
import { selectFlowConfiguration } from
'../../../state/flow-configuration/flow-configuration.selectors';
import { VersionControlInformation } from '../state/flow';
+import { Overlay, OverlayRef } from '@angular/cdk/overlay';
+import { ComponentPortal } from '@angular/cdk/portal';
@Injectable({
providedIn: 'root'
@@ -62,7 +64,8
(nifi) branch main updated: [NIFI-13041] update listing table column widths (#8656)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 3f7085fec8 [NIFI-13041] update listing table column widths (#8656) 3f7085fec8 is described below commit 3f7085fec83381b120963a75aa1748e802d430f6 Author: Scott Aslan AuthorDate: Tue Apr 16 17:17:36 2024 -0400 [NIFI-13041] update listing table column widths (#8656) * [NIFI-13041] update listing table column widths (moreDetails) * listing tables actions column widths * update table columns to better fit the data * prettier * restore property table commented out html * name column now 25%, more-details and actions columns fixed width, all other columns flex * column width percenatages for clustered tables * property table updates This closes #8656 --- .../policy-table/policy-table.component.html | 2 +- .../policy-table/policy-table.component.scss | 2 +- ...flow-configuration-history-table.component.html | 2 +- ...flow-configuration-history-table.component.scss | 5 ++- .../local-changes-table/local-changes-table.html | 4 +-- .../local-changes-table/local-changes-table.scss | 11 +-- .../manage-remote-ports.component.html | 4 +-- .../manage-remote-ports.component.scss | 24 -- .../parameter-context-table.component.html | 10 +++--- .../parameter-context-table.component.scss | 16 + .../parameter-table/parameter-table.component.html | 2 +- .../parameter-table/parameter-table.component.scss | 2 +- .../provenance-event-table.component.html | 12 --- .../provenance-event-table.component.scss | 6 ++-- .../flowfile-table/flowfile-table.component.html | 12 --- .../flowfile-table/flowfile-table.component.scss | 16 +++-- .../flow-analysis-rule-table.component.html| 4 +-- .../flow-analysis-rule-table.component.scss| 10 +- ...ch-parameter-provider-parameters.component.html | 2 +- ...ch-parameter-provider-parameters.component.scss | 5 ++- .../parameter-groups-table.component.html | 2 +- .../parameter-groups-table.component.scss | 1 - .../parameter-providers-table.component.html | 7 ++-- .../parameter-providers-table.component.scss | 14 +++- .../registry-client-table.component.html | 8 ++--- .../registry-client-table.component.scss | 18 +++--- .../reporting-task-table.component.html| 8 +++-- .../reporting-task-table.component.scss| 10 +- .../connection-cluster-table.component.scss| 3 +- .../port-cluster-table.component.scss | 13 ++-- .../process-group-cluster-table.component.scss | 3 +- .../processor-cluster-table.component.scss | 3 +- ...mote-process-group-cluster-table.component.scss | 3 +- .../port-status-table.component.html | 6 ++-- .../port-status-table.component.scss | 16 +++-- .../connection-status-table.component.html | 6 ++-- .../connection-status-table.component.scss | 8 +++-- .../process-group-status-table.component.html | 4 +-- .../process-group-status-table.component.scss | 8 +++-- .../processor-status-table.component.html | 15 + .../processor-status-table.component.scss | 8 +++-- ...emote-process-group-status-table.component.html | 6 ++-- ...emote-process-group-status-table.component.scss | 8 +++-- .../user-access-policies.component.html| 12 --- .../user-access-policies.component.scss| 11 +-- .../user-table/user-table.component.html | 2 +- .../user-table/user-table.component.scss | 2 +- .../controller-service-table.component.html| 28 .../controller-service-table.component.scss| 10 +- .../property-table/property-table.component.html | 2 +- .../property-table/property-table.component.scss | 10 ++ .../property-table/property-table.component.ts | 38 +++--- .../nifi/src/assets/styles/_listing-table.scss | 12 ++- 53 files changed, 286 insertions(+), 170 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html index c515f49795..44f282f796 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html
(nifi) branch main updated (44b1353440 -> 05558ca2de)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 44b1353440 [NIFI-13041] birdseye honor user set processor background color (#8643) add 05558ca2de NIFI-13047: Adding property history to the property tooltip (#8652) No new revisions were added by this update. Summary of changes: .../controller-services.effects.ts | 29 ++-- .../pages/flow-designer/state/flow/flow.effects.ts | 10 +-- .../app/pages/flow-designer/state/flow/index.ts| 2 ++ .../edit-processor/edit-processor.component.html | 1 + .../flow-analysis-rules.effects.ts | 32 +++--- .../settings/state/flow-analysis-rules/index.ts| 10 ++- .../management-controller-services.effects.ts | 31 +++-- .../settings/state/parameter-providers/index.ts| 2 ++ .../parameter-providers.effects.ts | 28 --- .../pages/settings/state/reporting-tasks/index.ts | 10 ++- .../reporting-tasks/reporting-tasks.effects.ts | 30 +--- .../edit-flow-analysis-rule.component.html | 1 + .../edit-parameter-provider.component.html | 1 + .../edit-reporting-task.component.html | 1 + .../app/service/property-table-helper.service.ts | 12 +++- .../src/main/nifi/src/app/state/shared/index.ts| 21 ++ .../edit-controller-service.component.html | 1 + .../property-table/property-table.component.html | 14 -- .../property-table/property-table.component.ts | 13 +++-- .../property-tip/property-tip.component.html | 19 + 20 files changed, 222 insertions(+), 46 deletions(-)
(nifi) branch main updated: [NIFI-13041] birdseye honor user set processor background color (#8643)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 44b1353440 [NIFI-13041] birdseye honor user set processor background
color (#8643)
44b1353440 is described below
commit 44b13534401facb564844451b386105178313c43
Author: Scott Aslan
AuthorDate: Tue Apr 16 11:39:44 2024 -0400
[NIFI-13041] birdseye honor user set processor background color (#8643)
* [NIFI-13041] birdseye honor user set processor background color
* add stroke border color to make #fff and #000 colored processors visible
in light and dark mode
* border for labels in birdseye
This closes #8643
---
.../flow-designer/service/birdseye-view.service.ts | 28 --
.../app/pages/flow-designer/state/flow/index.ts| 9 +++
.../ui/canvas/_canvas.component-theme.scss | 4
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
index 33c090eac8..603b1893a4 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
@@ -31,6 +31,9 @@ import { FunnelManager } from
'./manager/funnel-manager.service';
import { LabelManager } from './manager/label-manager.service';
import { selectNavigationCollapsed } from '../state/flow/flow.selectors';
import { initialState } from '../state/flow/flow.reducer';
+import { CanvasUtils } from './canvas-utils.service';
+import { NiFiCommon } from '../../../service/nifi-common.service';
+import { ComponentEntityWithDimensions } from '../state/flow';
@Injectable({
providedIn: 'root'
@@ -49,6 +52,8 @@ export class BirdseyeView {
constructor(
private store: Store,
private canvasView: CanvasView,
+private nifiCommon: NiFiCommon,
+private canvasUtils: CanvasUtils,
private processorManager: ProcessorManager,
private processGroupManager: ProcessGroupManager,
private remoteProcessGroupManager: RemoteProcessGroupManager,
@@ -272,7 +277,7 @@ export class BirdseyeView {
context.scale(birdseyeScale, birdseyeScale);
// labels
-this.labelManager.selectAll().each(function (d: any) {
+this.labelManager.selectAll().each((d: ComponentEntityWithDimensions)
=> {
// default color
let color = '#fff7d7';
@@ -283,8 +288,15 @@ export class BirdseyeView {
}
}
+// determine border color
+const strokeColor: string =
this.canvasUtils.determineContrastColor(
+this.nifiCommon.substringAfterLast(color, '#')
+);
+
context.fillStyle = color;
context.fillRect(d.position.x, d.position.y, d.dimensions.width,
d.dimensions.height);
+context.strokeStyle = strokeColor;
+context.strokeRect(d.position.x, d.position.y, d.dimensions.width,
d.dimensions.height);
});
// funnels
@@ -311,7 +323,7 @@ export class BirdseyeView {
});
// processors
-this.processorManager.selectAll().each(function (d: any) {
+this.processorManager.selectAll().each((d:
ComponentEntityWithDimensions) => {
// default color
let color = '#dde4eb';
@@ -319,16 +331,18 @@ export class BirdseyeView {
// use the specified color if appropriate
if (d.component.style['background-color']) {
color = d.component.style['background-color'];
-
-// if the background color is #ff use the default
instead
-if (color === '#ff') {
-color = '#dde4eb';
-}
}
}
+// determine border color
+const strokeColor: string =
this.canvasUtils.determineContrastColor(
+this.nifiCommon.substringAfterLast(color, '#')
+);
+
context.fillStyle = color;
context.fillRect(d.position.x, d.position.y, d.dimensions.width,
d.dimensions.height);
+context.strokeStyle = strokeColor;
+context.strokeRect(d.position.x, d.position.y, d.dimensions.width,
d.dimensions.height);
});
context.restore();
diff --git
a/nifi-nar-bundle
(nifi) branch main updated (2d9943e2d3 -> a79b210d4e)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 2d9943e2d3 NIFI-13042 Support Python 3.12 for Python Processors This closes #8644. add a79b210d4e NIFI-13044: Adding support to move to front (#8646) No new revisions were added by this update. Summary of changes: .../service/canvas-context-menu.service.ts | 56 ++ .../flow-designer/service/canvas-utils.service.ts | 12 + .../service/manager/connection-manager.service.ts | 4 +- .../service/manager/label-manager.service.ts | 12 + .../pages/flow-designer/state/flow/flow.actions.ts | 3 ++ .../pages/flow-designer/state/flow/flow.effects.ts | 44 - .../flow-designer/state/flow/flow.selectors.ts | 13 + .../app/pages/flow-designer/state/flow/index.ts| 8 8 files changed, 128 insertions(+), 24 deletions(-)
(nifi) branch main updated (36d95c5c3b -> 62a4ece55d)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 36d95c5c3b NIFI-13001: Allowing the user to acknowledge changes to the cluster connection state (#8606) add 62a4ece55d NIFI-13005: (#8609) No new revisions were added by this update. Summary of changes: .../nifi/src/app/state/component-state/index.ts| 6 +++ .../component-state/component-state.component.html | 10 .../component-state/component-state.component.ts | 55 +- 3 files changed, 58 insertions(+), 13 deletions(-)
(nifi) branch main updated: [NIFI-13028] theme the processor icon color (#8633)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 2cae3fec11 [NIFI-13028] theme the processor icon color (#8633)
2cae3fec11 is described below
commit 2cae3fec112713e8cd1c95199f4169138d919bc3
Author: Scott Aslan
AuthorDate: Fri Apr 12 09:34:29 2024 -0400
[NIFI-13028] theme the processor icon color (#8633)
* [NIFI-13028] theme the processor icon color
* prettier and lint updates
* add missing color to table action icon
* review feedback
This closes #8633
---
.../service/manager/processor-manager.service.ts | 54 --
.../controller-service-table.component.html| 9 ++--
2 files changed, 35 insertions(+), 28 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
index 6f293fe89a..3c628ebcdd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
@@ -604,7 +604,9 @@ export class ProcessorManager {
.classed('unauthorized', !processorData.permissions.canRead);
//update the processor icon
-processor.select('text.processor-icon').classed('unauthorized',
!processorData.permissions.canRead);
+processor
+.select('text.processor-icon')
+.classed('unauthorized accent-color',
!processorData.permissions.canRead);
//update the processor border
processor.select('rect.border').classed('unauthorized',
!processorData.permissions.canRead);
@@ -623,32 +625,38 @@ export class ProcessorManager {
processor.select('rect.border').style('stroke', function
() {
return color;
});
-}
-}
-// update the processor color
-processor.select('text.processor-icon').style('fill', function (d:
any) {
-// get the default color
-let color: string = self.defaultIconColor();
+if (color) {
+processor.select('text.processor-icon').attr('class',
function () {
+return 'processor-icon';
+});
-if (!d.permissions.canRead) {
-return color;
-}
+// update the processor color
+processor.style('fill', function (d: any) {
+let color = 'unset';
-// use the specified color if appropriate
-if (d.component.style['background-color']) {
-color = d.component.style['background-color'];
+if (!d.permissions.canRead) {
+return color;
+}
+
+// use the specified color if appropriate
+if (d.component.style['background-color']) {
+color = d.component.style['background-color'];
+
+color =
self.canvasUtils.determineContrastColor(
+self.nifiCommon.substringAfterLast(color,
'#')
+);
+}
-//special case #ff implies default fill
-if (color.toLowerCase() === '#ff') {
-color = self.defaultIconColor();
-} else {
-color =
self.canvasUtils.determineContrastColor(self.nifiCommon.substringAfterLast(color,
'#'));
+return color;
+});
}
+} else {
+processor.select('text.processor-icon').attr('class',
function () {
+return 'processor-icon accent-color';
+});
}
-
-return color;
-});
+}
// restricted component indicator
processor.select('circle.restricted-background').style('visibility',
self.showRestricted);
@@ -772,10 +780,6 @@ export class ProcessorManager {
removed.remove();
}
-private defaultIconColor
(nifi) branch main updated (bc589e273d -> 44852fb5d5)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from bc589e273d NIFI-13020 Fix legacy flow C2 update issue add 44852fb5d5 [NIFI-13022] rename semantic color classes to avoid conflict with angular material class names (#8628) No new revisions were added by this update. Summary of changes: .../feature/access-policies.component.html | 2 +- .../add-tenant-to-policy-dialog.component.html | 4 +- .../policy-table/policy-table.component.html | 7 +- ..._component-access-policies.component-theme.scss | 33 .../component-access-policies.component.html | 16 +- .../global-access-policies.component.html | 8 +- .../bulletins/feature/bulletins.component.html | 2 +- .../bulletin-board/bulletin-board.component.html | 7 +- .../pages/counters/feature/counters.component.html | 2 +- .../counter-listing/counter-listing.component.html | 4 +- .../counter-table/counter-table.component.html | 4 +- .../flow-configuration-history.component.html | 2 +- .../action-details/action-details.component.html | 6 +- ...ow-configuration-history-listing.component.html | 6 +- ...flow-configuration-history-table.component.html | 2 +- .../flow-designer/service/canvas-utils.service.ts | 2 +- .../service/manager/port-manager.service.ts| 4 +- .../manager/process-group-manager.service.ts | 24 +-- .../service/manager/processor-manager.service.ts | 2 +- .../remote-process-group-manager.service.ts| 2 +- .../ui/canvas/_canvas.component-theme.scss | 4 - .../ui/canvas/footer/_footer.component-theme.scss | 2 - .../ui/canvas/footer/footer.component.html | 2 +- .../_navigation-control.component-theme.scss | 9 +- .../navigation-control.component.html | 14 +- .../_operation-control.component-theme.scss| 21 +-- .../operation-control.component.html | 27 ++- .../flow-status/_flow-status.component-theme.scss | 5 - .../header/flow-status/flow-status.component.html | 34 ++-- .../header/flow-status/flow-status.component.ts| 12 +- .../header/search/_search.component-theme.scss | 3 - .../ui/canvas/header/search/search.component.html | 4 +- .../destination-funnel.component.html | 4 +- .../destination-output-port.component.html | 4 +- .../destination-process-group.component.html | 2 +- .../destination-processor.component.html | 4 +- ...destination-remote-process-group.component.html | 2 +- .../_prioritizers.component-theme.scss | 2 - .../prioritizers/prioritizers.component.html | 9 +- .../source-funnel/source-funnel.component.html | 4 +- .../source-input-port.component.html | 4 +- .../source-process-group.component.html| 2 +- .../source-processor.component.html| 4 +- .../source-remote-process-group.component.html | 2 +- .../change-version-dialog.html | 10 +- .../change-version-progress-dialog.html| 6 +- .../import-from-registry.component.html| 2 +- .../local-changes-table/local-changes-table.html | 7 +- .../save-version-dialog.component.html | 8 +- .../create-process-group.component.html| 4 +- .../edit-processor/edit-processor.component.html | 6 +- .../relationship-settings.component.html | 2 +- .../run-duration-slider.component.html | 4 +- .../edit-remote-process-group.component.html | 4 +- .../controller-services.component.html | 8 +- .../edit-remote-port.component.html| 2 +- .../manage-remote-ports.component.html | 16 +- .../login/ui/login-form/login-form.component.html | 8 +- .../feature/parameter-contexts.component.html | 2 +- .../edit-parameter-context.component.html | 8 +- ...ameter-context-inheritance.component-theme.scss | 1 - .../parameter-context-inheritance.component.html | 6 +- .../parameter-context-listing.component.html | 6 +- .../parameter-context-table.component.html | 16 +- .../parameter-table/parameter-table.component.html | 20 +- .../process-group-references.component.html| 2 +- .../provenance/feature/provenance.component.html | 2 +- .../lineage/lineage.component.ts | 2 +- .../provenance-event-table.component.html | 20 +- .../flowfile-dialog/flowfile-dialog.component.html | 18 +- .../flowfile-table/flowfile-table.component.html | 12 +- .../ui/queue-listing/queue-listing.component.html | 4 +- .../pages/settings/feature/settings.component.html | 2 +- .../edit-flow-analysis-rule.component.html | 6 +- .../flow-analysis-rule-table.component.html| 30
(nifi) branch main updated (40ece46e3c -> 1a2a23d1b6)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 40ece46e3c [NIFI-12956] rename palettes and introduce semenatic color classes (#8608) add 1a2a23d1b6 [NIFI-12956] update to mat-button on general settings and login forms (#8621) No new revisions were added by this update. Summary of changes: .../flow-designer/service/manager/process-group-manager.service.ts| 2 +- .../ui/canvas/header/flow-status/flow-status.component.html | 4 ++-- .../flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts | 4 ++-- .../nifi/src/app/pages/login/ui/login-form/login-form.component.html | 2 +- .../settings/ui/general/general-form/general-form.component.html | 2 +- .../process-group-status-table.component.ts | 4 ++-- .../src/main/nifi/src/assets/styles/_listing-table.scss | 2 +- .../nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-)
(nifi) branch main updated (7f5680d1fe -> 2c706f5228)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 7f5680d1fe NIFI-13002 Restored zstd Compression Level in
CompressContent
add 2c706f5228 NIFI-12958: Adding support for custom UIs (#8601)
No new revisions were added by this update.
Summary of changes:
.../nifi-web-frontend/src/main/nifi/project.json | 2 +-
.../src/main/nifi/proxy.config.mjs | 2 +-
.../feature/documentation.component.html | 14 ++--
.../service/canvas-context-menu.service.ts | 20 ++
...ntroller-service-advanced-ui-params.resolver.ts | 80 +
.../processor-advanced-ui-params.resolver.ts | 81 +
.../controller-services.actions.ts | 5 ++
.../controller-services.effects.ts | 13
.../pages/flow-designer/state/flow/flow.actions.ts | 5 ++
.../pages/flow-designer/state/flow/flow.effects.ts | 13
.../ui/canvas/canvas-routing.module.ts | 8 +++
.../operation-control.component.html | 2 +-
.../controller-services-routing.module.ts | 7 ++
.../controller-services.component.html | 1 +
.../controller-services.component.ts | 16 -
.../settings/feature/settings-routing.module.ts| 19 +
.../management-controller-service.service.ts | 7 ++
.../settings/service/parameter-provider.service.ts | 4 ++
.../settings/service/reporting-task.service.ts | 4 ++
...ntroller-service-advanced-ui-params.resolver.ts | 82 ++
...rameter-provider-advanced-ui-params.resolver.ts | 78
.../reporting-task-advanced-ui-params.resolver.ts | 78
.../management-controller-services.actions.ts | 5 ++
.../management-controller-services.effects.ts | 12
.../settings/state/parameter-providers/index.ts| 1 +
.../parameter-providers.actions.ts | 5 ++
.../parameter-providers.effects.ts | 12
.../reporting-tasks/reporting-tasks.actions.ts | 5 ++
.../reporting-tasks/reporting-tasks.effects.ts | 12
.../flow-analysis-rule-table.component.html| 2 +-
.../management-controller-services.component.html | 1 +
.../management-controller-services.component.ts| 9 +++
.../parameter-providers-table.component.html | 8 ++-
.../parameter-providers-table.component.ts | 10 +++
.../parameter-providers.component.html | 1 +
.../parameter-providers.component.ts | 8 +++
.../registry-client-table.component.html | 4 +-
.../reporting-task-table.component.html| 9 ++-
.../reporting-task-table.component.ts | 14 ++--
.../reporting-tasks/reporting-tasks.component.html | 1 +
.../reporting-tasks/reporting-tasks.component.ts | 11 ++-
.../src/main/nifi/src/app/state/index.ts | 6 +-
.../src/main/nifi/src/app/state/shared/index.ts| 9 +++
.../common/advanced-ui/advanced-ui.component.html} | 11 +--
.../common/advanced-ui/advanced-ui.component.scss} | 0
.../advanced-ui/advanced-ui.component.spec.ts} | 15 ++--
.../ui/common/advanced-ui/advanced-ui.component.ts | 70 ++
.../controller-service-table.component.html| 12 +++-
.../controller-service-table.component.ts | 10 +++
.../ui/common/navigation/navigation.component.html | 2 +-
.../src/main/webapp/css/main.css | 3 +-
51 files changed, 766 insertions(+), 43 deletions(-)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/resolver/controller-service-advanced-ui-params.resolver.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/resolver/processor-advanced-ui-params.resolver.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/resolver/controller-service-advanced-ui-params.resolver.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/resolver/parameter-provider-advanced-ui-params.resolver.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/resolver/reporting-task-advanced-ui-params.resolver.ts
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/{pages/provenance/feature/provenance.component.html
=> ui/common/advanced-ui/advanced-ui.component.html} (77%)
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/
(nifi) branch main updated (a3dda5eb09 -> db09b44e40)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from a3dda5eb09 [NIFI-12940] - Migrate to Nx (#8574) add db09b44e40 NIFI-12950: Updating front end to use the uiOnly flag where possible (#8565) No new revisions were added by this update. Summary of changes: .../service/controller-service.service.ts | 5 +++- .../pages/flow-designer/service/flow.service.ts| 8 +++--- .../controller-services.effects.ts | 2 -- .../pages/flow-designer/state/flow/flow.effects.ts | 29 ++ .../service/controller-service-state.service.ts| 5 +++- 5 files changed, 42 insertions(+), 7 deletions(-)
(nifi) branch main updated: NIFI-12937: Adding error handling to the Parameter Context Listing page (#8555)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 339a06a8c6 NIFI-12937: Adding error handling to the Parameter Context
Listing page (#8555)
339a06a8c6 is described below
commit 339a06a8c6337d290361acb4c57be348930ff9c5
Author: Matt Gilman
AuthorDate: Tue Mar 26 15:07:14 2024 -0400
NIFI-12937: Adding error handling to the Parameter Context Listing page
(#8555)
* NIFI-12937:
- Adding error handling to the Parameter Context Listing page.
* NIFI-12937:
- Addressing review feedback.
This closes #8555
---
.../src/main/nifi/proxy.config.mjs | 2 +-
.../state/parameter-context-listing/index.ts | 3 +-
.../parameter-context-listing.actions.ts | 14 +-
.../parameter-context-listing.effects.ts | 188 +
.../parameter-context-listing.reducer.ts | 26 +--
.../parameter-context-listing.selectors.ts | 5 +
.../edit-parameter-context.component.html | 16 +-
.../edit-parameter-context.component.ts| 4 +-
.../parameter-context-table.component.ts | 2 +-
.../disable-controller-service.component.html | 2 +-
.../enable-controller-service.component.html | 2 +-
.../src/main/nifi/src/assets/styles/_app.scss | 1 +
.../src/main/nifi/src/assets/utils.scss| 5 +-
13 files changed, 173 insertions(+), 97 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/proxy.config.mjs
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/proxy.config.mjs
index a2377fe6fd..4f4d30253f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/proxy.config.mjs
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/proxy.config.mjs
@@ -17,7 +17,7 @@ const target = {
console.log('Received Response from the Target:',
proxyRes.statusCode, req.url);
});
},
-bypass: function(req, res, proxyOptions) {
+bypass: function (req) {
if (req.url.startsWith('/nifi/')) {
return req.url;
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts
index 80b07b6ba9..06eb2d71ef 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts
@@ -89,6 +89,5 @@ export interface ParameterContextListingState {
updateRequestEntity: ParameterContextUpdateRequestEntity | null;
saving: boolean;
loadedTimestamp: string;
-error: string | null;
-status: 'pending' | 'loading' | 'error' | 'success';
+status: 'pending' | 'loading' | 'success';
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.actions.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.actions.ts
index 14ccaa463d..8642ca7944 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.actions.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.actions.ts
@@ -35,8 +35,13 @@ export const loadParameterContextsSuccess = createAction(
props<{ response: LoadParameterContextsResponse }>()
);
-export const parameterContextListingApiError = createAction(
-'[Parameter Context Listing] Load Parameter Context Listing Error',
+export const parameterContextListingSnackbarApiError = createAction(
+'[Parameter Context Listing] Load Parameter Context Listing Snackbar Api
Error',
+props<{ error: string }>()
+);
+
+export const parameterContextListingBannerApiError = createAction(
+'[Parameter Context Listing] Load Parameter Context Listing Banne
(nifi) branch main updated: NIFI-12902: (#8521)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 940904e1ea NIFI-12902: (#8521)
940904e1ea is described below
commit 940904e1eabb499c33b7d8774742a48f34281990
Author: Matt Gilman
AuthorDate: Mon Mar 18 08:56:30 2024 -0400
NIFI-12902: (#8521)
- Updating packaging to account for new build output.
---
.../nifi-framework/nifi-web/nifi-web-frontend/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
index 4253b7fa7f..2388a58ec6 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
@@ -80,7 +80,7 @@
${project.build.directory}/${project.build.finalName}
-
${frontend.working.dir}/dist/nifi
+
${frontend.working.dir}/dist/nifi/browser
false
**/*
(nifi) branch main updated (3719fddf84 -> d97c794696)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 3719fddf84 NIFI-12700: refactored PutKudu to optimize memory handling for AUTO_FLUSH_SYNC flush mode (unbatched flush) add d97c794696 NIFI-12902: Migrating to @angular-devkit/build-angular:application (#8507) No new revisions were added by this update. Summary of changes: .../nifi-web-frontend/src/main/nifi/angular.json | 7 +- .../src/main/nifi/package-lock.json| 18 +++-- .../nifi-web-frontend/src/main/nifi/package.json | 3 +- .../src/main/nifi/proxy.config.mjs | 18 - .../provenance-event-listing.effects.ts| 3 +- .../state/queue-listing/queue-listing.effects.ts | 2 +- .../parameter-tip/parameter-tip.component.scss | 2 +- .../src/main/nifi/src/styles.scss | 92 +- 8 files changed, 40 insertions(+), 105 deletions(-)
(nifi) branch main updated: NIFI-12807: Handle clustering in Provenance, Lineage, and Queue Listing (#8431)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6c76ecadd4 NIFI-12807: Handle clustering in Provenance, Lineage, and
Queue Listing (#8431)
6c76ecadd4 is described below
commit 6c76ecadd417aa8e0fea2605dae2482990cfea13
Author: Matt Gilman
AuthorDate: Wed Feb 21 11:20:49 2024 -0500
NIFI-12807: Handle clustering in Provenance, Lineage, and Queue Listing
(#8431)
* NIFI-12807:
- Handling cluster node id in provenance listing, lineage graph, and queue
listing.
* NIFI-12807:
- Addressing review feedback.
This closes #8431
---
.../nifi-web-frontend/src/main/nifi/angular.json | 3 +-
.../src/main/nifi/proxy.config.mjs | 6 +-
.../src/main/nifi/src/app/app.module.ts| 4 +-
.../pages/flow-designer/service/flow.service.ts| 4 --
.../pages/flow-designer/state/flow/flow.effects.ts | 5 +-
.../pages/flow-designer/state/flow/flow.reducer.ts | 8 ---
.../flow-designer/state/flow/flow.selectors.ts | 2 -
.../app/pages/flow-designer/state/flow/index.ts| 10 ---
.../flow-designer/ui/canvas/canvas.component.ts| 8 +++
.../flow-status/_flow-status.component-theme.scss | 4 ++
.../header/flow-status/flow-status.component.html | 2 +-
.../header/flow-status/flow-status.component.ts| 11 +--
.../ui/canvas/header/header.component.spec.ts | 10 ++-
.../ui/canvas/header/header.component.ts | 2 +-
.../parameter-context-table.component.ts | 1 -
.../pages/provenance/service/provenance.service.ts | 78 --
.../provenance/state/lineage/lineage.effects.ts| 10 +--
.../provenance/state/lineage/lineage.selectors.ts | 5 ++
.../state/provenance-event-listing/index.ts| 11 ++-
.../provenance-event-listing.actions.ts| 10 ++-
.../provenance-event-listing.effects.ts| 61 ++---
.../provenance-event-listing.selectors.ts | 7 +-
.../provenance-event-listing.component.html| 1 +
.../provenance-event-listing.component.ts | 15 +++--
.../lineage/lineage.component.ts | 37 +-
.../provenance-event-table.component.html | 10 +++
.../provenance-event-table.component.scss | 5 ++
.../provenance-event-table.component.ts| 49 +++---
.../provenance-search-dialog.component.html| 12 +++-
.../provenance-search-dialog.component.spec.ts | 4 +-
.../provenance-search-dialog.component.ts | 46 -
.../src/app/pages/queue/service/queue.service.ts | 33 ++---
.../app/pages/queue/state/queue-listing/index.ts | 7 +-
.../state/queue-listing/queue-listing.effects.ts | 21 --
.../flowfile-table/flowfile-table.component.html | 10 +++
.../flowfile-table/flowfile-table.component.ts | 16 -
.../ui/queue-listing/queue-listing.component.html | 1 +
.../ui/queue-listing/queue-listing.component.ts| 29 ++--
.../cluster.service.ts}| 50 ++
.../main/nifi/src/app/state/about/about.actions.ts | 2 +-
.../cluster-summary/cluster-summary.actions.ts | 39 +++
.../cluster-summary/cluster-summary.effects.ts | 60 +
.../cluster-summary/cluster-summary.reducer.ts | 55 +++
.../cluster-summary.selectors.ts} | 15 ++---
.../about.actions.ts => cluster-summary/index.ts} | 30 +++--
.../src/main/nifi/src/app/state/index.ts | 6 +-
46 files changed, 622 insertions(+), 193 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
index 2355274e75..7ec3cfdd54 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
@@ -64,7 +64,8 @@
"buildTarget": "nifi:build:production"
},
"development": {
-"buildTarget": "nifi:build:development"
+"buildTarget": "nifi:build:development",
+"servePath": "/nifi"
}
},
"defaultConfiguration": "development"
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/proxy.config.mjs
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi
(nifi) branch main updated: NIFI-12767: Error handling in Provenance and Lineage (#8386)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new da8f86b7e7 NIFI-12767: Error handling in Provenance and Lineage (#8386) da8f86b7e7 is described below commit da8f86b7e7994064dfb256952f6c4e0f12f005b8 Author: Matt Gilman AuthorDate: Wed Feb 14 11:11:26 2024 -0500 NIFI-12767: Error handling in Provenance and Lineage (#8386) * NIFI-12767: - Error handling in Provenance and Lineage. * NIFI-12767: - Addressing review feedback. * NIFI-12767: - Restoring empty initial state for completed request that allows showing a banner error over an empty table instead of an empty page. * NIFI-12767: - Restoring error state to ensure that the loading spinner stops on error. This closes #8386 --- .../add-tenant-to-policy-dialog.component.spec.ts | 4 +- .../override-policy-dialog.component.spec.ts | 4 +- .../create-connection.component.spec.ts| 4 +- .../destination-process-group.component.spec.ts| 4 +- ...tination-remote-process-group.component.spec.ts | 4 +- .../edit-connection.component.spec.ts | 4 +- .../source-process-group.component.spec.ts | 4 +- .../source-remote-process-group.component.spec.ts | 4 +- .../import-from-registry.component.spec.ts | 4 +- .../port/create-port/create-port.component.spec.ts | 4 +- .../port/edit-port/edit-port.component.spec.ts | 4 +- .../create-process-group.component.spec.ts | 4 +- .../edit-process-group.component.spec.ts | 4 +- .../group-components.component.spec.ts | 4 +- .../create-processor.component.spec.ts | 4 +- .../edit-processor.component.spec.ts | 4 +- .../ui/login-form/login-form.component.spec.ts | 4 +- .../edit-parameter-context.component.spec.ts | 4 +- .../pages/provenance/service/provenance.service.ts | 6 +- .../app/pages/provenance/state/lineage/index.ts| 4 +- .../provenance/state/lineage/lineage.actions.ts| 2 + .../provenance/state/lineage/lineage.effects.ts| 124 +- .../provenance/state/lineage/lineage.reducer.ts| 41 +++- .../provenance/state/lineage/lineage.selectors.ts | 9 +- .../state/provenance-event-listing/index.ts| 4 +- .../provenance-event-listing.actions.ts| 2 + .../provenance-event-listing.effects.ts| 272 - .../provenance-event-listing.reducer.ts| 52 +++- .../provenance-event-listing.selectors.ts | 16 +- .../provenance-event-listing.component.html| 1 + .../provenance-event-listing.component.ts | 14 +- .../provenance-event-table.component.html | 3 +- .../provenance-event-table.component.spec.ts | 19 +- .../provenance-event-table.component.ts| 14 +- .../provenance-search-dialog.component.html| 5 + .../provenance-search-dialog.component.scss| 4 + .../provenance-search-dialog.component.spec.ts | 4 +- .../app/pages/queue/state/queue-listing/index.ts | 2 +- .../state/queue-listing/queue-listing.reducer.ts | 4 +- .../flowfile-dialog.component.spec.ts | 4 +- .../flowfile-table.component.spec.ts | 4 +- .../parameter-providers.effects.ts | 4 +- .../create-flow-analysis-rule.component.spec.ts| 4 +- .../edit-flow-analysis-rule.component.spec.ts | 4 +- .../flow-analysis-rule-table.component.spec.ts | 4 +- .../general-form/general-form.component.spec.ts| 4 +- .../create-registry-client.component.spec.ts | 4 +- .../edit-registry-client.component.spec.ts | 4 +- .../registry-client-table.component.spec.ts| 4 +- .../create-reporting-task.component.spec.ts| 4 +- .../edit-reporting-task.component.spec.ts | 4 +- .../user-access-policies.component.spec.ts | 4 +- .../component-state.component.spec.ts | 4 +- .../controller-service-table.component.spec.ts | 4 +- .../create-controller-service.component.spec.ts| 4 +- .../disable-controller-service.component.spec.ts | 4 +- .../edit-controller-service.component.spec.ts | 4 +- .../enable-controller-service.component.spec.ts| 4 +- .../edit-parameter-dialog.component.spec.ts| 4 +- .../edit-tenant-dialog.component.spec.ts | 4 +- .../extension-creation.component.spec.ts | 4 +- .../new-property-dialog.component.spec.ts | 4 +- .../combo-editor/combo-editor.component.spec.ts| 4 +- .../provenance-event-dialog.component.html | 6 +- .../provenance-event-dialog.component.spec.ts | 4 +- 65 files changed, 462 insertions(+), 318 deletions
(nifi) branch main updated: NIFI-12742: Error Handling in Summary, Users, and Queue Listing (#8366)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 439c59e733 NIFI-12742: Error Handling in Summary, Users, and Queue
Listing (#8366)
439c59e733 is described below
commit 439c59e73362e002e8576580e9ad3f3a696ffaae
Author: Matt Gilman
AuthorDate: Fri Feb 9 09:37:07 2024 -0500
NIFI-12742: Error Handling in Summary, Users, and Queue Listing (#8366)
- Error handling in Users.
- Error handling in Summary.
- Error handling in Queue Listing.
- Addressing review feedback.
- Dispatching delete success to ensure the active request is reset upon
completion.
This closes #8366
---
.../app/pages/queue/state/queue-listing/index.ts | 4 +-
.../state/queue-listing/queue-listing.actions.ts | 2 +
.../state/queue-listing/queue-listing.effects.ts | 103 +
.../state/queue-listing/queue-listing.reducer.ts | 48 --
.../state/queue-listing/queue-listing.selectors.ts | 11 ++-
.../flowfile-table/flowfile-table.component.html | 1 +
.../flowfile-table.component.spec.ts | 17 +++-
.../flowfile-table/flowfile-table.component.ts | 3 +-
.../ui/queue-listing/queue-listing.component.html | 17 ++--
.../ui/queue-listing/queue-listing.component.ts| 8 +-
.../queue/ui/queue-listing/queue-listing.module.ts | 4 +-
.../summary/service/cluster-summary.service.ts | 6 +-
.../service/process-group-status.service.ts| 6 +-
.../pages/summary/state/summary-listing/index.ts | 3 +-
.../summary-listing/summary-listing.actions.ts | 5 -
.../summary-listing/summary-listing.effects.ts | 13 ++-
.../summary-listing/summary-listing.reducer.ts | 15 +--
.../app/pages/users/state/user-listing/index.ts| 3 +-
.../state/user-listing/user-listing.actions.ts | 7 +-
.../state/user-listing/user-listing.effects.ts | 63 ++---
.../state/user-listing/user-listing.reducer.ts | 10 +-
.../state/user-listing/user-listing.selectors.ts | 2 +
.../edit-tenant/edit-tenant-dialog.component.html | 1 +
.../edit-tenant-dialog.component.spec.ts | 19 +++-
.../edit-tenant/edit-tenant-dialog.component.ts| 4 +-
25 files changed, 244 insertions(+), 131 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/index.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/index.ts
index 0ce0492f81..b5de716db7 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/index.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/index.ts
@@ -101,9 +101,9 @@ export interface FlowFileDialogRequest {
}
export interface QueueListingState {
-requestEntity: ListingRequestEntity | null;
+activeListingRequest: ListingRequest | null;
+completedListingRequest: ListingRequest | null;
connectionLabel: string;
loadedTimestamp: string;
-error: string | null;
status: 'pending' | 'loading' | 'error' | 'success';
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.actions.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.actions.ts
index 52c4200dba..b4ff565d1d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.actions.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.actions.ts
@@ -68,6 +68,8 @@ export const stopPollingQueueListingRequest =
createAction(`${QUEUE_PREFIX} Stop
export const deleteQueueListingRequest = createAction(`${QUEUE_PREFIX} Delete
Queue Listing Request`);
+export const deleteQueueListingRequestSuccess = createAction(`${QUEUE_PREFIX}
Delete Queue Listing Request Success`);
+
export const viewFlowFile = createAction(`${QUEUE_PREFIX} View FlowFile`,
props<{ request: ViewFlowFileRequest }>());
export const openFlowFileDialog = createAction(
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state
(nifi) branch main updated: [NIFI-12748] apply panelClass to snackbars to apply lighter color to … (#8365)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 43276acf55 [NIFI-12748] apply panelClass to snackbars to apply lighter
color to … (#8365)
43276acf55 is described below
commit 43276acf55330033ccb433243a0657268d80f7d2
Author: Scott Aslan
AuthorDate: Wed Feb 7 15:23:26 2024 -0500
[NIFI-12748] apply panelClass to snackbars to apply lighter color to …
(#8365)
* [NIFI-12748] apply panelClass to snackbars to apply lighter color to the
snackbar action text
* hover color for snackbar action button
* updates based on https://github.com/angular/components/issues/11426
This closes #8365
---
.../main/nifi/src/app/_app.component-theme.scss| 27 --
.../main/nifi/src/app/state/error/error.effects.ts | 2 +-
.../src/main/nifi/src/styles.scss | 4 ++--
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/_app.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/_app.component-theme.scss
index 3afc567f46..b24559cab4 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/_app.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/_app.component-theme.scss
@@ -18,17 +18,40 @@
@use 'sass:map';
@use '@angular/material' as mat;
-@mixin nifi-theme($theme) {
+@mixin nifi-theme($material-theme, $canvas-theme) {
// Get the color config from the theme.
-$color-config: mat.get-color-config($theme);
+$color-config: mat.get-color-config($material-theme);
+$canvas-color-config: mat.get-color-config($canvas-theme);
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+$accent-palette: map.get($color-config, 'accent');
+$warn-palette: map.get($color-config, 'warn');
+$canvas-primary-palette: map.get($canvas-color-config, 'primary');
// Get hues from palette
+$primary-palette-300: mat.get-color-from-palette($primary-palette, 300);
$primary-palette-500: mat.get-color-from-palette($primary-palette, 500);
+$accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
+$warn-palette-500: mat.get-color-from-palette($warn-palette, 500);
+$canvas-primary-palette-A200:
mat.get-color-from-palette($canvas-primary-palette, 'A200');
.splash {
background-color: $primary-palette-500;
}
+
+// https://github.com/angular/components/issues/11426
+.nifi-snackbar .mdc-snackbar__surface {
+background-color: $primary-palette-300 !important;
+}
+
+// https://github.com/angular/components/issues/11426
+.nifi-snackbar .mat-mdc-snack-bar-label {
+color: $canvas-primary-palette-A200 !important;
+}
+
+// https://github.com/angular/components/issues/11426
+.nifi-snackbar .mat-mdc-button:not(:disabled) .mdc-button__label {
+color: $accent-palette-A400;
+}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
index 4a4d48e3a1..93c48de1ba 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
@@ -47,7 +47,7 @@ export class ErrorEffects {
ofType(ErrorActions.snackBarError),
map((action) => action.error),
tap((error) => {
-this.snackBar.open(error, 'Dismiss', { duration: 3 });
+this.snackBar.open(error, 'Dismiss', { panelClass:
'nifi-snackbar', duration: 3 });
})
),
{ dispatch: false }
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
index fd01e720f7..4a26174ebc 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
@@ -461,7 +461,7 @@ $appFontPath: '~roboto-fontface/fonts';
// generate
(nifi) branch main updated: NIFI-12737: Removing all transitions when updating the Canvas transform (#8355)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 13c70c0f30 NIFI-12737: Removing all transitions when updating the
Canvas transform (#8355)
13c70c0f30 is described below
commit 13c70c0f30a87b87d58ba85843df364a61e22385
Author: Matt Gilman
AuthorDate: Tue Feb 6 15:04:35 2024 -0500
NIFI-12737: Removing all transitions when updating the Canvas transform
(#8355)
* NIFI-12737:
- Recording last canvas URL in local storage.
- Using last canvas URL in global menu Canvas item.
- Conditionally applying transitions when centering components.
- Always applying transitions during zoom events (1:1, fit, zoom in/out).
- Adding support to center more than one component.
* NIFI-12737:
- Fixing bug when attempting to click on the search result of the currently
selected component.
- Handling centering of a single selection different from a bulk selection
as it performs betters with Connections.
This closes #8355
---
.../service/canvas-context-menu.service.ts | 6 +-
.../flow-designer/service/canvas-utils.service.ts | 23 +++
.../flow-designer/service/canvas-view.service.ts | 214 +++--
.../service/manager/connection-manager.service.ts | 10 +-
.../pages/flow-designer/state/flow/flow.actions.ts | 24 ++-
.../pages/flow-designer/state/flow/flow.effects.ts | 25 ++-
.../pages/flow-designer/state/flow/flow.reducer.ts | 16 +-
.../flow-designer/state/flow/flow.selectors.ts | 4 +-
.../app/pages/flow-designer/state/flow/index.ts| 5 +
.../flow-designer/ui/canvas/canvas.component.ts| 33 +++-
.../flow-status/flow-status.component.spec.ts | 18 +-
.../ui/canvas/header/search/search.component.html | 15 +-
.../canvas/header/search/search.component.spec.ts | 7 +
.../ui/canvas/header/search/search.component.ts| 29 ++-
.../ui/common/navigation/navigation.component.html | 2 +-
.../ui/common/navigation/navigation.component.ts | 7 +
16 files changed, 340 insertions(+), 98 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
index 5d083166e1..c819095656 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
@@ -20,7 +20,7 @@ import { CanvasUtils } from './canvas-utils.service';
import { Store } from '@ngrx/store';
import { CanvasState } from '../state';
import {
-centerSelectedComponent,
+centerSelectedComponents,
deleteComponents,
enterProcessGroup,
getParameterContextsAndOpenGroupComponentsDialog,
@@ -928,12 +928,12 @@ export class CanvasContextMenu implements
ContextMenuDefinitionProvider {
},
{
condition: (selection: any) => {
-return selection.size() === 1 &&
!this.canvasUtils.isConnection(selection);
+return !selection.empty();
},
clazz: 'fa fa-crosshairs',
text: 'Center in view',
action: () => {
-this.store.dispatch(centerSelectedComponent());
+this.store.dispatch(centerSelectedComponents({ request: {
allowTransition: true } }));
}
},
{
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
index fa43903e36..4f3c284e82 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
@@ -590,6 +590,28 @@ export class CanvasUtils {
});
}
+/**
+ * Returns the position for centering a connection based on the presence
of bends.
+ *
+ * @param d connection data
+ */
+public getPositionForCenteringConnection(d: any): Position {
+let x, y;
+if (d.be
(nifi) branch main updated (8f63e928a9 -> 91f339bf0f)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 8f63e928a9 NIFI-12732 ListS3 resets its tracking state after configuration change add 91f339bf0f NIFI-12743: (#8358) No new revisions were added by this update. Summary of changes: .../editors/nf-editor/nf-editor.component.ts | 7 ++- .../property-table/property-table.component.ts | 70 +++--- 2 files changed, 56 insertions(+), 21 deletions(-)
(nifi) branch main updated: NIFI-12723: Error Handling in Settings, Bulletin Board, and Counters (#8349)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 82c7cf65b5 NIFI-12723: Error Handling in Settings, Bulletin Board, and
Counters (#8349)
82c7cf65b5 is described below
commit 82c7cf65b513c3a6cf2978ab7a4a17108e2e68fe
Author: Matt Gilman
AuthorDate: Tue Feb 6 08:13:22 2024 -0500
NIFI-12723: Error Handling in Settings, Bulletin Board, and Counters (#8349)
* NIFI-12723:
- Error handling in General and Flow Analysis Rules.
- Fixed saving flag in management Controller Service listing.
* NIFI-12723:
- Error handling in Reporting Tasks and Registry Clients.
* NIFI-12723:
- Error handling in Bulletin Board.
* NIFI-12723:
- Error handling in Counters.
* NIFI-12723:
- Fixing lint issues.
* NIFI-12723:
- Addressing review feedback.
This closes #8349
---
.../bulletins/service/bulletin-board.service.ts| 6 +-
.../state/bulletin-board/bulletin-board.actions.ts | 5 --
.../state/bulletin-board/bulletin-board.effects.ts | 17 +++--
.../state/bulletin-board/bulletin-board.reducer.ts | 9 ---
.../bulletin-board/bulletin-board.selectors.ts | 2 +
.../pages/bulletins/state/bulletin-board/index.ts | 3 +-
.../counter-listing/counter-listing.actions.ts | 2 +-
.../counter-listing/counter-listing.effects.ts | 32 +
.../counter-listing/counter-listing.reducer.ts | 8 +--
.../counter-listing/counter-listing.selectors.ts | 2 +
.../pages/counters/state/counter-listing/index.ts | 3 +-
.../controller-services.effects.ts | 14 +---
.../flow-analysis-rules.actions.ts | 9 ++-
.../flow-analysis-rules.effects.ts | 75 +-
.../flow-analysis-rules.reducer.ts | 13 ++--
.../flow-analysis-rules.selectors.ts | 5 ++
.../settings/state/flow-analysis-rules/index.ts| 3 +-
.../settings/state/general/general.effects.ts | 29 ++---
.../settings/state/general/general.reducer.ts | 15 +++--
.../settings/state/general/general.selectors.ts| 6 +-
.../src/app/pages/settings/state/general/index.ts | 4 +-
.../management-controller-services.actions.ts | 5 ++
.../management-controller-services.effects.ts | 34 ++
.../management-controller-services.reducer.ts | 3 +-
.../pages/settings/state/registry-clients/index.ts | 3 +-
.../registry-clients/registry-clients.actions.ts | 9 ++-
.../registry-clients/registry-clients.effects.ts | 56 ++--
.../registry-clients/registry-clients.reducer.ts | 11 ++--
.../registry-clients/registry-clients.selectors.ts | 2 +
.../pages/settings/state/reporting-tasks/index.ts | 3 +-
.../reporting-tasks/reporting-tasks.actions.ts | 9 ++-
.../reporting-tasks/reporting-tasks.effects.ts | 75 +-
.../reporting-tasks/reporting-tasks.reducer.ts | 11 ++--
.../reporting-tasks/reporting-tasks.selectors.ts | 2 +
.../edit-flow-analysis-rule.component.html | 1 +
.../edit-flow-analysis-rule.component.spec.ts | 19 +-
.../edit-flow-analysis-rule.component.ts | 4 +-
.../general-form/general-form.component.html | 18 +++---
.../general/general-form/general-form.component.ts | 2 +
.../pages/settings/ui/general/general.module.ts| 4 +-
.../edit-registry-client.component.html| 1 +
.../edit-registry-client.component.spec.ts | 19 +-
.../edit-registry-client.component.ts | 4 +-
.../edit-reporting-task.component.html | 1 +
.../edit-reporting-task.component.spec.ts | 19 +-
.../edit-reporting-task.component.ts | 4 +-
.../nifi/src/app/service/error-helper.service.ts | 16 -
47 files changed, 375 insertions(+), 222 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
index 58e181a774..024cfad214 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
@@ -17,17 +17,13 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
-import { Client } from '../../../service/client.service';
import { LoadBulletinBoardRequest } from '../state/bulletin-board';
@Injectable({ providedIn
(nifi) branch main updated: [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix (#8320)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new c6f1d771e8 [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix (#8320) c6f1d771e8 is described below commit c6f1d771e8af96453382e6f7e1cbef0280f153ba Author: Scott Aslan AuthorDate: Thu Feb 1 16:59:43 2024 -0500 [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix (#8320) * [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix * prettier * lint fix * update input form field styles to support dark mode * adjust colors of flow status icons, and PG status icons, and softened the warn palette. Fix background of status history charts in dark mode * fix provenance text color in dark mode * leave the toggle for dark mode always visible to encourage testing This closes #8320 --- .../src/main/nifi/.prettierignore | 1 + .../main/nifi/src/app/_app.component-theme.scss| 2 +- .../feature/_access-policies.component-theme.scss | 2 +- ...dd-tenant-to-policy-dialog.component-theme.scss | 2 +- ..._component-access-policies.component-theme.scss | 6 +- .../feature/_bulletins.component-theme.scss| 2 +- .../_bulletin-board-list.component-theme.scss | 2 +- .../feature/_counters.component-theme.scss | 2 +- .../ui/canvas/_canvas.component-theme.scss | 2 +- .../ui/canvas/footer/_footer.component-theme.scss | 2 +- .../_navigation-control.component-theme.scss | 2 +- .../birdseye/_birdseye.component-theme.scss| 2 +- .../_operation-control.component-theme.scss| 6 +- .../ui/canvas/header/_header.component-theme.scss | 2 +- .../flow-status/_flow-status.component-theme.scss | 2 +- .../_new-canvas-item.component-theme.scss | 2 +- .../header/search/_search.component-theme.scss | 8 +- .../ui/canvas/header/search/search.component.html | 3 +- .../ui/canvas/header/search/search.component.ts| 14 +- .../_prioritizers.component-theme.scss | 2 +- .../_create-process-group.component-theme.scss | 2 +- .../ui/common/banner/_banner.component-theme.scss | 2 +- .../_controller-services.component-theme.scss | 2 +- .../login/feature/_login.component-theme.scss | 2 +- .../ui/login-form/_login-form.component-theme.scss | 2 +- .../_parameter-contexts.component-theme.scss | 2 +- ...ameter-context-inheritance.component-theme.scss | 2 +- .../feature/_provenance.component-theme.scss | 2 +- .../_provenance-event-table.component-theme.scss | 2 +- .../lineage/_lineage.component-theme.scss | 8 +- .../_flowfile-dialog.component-theme.scss | 2 +- .../_flowfile-table.component-theme.scss | 2 +- .../feature/_settings.component-theme.scss | 2 +- .../summary/feature/_summary.component-theme.scss | 2 +- .../users/feature/_users.component-theme.scss | 2 +- .../_context-menu.component-theme.scss | 2 +- .../_extension-creation.component-theme.scss | 2 +- .../extension-creation.component.html | 14 +- .../extension-creation.component.ts| 8 +- .../navigation/_navigation.component-theme.scss| 5 +- .../ui/common/navigation/navigation.component.html | 1 + .../ui/common/navigation/navigation.component.ts | 29 +- .../nf-editor/_nf-editor.component-theme.scss | 7 +- .../_provenance-event-dialog.component-theme.scss | 2 +- .../resizable/_resizable.component-theme.scss | 2 +- .../_status-history.component-theme.scss | 17 +- .../status-history/status-history.component.scss | 6 +- ..._system-diagnostics-dialog.component-theme.scss | 2 +- .../_property-hint-tip.component-theme.scss| 2 +- .../src/assets/styles/_listing-table-theme.scss| 2 +- .../src/main/nifi/src/assets/themes/nifi.scss | 197 +- .../src/main/nifi/src/assets/themes/purple.scss| 194 +- .../src/main/nifi/src/styles.scss | 415 + 53 files changed, 767 insertions(+), 242 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore index 4e65d169f6..0ea8adf100 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore @@ -33,6 +33,7 @@ npm-debug.log # Theme src/assets/themes/* +src/styles.scss # System files .DS_Store diff
(nifi) branch main updated (7edf0d4e2a -> 102daa15f8)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 7edf0d4e2a NIFI-12693: Moved notification of python process that a Processor was removed to a background (virtual) thread. Also noted in testing that in one instance a Python Processor never became valid because it had cached property descriptors before the processor was fully initialized, so updated code to ensure that we do not cache values before initialization is completed. add 102daa15f8 NIFI-12684: Handling error responses in the service listing on the canvas (#8321) No new revisions were added by this update. Summary of changes: .../service/controller-service.service.ts | 4 +- .../service/parameter-helper.service.ts| 162 + .../controller-services.actions.ts | 4 +- .../controller-services.effects.ts | 195 +++-- .../controller-services.reducer.ts | 12 +- .../controller-services.selectors.ts | 10 ++ .../state/controller-services/index.ts | 7 +- .../pages/flow-designer/state/flow/flow.effects.ts | 104 +-- .../pages/flow-designer/state/parameter/index.ts | 1 + .../state/parameter/parameter.effects.ts | 29 +-- .../state/parameter/parameter.reducer.ts | 14 +- .../controller-services.component.html | 4 +- .../controller-services.component.ts | 4 +- .../management-controller-services.effects.ts | 6 +- .../controller-service-state.actions.ts| 43 ++--- .../controller-service-state.effects.ts| 49 ++ .../controller-service-state.reducer.ts| 13 -- .../src/app/state/contoller-service-state/index.ts | 1 - 18 files changed, 330 insertions(+), 332 deletions(-) create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/parameter-helper.service.ts
(nifi) branch main updated: NIFI-12679: (#8306)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 03b925629e NIFI-12679: (#8306)
03b925629e is described below
commit 03b925629e7b8e8771571588ba740dd738b44c75
Author: Matt Gilman
AuthorDate: Mon Jan 29 16:01:01 2024 -0500
NIFI-12679: (#8306)
- When overriding a policy prompting whether the new policy should copy the
users and groups or if it should be empty.
---
.../service/access-policy.service.ts | 15 -
.../state/access-policy/access-policy.actions.ts | 7 ++
.../state/access-policy/access-policy.effects.ts | 75 ++
.../override-policy-dialog.component.html | 33 ++
.../override-policy-dialog.component.scss | 26
.../override-policy-dialog.component.spec.ts | 39 +++
.../override-policy-dialog.component.ts| 46 +
.../component-access-policies.component.html | 6 +-
.../component-access-policies.component.ts | 5 ++
.../global-access-policies.component.html | 4 +-
.../global-access-policies.component.ts| 5 ++
11 files changed, 253 insertions(+), 8 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts
index 8fb0800b80..5462f2de53 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts
@@ -33,7 +33,16 @@ export class AccessPolicyService {
private nifiCommon: NiFiCommon
) {}
-createAccessPolicy(resourceAction: ResourceAction): Observable {
+createAccessPolicy(
+resourceAction: ResourceAction,
+{
+userGroups = [],
+users = []
+}: {
+userGroups?: TenantEntity[];
+users?: TenantEntity[];
+} = {}
+): Observable {
let resource: string = `/${resourceAction.resource}`;
if (resourceAction.resourceIdentifier) {
resource += `/${resourceAction.resourceIdentifier}`;
@@ -47,8 +56,8 @@ export class AccessPolicyService {
component: {
action: resourceAction.action,
resource,
-userGroups: [],
-users: []
+userGroups,
+users
}
};
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
index 2a81093301..d747ab69a0 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
@@ -59,6 +59,13 @@ export const loadAccessPolicySuccess = createAction(
export const createAccessPolicy = createAction(`${ACCESS_POLICY_PREFIX} Create
Access Policy`);
+export const promptOverrideAccessPolicy =
createAction(`${ACCESS_POLICY_PREFIX} Prompt Override Access Policy`);
+
+export const overrideAccessPolicy = createAction(
+`${ACCESS_POLICY_PREFIX} Override Access Policy`,
+props<{ request: AddTenantsToPolicyRequest }>()
+);
+
export const createAccessPolicySuccess = createAction(
`${ACCESS_POLICY_PREFIX} Create Access Policy Success`,
props<{ response: AccessPolicyResponse }>()
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
index 93b956d576..cec4550455 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-front
(nifi) branch main updated: NIFI-12663: Error Handling in CS Listing (#8305)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8e0c68e5cc NIFI-12663: Error Handling in CS Listing (#8305)
8e0c68e5cc is described below
commit 8e0c68e5cc8e39b544ed44a7885d1f04f7ae6f42
Author: Matt Gilman
AuthorDate: Mon Jan 29 15:49:59 2024 -0500
NIFI-12663: Error Handling in CS Listing (#8305)
* NIFI-12663:
- Handling API error responses in the Management Controller Services page.
* NIFI-12679:
- Renaming components based on review feedback.
- Using ng-content in page-content component.
- Removing the problematic route when navigating to the error page.
- Fixing logic when handling service loading errors.
- Handling errors in the Property Table Helper service.
* NIFI-12679:
- Addressing review feedback.
---
.../src/main/nifi/src/app/app-routing.module.ts| 4 ++
.../src/main/nifi/src/app/app.module.ts| 6 +-
.../feature/error-routing.module.ts} | 19 ++---
.../feature/error.component.html} | 13 +++-
.../feature/error.component.scss} | 6 +-
.../feature/error.component.spec.ts} | 23 --
.../error/feature/error.component.ts} | 27 ---
.../error/feature/error.module.ts} | 26 +++
.../pages/flow-designer/service/flow.service.ts| 4 --
.../port/create-port/create-port.component.html| 2 +-
.../port/create-port/create-port.component.ts | 4 +-
.../items/port/edit-port/edit-port.component.html | 2 +-
.../items/port/edit-port/edit-port.component.ts| 8 +--
.../create-process-group.component.html| 1 +
.../create-process-group.component.ts | 4 +-
.../group-components/group-components.component.ts | 2 -
.../edit-processor/edit-processor.component.html | 1 +
.../edit-processor.component.spec.ts | 19 -
.../edit-processor/edit-processor.component.ts | 4 +-
.../app/pages/login/feature/login.component.html | 16 +++--
.../src/app/pages/login/feature/login.module.ts| 7 +-
.../login/ui/login-form/login-form.component.html | 2 +-
.../state/management-controller-services/index.ts | 3 +-
.../management-controller-services.actions.ts | 4 +-
.../management-controller-services.effects.ts | 84 --
.../management-controller-services.reducer.ts | 10 +--
.../management-controller-services.selectors.ts| 5 ++
.../management-controller-services.module.ts | 3 +-
.../nifi/src/app/service/error-helper.service.ts | 69 ++
.../src/app/service/extension-types.service.ts | 2 +-
.../src/app/service/guard/authentication.guard.ts | 8 +--
.../service/interceptors/auth.interceptor.spec.ts | 10 ++-
.../app/service/interceptors/auth.interceptor.ts | 47 +---
.../app/service/property-table-helper.service.ts | 53 +++---
.../error/error.actions.ts}| 20 +++---
.../main/nifi/src/app/state/error/error.effects.ts | 55 ++
.../main/nifi/src/app/state/error/error.reducer.ts | 50 +
.../error/error.selectors.ts} | 18 ++---
.../error/index.ts}| 17 +++--
.../src/main/nifi/src/app/state/index.ts | 4 ++
.../edit-controller-service.component.html | 1 +
.../edit-controller-service.component.spec.ts | 19 -
.../edit-controller-service.component.ts | 4 +-
.../error-banner/error-banner.component.html} | 21 +++---
.../error-banner/error-banner.component.scss} | 14 ++--
.../error-banner/error-banner.component.spec.ts} | 14 ++--
.../common/error-banner/error-banner.component.ts} | 33 -
.../page-content/page-content.component.html} | 10 +--
.../page-content/page-content.component.scss} | 4 +-
.../page-content/page-content.component.spec.ts} | 13 ++--
.../common/page-content/page-content.component.ts} | 17 +++--
51 files changed, 564 insertions(+), 248 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
index 3a70a49d5b..704d6df973 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app-routing.module.ts
@@ -24,6 +24,10 @@ const routes: Routes = [
path: 'login',
loadChildren: () =>
import('./pages/login/feature/login.module').then((m) => m.Login
(nifi) branch main updated: NIFI-12611: (#8296)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ecb87149fe NIFI-12611: (#8296)
ecb87149fe is described below
commit ecb87149fe6baea4a6707d98d491482461bcb8eb
Author: Matt Gilman
AuthorDate: Thu Jan 25 14:53:17 2024 -0500
NIFI-12611: (#8296)
- Component State.
This closes #8296
---
.../src/main/nifi/src/app/app.module.ts| 4 +-
.../service/canvas-context-menu.service.ts | 17 ++-
.../flow-designer/service/canvas-utils.service.ts | 22 +++
.../controller-services.component.html | 1 +
.../controller-services.component.spec.ts | 10 +-
.../controller-services.component.ts | 13 ++
.../flow-analysis-rule-table.component.html| 6 +-
.../flow-analysis-rule-table.component.ts | 6 +
.../flow-analysis-rules.component.html | 1 +
.../flow-analysis-rules.component.ts | 14 ++
.../management-controller-services.component.html | 1 +
.../management-controller-services.component.ts| 13 ++
.../reporting-task-table.component.html| 6 +-
.../reporting-task-table.component.ts | 5 +
.../reporting-tasks/reporting-tasks.component.html | 1 +
.../reporting-tasks/reporting-tasks.component.ts | 14 ++
.../src/app/service/component-state.service.ts | 51 +++
.../component-state/component-state.actions.ts | 49 ++
.../component-state/component-state.effects.ts | 139 +
.../component-state.reducer.ts}| 53 +++
.../component-state/component-state.selectors.ts | 38 +
.../nifi/src/app/state/component-state/index.ts| 65
.../src/main/nifi/src/app/state/index.ts | 6 +-
.../state/status-history/status-history.reducer.ts | 1 -
.../component-state/component-state.component.html | 86 +++
.../component-state/component-state.component.scss | 32
.../component-state.component.spec.ts} | 23 ++-
.../component-state/component-state.component.ts | 169 +
.../controller-service-table.component.html| 6 +-
.../controller-service-table.component.ts | 6 +
.../extension-creation.component.html | 1 -
31 files changed, 803 insertions(+), 56 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
index 4fde32890c..749a8dda7a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
@@ -41,6 +41,7 @@ import { MatDialogModule } from '@angular/material/dialog';
import { ControllerServiceStateEffects } from
'./state/contoller-service-state/controller-service-state.effects';
import { SystemDiagnosticsEffects } from
'./state/system-diagnostics/system-diagnostics.effects';
import { FlowConfigurationEffects } from
'./state/flow-configuration/flow-configuration.effects';
+import { ComponentStateEffects } from
'./state/component-state/component-state.effects';
@NgModule({
declarations: [AppComponent],
@@ -65,7 +66,8 @@ import { FlowConfigurationEffects } from
'./state/flow-configuration/flow-config
FlowConfigurationEffects,
StatusHistoryEffects,
ControllerServiceStateEffects,
-SystemDiagnosticsEffects
+SystemDiagnosticsEffects,
+ComponentStateEffects
),
StoreDevtoolsModule.instrument({
maxAge: 25,
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
index 1210caef12..5e27e1cab8 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
@@ -55,6 +55,7 @@ import {
ContextMenuItemDefinition
} from '../../../ui/common/context-menu/context-menu.component';
import { promptEmptyQueueRequest, promptEmptyQueuesRequest } from
'../state/queue/queue.actions';
+import { getComponentStateAndOpenDialog } from
'../../../state
(nifi) branch main updated: NIFI-12604: Empty Queue (#8246)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 02df7c13f8 NIFI-12604: Empty Queue (#8246)
02df7c13f8 is described below
commit 02df7c13f875f98b0fcac39f2a2a49e6ee8b718f
Author: Matt Gilman
AuthorDate: Wed Jan 17 10:24:51 2024 -0500
NIFI-12604: Empty Queue (#8246)
* NIFI-12604:
- Empty Queue.
- Empty All Queues.
* NIFI-12611:
- Ensuring dialog is closed when an error occurs.
- Migrating from withLatestFrom to concatLatestFrom.
* NIFI-12611:
- Adding header/nav to the controller service listing page.
This closes #8246
---
.../state/access-policy/access-policy.effects.ts | 19 +-
.../state/tenants/tenants.effects.ts | 2 +-
.../state/bulletin-board/bulletin-board.effects.ts | 9 +-
.../flow-designer/feature/flow-designer.module.ts | 9 +-
.../behavior/connectable-behavior.service.spec.ts | 5 +-
.../behavior/draggable-behavior.service.spec.ts| 5 +-
.../behavior/editable-behavior.service.spec.ts | 5 +-
.../behavior/quick-select-behavior.service.spec.ts | 5 +-
.../behavior/selectable-behavior.service.spec.ts | 5 +-
.../service/birdseye-view.service.spec.ts | 5 +-
.../service/canvas-context-menu.service.ts | 46 ++-
.../service/canvas-utils.service.spec.ts | 5 +-
.../service/canvas-view.service.spec.ts| 5 +-
.../manager/connection-manager.service.spec.ts | 5 +-
.../service/manager/funnel-manager.service.spec.ts | 5 +-
.../service/manager/label-manager.service.spec.ts | 5 +-
.../service/manager/port-manager.service.spec.ts | 5 +-
.../manager/process-group-manager.service.spec.ts | 5 +-
.../manager/processor-manager.service.spec.ts | 5 +-
.../remote-process-group-manager.service.spec.ts | 5 +-
.../pages/flow-designer/service/queue.service.ts | 67
.../controller-services.effects.ts | 19 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 77 +++--
.../src/app/pages/flow-designer/state/index.ts | 7 +-
.../state/parameter/parameter.effects.ts | 20 +-
.../app/pages/flow-designer/state/queue/index.ts | 65
.../flow-designer/state/queue/queue.actions.ts | 73 +
.../flow-designer/state/queue/queue.effects.ts | 341 +
.../flow-designer/state/queue/queue.reducer.ts | 65
.../flow-designer/state/queue/queue.selectors.ts | 29 ++
.../state/transform/transform.effects.ts | 8 +-
.../flow-designer/ui/canvas/canvas.component.ts| 9 +-
.../controller-services.component.html | 12 +-
.../controller-services.module.ts | 4 +-
.../parameter-context-listing.effects.ts | 9 +-
.../provenance/state/lineage/lineage.effects.ts| 21 +-
.../provenance-event-listing.effects.ts| 27 +-
.../state/queue-listing/queue-listing.actions.ts | 32 +-
.../state/queue-listing/queue-listing.effects.ts | 27 +-
.../flow-analysis-rules.effects.ts | 6 +-
.../management-controller-services.effects.ts | 6 +-
.../registry-clients/registry-clients.effects.ts | 6 +-
.../reporting-tasks/reporting-tasks.effects.ts | 6 +-
.../state/user-listing/user-listing.effects.ts | 27 +-
.../controller-service-state.effects.ts| 36 +--
45 files changed, 896 insertions(+), 263 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
index fa551d40e7..93b956d576 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
@@ -16,12 +16,12 @@
*/
import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import { Actions, concatLatestFrom, createEffect, ofType } from
'@ngrx/effects';
import { NiFiState } from '../../../../state';
import { Store } from '@ngrx/store';
import { Router } from '@angular/router';
import * as AccessPolicyActions from './access-policy.actions';
-import { catchError, combineLatest, filter, from, map, of, switchMap, take,
tap, withLatestFrom } from 'rxjs';
+import { catchError, from, map, of, switchMap, take, tap } from 'rxjs';
import { MatDialog } from
(nifi) branch main updated: NIFI-12597: Introducing a common navigation bar across all pages (#8237)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 7c09aabb4a NIFI-12597: Introducing a common navigation bar across all
pages (#8237)
7c09aabb4a is described below
commit 7c09aabb4a1db9054b9e2f7f5f9cc50ec66256db
Author: Matt Gilman
AuthorDate: Tue Jan 16 08:48:22 2024 -0500
NIFI-12597: Introducing a common navigation bar across all pages (#8237)
* NIFI-12597:
- Introducing a common navigation bar across all pages.
* NIFI-12597:
- Introducing navigation bar to queue listing.
This closes #8237
---
.../feature/access-policies.component.html | 12 +-
.../feature/access-policies.component.spec.ts | 10 +-
.../feature/access-policies.module.ts | 4 +-
.../bulletins/feature/bulletins.component.html | 14 +-
.../pages/bulletins/feature/bulletins.module.ts| 4 +-
.../pages/counters/feature/counters.component.html | 14 +-
.../counters/feature/counters.component.spec.ts| 10 +-
.../app/pages/counters/feature/counters.module.ts | 4 +-
.../header/flow-status/flow-status.component.scss | 3 -
.../ui/canvas/header/header.component.html | 176 -
.../ui/canvas/header/header.component.scss | 47 --
.../ui/canvas/header/header.component.spec.ts | 39 +++--
.../ui/canvas/header/header.component.ts | 47 +-
.../feature/parameter-contexts.component.html | 14 +-
.../feature/parameter-contexts.component.spec.ts | 10 +-
.../feature/parameter-contexts.module.ts | 4 +-
.../provenance/feature/provenance.component.html | 14 +-
.../feature/provenance.component.spec.ts | 12 +-
.../pages/provenance/feature/provenance.module.ts | 4 +-
.../app/pages/queue/feature/queue.component.html | 12 +-
.../pages/queue/feature/queue.component.spec.ts| 10 +-
.../src/app/pages/queue/feature/queue.module.ts| 7 +-
.../src/app/pages/queue/service/queue.service.ts | 10 +-
.../flowfile-table/flowfile-table.component.ts | 2 -
.../pages/settings/feature/settings.component.html | 12 +-
.../settings/feature/settings.component.spec.ts| 12 +-
.../app/pages/settings/feature/settings.module.ts | 4 +-
.../pages/summary/feature/summary.component.html | 12 +-
.../summary/feature/summary.component.spec.ts | 10 +-
.../app/pages/summary/feature/summary.module.ts| 4 +-
.../app/pages/users/feature/users.component.html | 14 +-
.../pages/users/feature/users.component.spec.ts| 10 +-
.../src/app/pages/users/feature/users.module.ts| 4 +-
.../ui/common/navigation/navigation.component.html | 145 +
.../common/navigation/navigation.component.scss} | 5 +-
.../navigation/navigation.component.spec.ts} | 17 +-
.../common/navigation/navigation.component.ts} | 65 +++-
.../src/main/nifi/src/styles.scss | 5 +
38 files changed, 384 insertions(+), 418 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html
index 42f3ca3285..0c95453fea 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html
@@ -15,14 +15,14 @@
~ limitations under the License.
-->
-
-
+
+
+
+
+
Access Policies
-
-
-
-
+
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.spec.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.spec.ts
index 21cbd7545d..035f496df0 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.spec.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.spec.ts
@@ -21,15 +21,23 @@ import { RouterModule } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { provideMockStore } from '@n
(nifi) branch main updated: [NIFI-12563] configure reporting task (#8208)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new bbd8d7fd8d [NIFI-12563] configure reporting task (#8208)
bbd8d7fd8d is described below
commit bbd8d7fd8da5861c94d52eb3fe520ffad6f9e054
Author: Scott Aslan
AuthorDate: Tue Jan 9 11:48:19 2024 -0500
[NIFI-12563] configure reporting task (#8208)
* [NIFI-12563] configure reporting task
* move types to appropriate place
* address dialog resizing issue for reporting task configuration
* add configureReportingTask to reducer
* final touches
* remove unused inputs
* remove unused import
This closes #8208
---
.../settings/feature/settings-routing.module.ts| 8 +-
.../settings/service/reporting-task.service.ts | 19 +-
.../management-controller-services.effects.ts | 6 +-
.../pages/settings/state/reporting-tasks/index.ts | 27 +-
.../reporting-tasks/reporting-tasks.actions.ts | 25 +-
.../reporting-tasks/reporting-tasks.effects.ts | 273 +-
.../reporting-tasks/reporting-tasks.reducer.ts | 13 +-
.../reporting-tasks/reporting-tasks.selectors.ts | 17 +-
.../edit-reporting-task.component.html | 111 ++
.../edit-reporting-task.component.scss}| 37 +-
.../edit-reporting-task.component.spec.ts | 398 +
.../edit-reporting-task.component.ts | 214 +++
.../reporting-task-table.component.html| 6 +-
.../reporting-task-table.component.ts | 6 +
.../reporting-tasks/reporting-tasks.component.html | 1 +
.../reporting-tasks/reporting-tasks.component.ts | 50 ++-
.../ui/reporting-tasks/reporting-tasks.module.ts | 10 +-
.../src/main/nifi/src/app/state/shared/index.ts| 5 +
.../enable-controller-service.component.html | 4 +-
19 files changed, 1189 insertions(+), 41 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/settings-routing.module.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/settings-routing.module.ts
index 9675c24b41..85a5965a87 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/settings-routing.module.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/feature/settings-routing.module.ts
@@ -57,7 +57,13 @@ const routes: Routes = [
children: [
{
path: ':id',
-component: ReportingTasks
+component: ReportingTasks,
+children: [
+{
+path: 'edit',
+component: ReportingTasks
+}
+]
}
]
},
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/reporting-task.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/reporting-task.service.ts
index 6b736d9732..102fab05c5 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/reporting-task.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/reporting-task.service.ts
@@ -16,11 +16,12 @@
*/
import { Injectable } from '@angular/core';
-import { Observable, throwError } from 'rxjs';
+import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { Client } from '../../../service/client.service';
import { NiFiCommon } from '../../../service/nifi-common.service';
import {
+ConfigureReportingTaskRequest,
CreateReportingTaskRequest,
DeleteReportingTaskRequest,
ReportingTaskEntity,
@@ -91,7 +92,17 @@ export class ReportingTaskService {
return
this.httpClient.put(`${this.stripProtocol(entity.uri)}/run-status`, payload);
}
-// updateControllerConfig(controllerEntity: ControllerEntity):
Observable {
-// return
this.httpClient.put(`${ControllerServiceService.API}/controller/config`,
controllerEntity);
-// }
+getPropertyDescriptor(id: string, propertyName: string, sensitive:
boolean): Observable {
+const params: any = {
+propertyName,
+sensitive
(nifi) branch main updated: NIFI-12547: (#8188)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 211d1001f2 NIFI-12547: (#8188)
211d1001f2 is described below
commit 211d1001f2efb3e386bdf747124ddc0da7d09489
Author: Matt Gilman
AuthorDate: Wed Dec 27 10:41:48 2023 -0500
NIFI-12547: (#8188)
- Set the width of the Property editor. This ensures the width looks
correct and the overflow scroll policy works as expected.
- Fixed table layout issues where width: 100% from listing table wasn't
correct.
This closes #8188
---
.../parameter-table/parameter-table.component.scss | 2 +
.../combo-editor/combo-editor.component.html | 104 +++--
.../combo-editor/combo-editor.component.scss | 10 +-
.../combo-editor/combo-editor.component.spec.ts| 3 +-
.../editors/combo-editor/combo-editor.component.ts | 1 +
.../editors/nf-editor/nf-editor.component.html | 2 +-
.../editors/nf-editor/nf-editor.component.ts | 1 +
.../property-table/property-table.component.html | 4 +-
.../property-table/property-table.component.scss | 2 +-
.../property-table/property-table.component.ts | 20 +++-
10 files changed, 83 insertions(+), 66 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
index c6fc0792cf..345a672e6a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss
@@ -22,6 +22,8 @@
min-width: 740px;
table {
+width: auto;
+
td,
th {
cursor: default;
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.html
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.html
index 502d7693f4..31cfc49ed2 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.html
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.html
@@ -15,74 +15,78 @@
~ limitations under the License.
-->
-
+
-
+
-
-
-
-
-{{
-allowableValue.displayName
-}}
-
-
-
-
-{{
-allowableValue.displayName
-}}
-
-
-
-
-
-
-
-
-
-
+
+Value
-
-
+(mousedown)="preventDrag($event)"
+
(selectionChange)="allowableValueChanged($event.value)">
+
+
-{{
-parameterAllowableValue.displayName
+{{
+allowableValue.displayName
}}
-
-{{
-parameterAllowableValue.displayName
+
+{{
+
(nifi) branch support/nifi-1.x updated: NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled error (#8147)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new e8e547a00c NIFI-12481: Filtering out unauthorized registry clients to
avoid unhandled error (#8147)
e8e547a00c is described below
commit e8e547a00c2e000be345434ad90b855cf0e330d9
Author: Matt Gilman
AuthorDate: Thu Dec 21 11:34:57 2023 -0500
NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled
error (#8147)
* NIFI-12481:
- Filtering out unauthorized registry clients to avoid unhandled error.
* NIFI-12481:
- Using es5 syntax.
This closes #8147
---
.../src/main/webapp/js/nf/canvas/nf-flow-version.js | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
index 9588722569..07c8b0207c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
@@ -198,12 +198,19 @@
}).done(function (registriesResponse) {
var registries = [];
-if (nfCommon.isDefinedAndNotNull(registriesResponse.registries) &&
registriesResponse.registries.length > 0) {
-registriesResponse.registries.sort(function (a, b) {
+var authorizedRegistries = [];
+if (nfCommon.isDefinedAndNotNull(registriesResponse.registries)) {
+authorizedRegistries =
registriesResponse.registries.filter(function(registry) {
+return registry.permissions.canRead;
+});
+}
+
+if (authorizedRegistries.length > 0) {
+authorizedRegistries.sort(function (a, b) {
return a.registry.name > b.registry.name;
});
-$.each(registriesResponse.registries, function (_,
registryEntity) {
+$.each(authorizedRegistries, function (_, registryEntity) {
var registry = registryEntity.registry;
registries.push({
text: registry.name,
(nifi) branch main updated: NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled error (#8147)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1f54d5d1fc NIFI-12481: Filtering out unauthorized registry clients to
avoid unhandled error (#8147)
1f54d5d1fc is described below
commit 1f54d5d1fc6a2c8c956b3426f6d5d12d2c547966
Author: Matt Gilman
AuthorDate: Thu Dec 21 11:34:57 2023 -0500
NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled
error (#8147)
* NIFI-12481:
- Filtering out unauthorized registry clients to avoid unhandled error.
* NIFI-12481:
- Using es5 syntax.
This closes #8147
---
.../src/main/webapp/js/nf/canvas/nf-flow-version.js | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
index da98f70777..78812b5ea3 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
@@ -198,12 +198,19 @@
}).done(function (registriesResponse) {
var registries = [];
-if (nfCommon.isDefinedAndNotNull(registriesResponse.registries) &&
registriesResponse.registries.length > 0) {
-registriesResponse.registries.sort(function (a, b) {
+var authorizedRegistries = [];
+if (nfCommon.isDefinedAndNotNull(registriesResponse.registries)) {
+authorizedRegistries =
registriesResponse.registries.filter(function(registry) {
+return registry.permissions.canRead;
+});
+}
+
+if (authorizedRegistries.length > 0) {
+authorizedRegistries.sort(function (a, b) {
return a.component.name > b.component.name;
});
-$.each(registriesResponse.registries, function (_,
registryEntity) {
+$.each(authorizedRegistries, function (_, registryEntity) {
var registry = registryEntity.component;
registries.push({
text: registry.name,
(nifi) branch main updated (02d563eefc -> e6d09c3b3d)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 02d563eefc NIFI-12525: Added property migration for the removed
Consumer Hostname property in ConsumeAzureEventHub
add e6d09c3b3d NIFI-12485: Lineage Graph (#8173)
No new revisions were added by this update.
Summary of changes:
.../src/main/nifi/proxy.config.mjs | 50 +-
.../canvas-context-menu.service.ts}| 134 +--
.../pages/flow-designer/state/flow/flow.actions.ts | 4 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 42 +-
.../pages/flow-designer/state/flow/flow.reducer.ts | 4 +
.../flow-designer/state/flow/flow.selectors.ts | 2 +-
.../flow-designer/ui/canvas/canvas.component.html | 2 +-
.../ui/canvas/canvas.component.spec.ts | 2 +-
.../flow-designer/ui/canvas/canvas.component.ts| 7 +-
.../pages/flow-designer/ui/canvas/canvas.module.ts | 2 +-
.../feature/provenance-routing.module.ts | 3 -
.../pages/provenance/feature/provenance.module.ts | 3 +-
.../pages/provenance/service/provenance.service.ts | 15 +
.../nifi/src/app/pages/provenance/state/index.ts | 6 +-
.../app/pages/provenance/state/lineage/index.ts| 72 ++
.../provenance/state/lineage/lineage.actions.ts| 46 +
.../provenance/state/lineage/lineage.effects.ts| 178
.../provenance/state/lineage/lineage.reducer.ts| 54 ++
.../lineage/lineage.selectors.ts} | 24 +-
.../state/provenance-event-listing/index.ts| 12 +-
.../provenance-event-listing.actions.ts| 19 +-
.../provenance-event-listing.effects.ts| 36 +
.../provenance-event-listing.reducer.ts| 6 +-
.../provenance-event-listing.component.html| 21 +-
.../provenance-event-listing.component.ts | 46 +-
.../lineage/lineage.component.html}| 11 +-
.../lineage/lineage.component.scss | 77 ++
.../lineage/lineage.component.spec.ts} | 17 +-
.../lineage/lineage.component.ts | 997 +
.../provenance-event-table.component.html | 288 +++---
.../provenance-event-table.component.scss | 32 +
.../provenance-event-table.component.ts| 165 +++-
.../context-menu/context-menu.component.html | 5 +-
.../context-menu/context-menu.component.scss | 0
.../context-menu/context-menu.component.spec.ts| 2 +-
.../common/context-menu/context-menu.component.ts | 133 +++
.../controller-service-references.component.ts | 1 -
37 files changed, 2158 insertions(+), 360 deletions(-)
rename
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/{ui/canvas/context-menu/context-menu.component.ts
=> service/canvas-context-menu.service.ts} (90%)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/index.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.actions.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.reducer.ts
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/{ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.scss
=> state/lineage/lineage.selectors.ts} (56%)
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/{flow-designer/ui/canvas/canvas.component.html
=>
provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.html}
(68%)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.scss
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/{flow-designer/ui/canvas/context-menu/context-menu.component.spec.ts
=>
provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.spec.ts}
(71%)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts
rename
nifi-nar-bundles/nifi-framework-bundle/ni
(nifi) branch support/nifi-1.x updated: NIFI-12470: Fixing forEach callback for usage with Object.entries() to address layout issue in Status History (#8121)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new aa575de6e2 NIFI-12470: Fixing forEach callback for usage with
Object.entries() to address layout issue in Status History (#8121)
aa575de6e2 is described below
commit aa575de6e26a6a8e2564e52d84f848912debf7bb
Author: Matt Gilman
AuthorDate: Thu Dec 7 08:19:25 2023 -0500
NIFI-12470: Fixing forEach callback for usage with Object.entries() to
address layout issue in Status History (#8121)
* NIFI-12470:
- Fixing forEach callback for usage with Object.entries() to address layout
issue in Status History.
- Using es5 syntax.
This closes #8121
---
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
index a1b1a43853..a2663650d2 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
@@ -356,8 +356,8 @@
// add status history details
var detailsContainer = buildDetailsContainer('Status History');
-Object.entries(statusHistory.details).forEach(function(key, value)
{
-addDetailItem(detailsContainer, key, value);
+Object.entries(statusHistory.details).forEach(function(entry) {
+addDetailItem(detailsContainer, entry[0], entry[1]);
});
var margin = {
(nifi) branch main updated: NIFI-12470: Fixing forEach callback for usage with Object.entries() to address layout issue in Status History (#8121)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 414eea805f NIFI-12470: Fixing forEach callback for usage with
Object.entries() to address layout issue in Status History (#8121)
414eea805f is described below
commit 414eea805f4c639f65fd029d2e2066ce8bad341d
Author: Matt Gilman
AuthorDate: Thu Dec 7 08:19:25 2023 -0500
NIFI-12470: Fixing forEach callback for usage with Object.entries() to
address layout issue in Status History (#8121)
* NIFI-12470:
- Fixing forEach callback for usage with Object.entries() to address layout
issue in Status History.
- Using es5 syntax.
This closes #8121
---
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
index 003113aef0..706c99a66f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
@@ -355,8 +355,8 @@
// add status history details
var detailsContainer = buildDetailsContainer('Status History');
-Object.entries(statusHistory.details).forEach(function(key, value)
{
-addDetailItem(detailsContainer, key, value);
+Object.entries(statusHistory.details).forEach(function(entry) {
+addDetailItem(detailsContainer, entry[0], entry[1]);
});
var margin = {
(nifi) branch main updated: NIFI-12419: (#8097)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new d40bb3eda6 NIFI-12419: (#8097) d40bb3eda6 is described below commit d40bb3eda621b08ac7a4e1d5f3a53b5fb1d59576 Author: Matt Gilman AuthorDate: Fri Dec 1 12:58:46 2023 -0500 NIFI-12419: (#8097) - Applying a copy of the nifi-web-frontend rat config in the parent module when the new ui profile is not activated. Previously, if the new ui profile was not activated, the rat check would fail. This closes #8097 --- .../nifi-framework/nifi-web/pom.xml| 33 +- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml index c808bf66ad..cb4533c1ef 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml @@ -12,7 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --->http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> +--> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.nifi @@ -49,6 +51,35 @@ nifi-web-frontend + +apply-nifi-web-frontend-rat-config + + +!include-new-ui + + + + + +org.apache.rat +apache-rat-plugin + + + nifi-web-frontend/src/main/nifi/coverage/**/* + nifi-web-frontend/src/main/nifi/node_modules/**/* + nifi-web-frontend/src/main/nifi/src/assets/fonts/**/* + nifi-web-frontend/src/main/nifi/.editorconfig + nifi-web-frontend/src/main/nifi/README.md + nifi-web-frontend/src/main/nifi/proxy.config.mjs + nifi-web-frontend/src/main/nifi/.prettierrc + nifi-web-frontend/src/main/nifi/src/.eslintrc + nifi-web-frontend/target/**/* + + + + + +
(nifi) branch main updated: NIFI-12417: Process Group Configuration (#8075)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 05575364a3 NIFI-12417: Process Group Configuration (#8075)
05575364a3 is described below
commit 05575364a317d052e465bee4ad1ff66473172f3a
Author: Matt Gilman
AuthorDate: Wed Nov 29 17:21:35 2023 -0500
NIFI-12417: Process Group Configuration (#8075)
* NIFI-12417:
- Process Group Configuration.
- Removed unnecessary module imports.
* NIFI-12417:
- Addressing review feedback.
This closes #8075
---
.../nifi-web-frontend/src/main/nifi/angular.json | 3 +-
.../src/main/nifi/src/app/app.module.ts| 2 -
.../pages/canvas/service/canvas-utils.service.ts | 11 +-
.../app/pages/canvas/state/flow/flow.actions.ts| 5 +
.../app/pages/canvas/state/flow/flow.effects.ts| 84 ++--
.../canvas/context-menu/context-menu.component.ts | 21 +-
.../edit-process-group.component.html | 162 +++
.../edit-process-group.component.scss | 36
.../edit-process-group.component.spec.ts | 149 ++
.../edit-process-group.component.ts| 227 +
10 files changed, 671 insertions(+), 29 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
index 0e74b49949..75fcedea38 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json
@@ -45,7 +45,8 @@
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
-"namedChunks": true
+"namedChunks": true,
+"outputHashing": "none"
}
},
"defaultConfiguration": "production"
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
index d0a5adcf7b..cb45fb4c1a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts
@@ -44,8 +44,6 @@ import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from
'@angular/material/form-field';
BrowserModule,
AppRoutingModule,
BrowserAnimationsModule,
-FlowDesignerModule,
-LoginModule,
HttpClientModule,
HttpClientXsrfModule.withOptions({
cookieName: '__Secure-Request-Token',
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/service/canvas-utils.service.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/service/canvas-utils.service.ts
index 26109f74e1..a184c5ddf2 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/service/canvas-utils.service.ts
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/service/canvas-utils.service.ts
@@ -307,14 +307,15 @@ export class CanvasUtils {
* @param selection
*/
public isConfigurable(selection: any): boolean {
-// ensure the correct number of components are selected
-if (selection.size() !== 1) {
-return selection.empty();
+if (selection.empty()) {
+return this.canvasPermissions.canRead &&
this.canvasPermissions.canWrite;
}
-if (this.isProcessGroup(selection)) {
-return true;
+// disable configuration if there are multiple components selected
+if (selection.size() > 1) {
+return false;
}
+
if (!this.canRead(selection) || !this.canModify(selection)) {
return false;
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/canvas/state/flow/flow.actions.ts
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nif
(nifi) branch main updated: NIFI-12401: Allow combo editor to reference parameters (#8068)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ebfb5bc12e NIFI-12401: Allow combo editor to reference parameters
(#8068)
ebfb5bc12e is described below
commit ebfb5bc12e94563cedeb042a6571e537f99ca3d6
Author: Matt Gilman
AuthorDate: Wed Nov 29 12:26:25 2023 -0500
NIFI-12401: Allow combo editor to reference parameters (#8068)
* NIFI-12401:
- Allow combo editor to reference parameters.
* NIFI-12401:
- Addressing review feedback.
- Handling corner cases where there is no parameter context and where there
are no parameters in a bound parameter context.
* NIFI-12401:
- Fixing formatting issues.
This closes #8068
---
.../nifi-web-frontend/src/main/nifi/karma.conf.js | 65 +++---
.../nifi-web-frontend/src/main/nifi/package.json | 2 +-
.../canvas/ui/header/search/search.component.html | 2 +-
.../src/main/nifi/src/app/state/shared/index.ts| 6 +-
.../combo-editor/combo-editor.component.html | 38 +++-
.../combo-editor/combo-editor.component.spec.ts| 160 ++-
.../editors/combo-editor/combo-editor.component.ts | 226 +
.../editors/nf-editor/nf-editor.component.spec.ts | 77 ++-
.../editors/nf-editor/nf-editor.component.ts | 13 +-
.../property-table/property-table.component.html | 1 +
.../property-table/property-table.component.ts | 6 +-
11 files changed, 495 insertions(+), 101 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/karma.conf.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/karma.conf.js
index 5ffa7d98cb..568ec857ed 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/karma.conf.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/karma.conf.js
@@ -19,38 +19,35 @@
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
- config.set({
-basePath: '',
-frameworks: ['jasmine', '@angular-devkit/build-angular'],
-plugins: [
- require('karma-jasmine'),
- require('karma-chrome-launcher'),
- require('karma-jasmine-html-reporter'),
- require('karma-coverage'),
- require('@angular-devkit/build-angular/plugins/karma')
-],
-client: {
- jasmine: {
-// you can add configuration options for Jasmine here
-// the possible options are listed at
https://jasmine.github.io/api/edge/Configuration.html
-// for example, you can disable the random execution with `random:
false`
-// or set a specific seed with `seed: 4321`
- },
- clearContext: false // leave Jasmine Spec Runner output visible in
browser
-},
-jasmineHtmlReporter: {
- suppressAll: true // removes the duplicated traces
-},
-coverageReporter: {
- dir: require('path').join(__dirname, './coverage/nifi'),
- subdir: '.',
- reporters: [
-{ type: 'html' },
-{ type: 'text-summary' }
- ]
-},
-reporters: ['progress', 'kjhtml'],
-browsers: ['ChromeHeadless'],
-restartOnFileChange: true
- });
+config.set({
+basePath: '',
+frameworks: ['jasmine', '@angular-devkit/build-angular'],
+plugins: [
+require('karma-jasmine'),
+require('karma-chrome-launcher'),
+require('karma-jasmine-html-reporter'),
+require('karma-coverage'),
+require('@angular-devkit/build-angular/plugins/karma')
+],
+client: {
+jasmine: {
+// you can add configuration options for Jasmine here
+// the possible options are listed at
https://jasmine.github.io/api/edge/Configuration.html
+// for example, you can disable the random execution with
`random: false`
+// or set a specific seed with `seed: 4321`
+},
+clearContext: false // leave Jasmine Spec Runner output visible in
browser
+},
+jasmineHtmlReporter: {
+suppressAll: true // removes the duplicated traces
+},
+coverageReporter: {
+dir: require('path').join(__dirname, './coverage/nifi'),
+subdir: '.',
+reporters: [{ type: 'html' }, { type: 'text-summary' }]
+},
+reporters: ['progress', 'kjhtml'],
+browsers: ['ChromeHeadless'],
+restartOnFileChange: true
+});
};
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web
(nifi) branch support/nifi-1.x updated: NIFI-12403 Improve Jolt UI Parameter Processing (#8060)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new b06886f89d NIFI-12403 Improve Jolt UI Parameter Processing (#8060)
b06886f89d is described below
commit b06886f89ded8cf5129140d86d7666cb1534edeb
Author: David Handermann
AuthorDate: Wed Nov 22 13:37:02 2023 -0600
NIFI-12403 Improve Jolt UI Parameter Processing (#8060)
* Improved Jolt UI Parameter Processing
* Changed double quotes to single quotes per review
This closes #8060
---
.../src/main/webapp/app/transformjson/transformjson.controller.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
index 7259075c9b..7df8f11ecf 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
@@ -408,8 +408,8 @@ var TransformJsonController = function ($scope, $state, $q,
$mdDialog, $timeout,
$scope.processorId = params.id;
$scope.clientId = params.clientId;
$scope.revisionId = params.revision;
-$scope.disconnectedNodeAcknowledged =
eval(params.disconnectedNodeAcknowledged);
-$scope.editable = eval(params.editable);
+$scope.disconnectedNodeAcknowledged =
params.disconnectedNodeAcknowledged === 'true';
+$scope.editable = params.editable === 'true';
var jsonSpec = $scope.getSpec($scope.transform,$scope.jsonSpec);
if(jsonSpec != null && jsonSpec != ""){
(nifi) branch main updated: NIFI-12403 Improve Jolt UI Parameter Processing (#8060)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 50efc55df6 NIFI-12403 Improve Jolt UI Parameter Processing (#8060)
50efc55df6 is described below
commit 50efc55df6bb00ea15adcc2459d5cc82d128857f
Author: David Handermann
AuthorDate: Wed Nov 22 13:37:02 2023 -0600
NIFI-12403 Improve Jolt UI Parameter Processing (#8060)
* Improved Jolt UI Parameter Processing
* Changed double quotes to single quotes per review
This closes #8060
---
.../src/main/webapp/app/transformjson/transformjson.controller.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
index 7259075c9b..7df8f11ecf 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/transformjson/transformjson.controller.js
@@ -408,8 +408,8 @@ var TransformJsonController = function ($scope, $state, $q,
$mdDialog, $timeout,
$scope.processorId = params.id;
$scope.clientId = params.clientId;
$scope.revisionId = params.revision;
-$scope.disconnectedNodeAcknowledged =
eval(params.disconnectedNodeAcknowledged);
-$scope.editable = eval(params.editable);
+$scope.disconnectedNodeAcknowledged =
params.disconnectedNodeAcknowledged === 'true';
+$scope.editable = params.editable === 'true';
var jsonSpec = $scope.getSpec($scope.transform,$scope.jsonSpec);
if(jsonSpec != null && jsonSpec != ""){
[nifi] branch main updated: NIFI-12260: Remove templates from frontend (#7924)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new c4ff8de412 NIFI-12260: Remove templates from frontend (#7924)
c4ff8de412 is described below
commit c4ff8de4121054795e28c832e967b0c4c1dfe1e5
Author: Shane Ardell
AuthorDate: Thu Oct 26 15:16:14 2023 -0400
NIFI-12260: Remove templates from frontend (#7924)
* remove templates from frontend
* remove more references to removed files
* removing more template references
* remove unused css template styles
---
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 40 --
.../src/main/resources/filters/canvas.properties | 1 -
.../resources/filters/templates-min.properties | 19 -
.../main/resources/filters/templates.properties| 30 --
.../src/main/webapp/WEB-INF/pages/canvas.jsp | 3 -
.../src/main/webapp/WEB-INF/pages/templates.jsp| 66 ---
.../bulletin-board/bulletin-board-content.jsp | 2 +-
.../WEB-INF/partials/canvas/canvas-header.jsp | 7 -
.../canvas/instantiate-template-dialog.jsp | 25 --
.../partials/canvas/new-template-dialog.jsp| 33 --
.../WEB-INF/partials/canvas/policy-management.jsp | 10 -
.../partials/canvas/upload-template-dialog.jsp | 36 --
.../partials/templates/templates-content.jsp | 41 --
.../nifi-web-ui/src/main/webapp/WEB-INF/web.xml| 10 -
.../nifi-web-ui/src/main/webapp/css/main.css | 39 +-
.../nifi-web-ui/src/main/webapp/css/templates.css | 97 -
.../nf-ng-canvas-global-menu-controller.js | 21 -
.../controllers/nf-ng-canvas-operate-controller.js | 223 --
.../controllers/nf-ng-canvas-toolbox-controller.js | 6 -
.../header/components/nf-ng-template-component.js | 291 -
.../src/main/webapp/js/nf/canvas/nf-actions.js | 124 --
.../webapp/js/nf/canvas/nf-canvas-bootstrap.js | 12 +-
.../main/webapp/js/nf/canvas/nf-context-menu.js| 21 -
.../webapp/js/nf/canvas/nf-policy-management.js| 54 ---
.../src/main/webapp/js/nf/nf-status-history.js | 1 -
.../webapp/js/nf/templates/nf-templates-table.js | 450 -
.../main/webapp/js/nf/templates/nf-templates.js| 263
.../src/main/webapp/js/nf/users/nf-users-table.js | 6 +-
28 files changed, 6 insertions(+), 1925 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index f73e416da7..27daad1860 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -31,7 +31,6 @@
summary.properties
counters.properties
cluster.properties
-templates.properties
users.properties
bulletin-board.properties
login.properties
@@ -58,7 +57,6 @@
src/main/resources/filters/${summary.filter}
src/main/resources/filters/${counters.filter}
src/main/resources/filters/${cluster.filter}
-src/main/resources/filters/${templates.filter}
src/main/resources/filters/${users.filter}
src/main/resources/filters/${bulletin.board.filter}
src/main/resources/filters/${login.filter}
@@ -95,7 +93,6 @@
**/provenance.jsp,
**/counters.jsp,
**/cluster.jsp,
-**/templates.jsp,
**/users.jsp,
**/bulletin-board.jsp,
**/login.jsp,
@@ -328,14 +325,6 @@
true
-
-
src/main/webapp/WEB-INF/pages
-WEB-INF/pages
-
-templates.jsp
-
-true
-
src/main/webapp/WEB-INF/pages
WEB-INF/pages
@@ -449,7 +438,6 @@
summary-min.properties
counters-min.properties
cluster-min.properties
-templates-min.properties
users-min.properties
bulletin-board-min.properties
login-min.properties
@@ -558,7 +546,6 @@
${staging.dir}/js/nf/canvas/header/components/nf-ng-group-component.js
${staging.dir}/js/nf/canvas/header
[nifi] branch main updated (814e94b2ac -> d4014c71ee)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 814e94b2ac NIFI-12244 - UpdateRecord invalid because of migrateProperties (#7898) add d4014c71ee NIFI-12099 Repurpose Template icon in top left bar (#7811) No new revisions were added by this update. Summary of changes: .../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 1 + .../src/main/resources/filters/canvas.properties | 1 + .../WEB-INF/partials/canvas/canvas-header.jsp | 7 + .../nifi-web-ui/src/main/webapp/css/header.css | 1 - .../src/main/webapp/fonts/flowfont/flowfont.css| 47 +++--- .../src/main/webapp/fonts/flowfont/flowfont.eot| Bin 25120 -> 25276 bytes .../src/main/webapp/fonts/flowfont/flowfont.svg| 68 + .../src/main/webapp/fonts/flowfont/flowfont.ttf| Bin 24952 -> 25108 bytes .../src/main/webapp/fonts/flowfont/flowfont.woff | Bin 12664 -> 13660 bytes .../src/main/webapp/fonts/flowfont/flowfont.woff2 | Bin 10780 -> 11600 bytes .../main/webapp/js/jquery/tabbs/jquery.tabbs.js| 2 +- .../controllers/nf-ng-canvas-toolbox-controller.js | 5 + .../header/components/nf-ng-group-component.js | 2 +- .../components/nf-ng-registry-import-component.js | 105 + .../webapp/js/nf/canvas/nf-canvas-bootstrap.js | 12 +- .../main/webapp/js/nf/canvas/nf-flow-version.js| 9 +- .../src/main/webapp/js/nf/canvas/nf-settings.js| 170 - 17 files changed, 294 insertions(+), 136 deletions(-) mode change 100755 => 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.css mode change 100755 => 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.eot mode change 100755 => 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.svg mode change 100755 => 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.ttf mode change 100755 => 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff mode change 100755 => 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/fonts/flowfont/flowfont.woff2 create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-registry-import-component.js
[nifi] branch main updated: NIFI-9777: (#5850) - Adding support to remove attributes from verification requests.
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 227dcf5 NIFI-9777: (#5850) - Adding support to remove attributes from
verification requests.
227dcf5 is described below
commit 227dcf54566ae10648881169f5ce881fc3d28c5f
Author: Matt Gilman
AuthorDate: Tue Mar 8 16:25:32 2022 -0500
NIFI-9777: (#5850) - Adding support to remove attributes from verification
requests.
This closes #5850
---
.../src/main/webapp/js/nf/canvas/nf-verify.js | 19 +++
1 file changed, 19 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-verify.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-verify.js
index 0e50c83..ba39c95 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-verify.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-verify.js
@@ -539,6 +539,10 @@
}
};
+var actionFormatter = function (row, cell, value, columnDef,
dataContext) {
+return '';
+};
+
// define the column model for the referenced attributes table
var referencedAttributesColumns = [
{
@@ -557,6 +561,13 @@
sortable: true,
resizable: true,
cssClass: 'pointer'
+},
+{
+id: "actions",
+name: "",
+minWidth: 10,
+width: 10,
+formatter: actionFormatter
}
];
@@ -597,6 +608,14 @@
// prevents standard edit logic
e.stopImmediatePropagation();
+} else if (referencedAttributesGrid.getColumns()[args.cell].id ===
'actions') {
+var attribute = referencedAttributesData.getItem(args.row);
+
+var target = $(e.target);
+if (target.hasClass('delete-attribute')) {
+// remove the attribute from the table
+referencedAttributesData.deleteItem(attribute.id);
+}
}
});
referencedAttributesGrid.onBeforeCellEditorDestroy.subscribe(function
(e, args) {
[nifi] branch main updated (5016eac -> 18fc492)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from 5016eac NIFI-9205 - Update prioritizer configuration (#5516) add 18fc492 NIFI-9378 Create new artifact in nifi-assembly that packages all exte… (#5521) No new revisions were added by this update. Summary of changes: nifi-assembly/pom.xml | 66 ++ .../src/main/assembly/extension-manifests.xml | 19 --- pom.xml| 6 ++ 3 files changed, 71 insertions(+), 20 deletions(-) copy nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/resources/core-site.xml => nifi-assembly/src/main/assembly/extension-manifests.xml (69%)
[nifi] branch main updated: [NIFI-7705] update fronted deps make variable and parameters tables position relative
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6596fb1 [NIFI-7705] update fronted deps make variable and parameters
tables position relative
6596fb1 is described below
commit 6596fb1f8724d6163db3c4f899a57049a8355274
Author: Scott Aslan
AuthorDate: Wed Aug 5 11:15:05 2020 -0400
[NIFI-7705] update fronted deps
make variable and parameters tables position relative
Signed-off-by: Rob Fellows
This closes #4449
---
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 4 +-
.../src/main/frontend/package-lock.json| 130 ++---
.../nifi-web-ui/src/main/frontend/package.json | 4 +-
.../nifi-web-ui/src/main/webapp/css/dialog.css | 1 +
.../webapp/css/new-parameter-context-dialog.css| 1 +
5 files changed, 71 insertions(+), 69 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index 2d9d7d6..d5c41b9 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -23,7 +23,7 @@
nifi-web-ui
war
-v8.10.0
+v12.7.0
true
true
${project.build.directory}/tmp
@@ -389,7 +389,7 @@
npm
---cache-min Infinity install
+--silent ci
${frontend.working.dir}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
index bb1f954..a59b046 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json
@@ -82,9 +82,9 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz;,
"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
"requires": {
-"ansi-styles": "1.0.0",
-"has-color": "0.1.7",
-"strip-ansi": "0.1.1"
+"ansi-styles": "~1.0.0",
+"has-color": "~0.1.0",
+"strip-ansi": "~0.1.0"
}
},
"commander": {
@@ -144,11 +144,11 @@
"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz;,
"integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=",
"requires": {
-"d3-dispatch": "1.0.3",
-"d3-drag": "1.2.1",
-"d3-interpolate": "1.1.6",
-"d3-selection": "1.3.0",
-"d3-transition": "1.1.1"
+"d3-dispatch": "1",
+"d3-drag": "1",
+"d3-interpolate": "1",
+"d3-selection": "1",
+"d3-transition": "1"
}
},
"d3-chord": {
@@ -156,8 +156,8 @@
"resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz;,
"integrity": "sha1-fexPC6iG9xP+ERxF92NBT290yiw=",
"requires": {
-"d3-array": "1.2.1",
-"d3-path": "1.0.5"
+"d3-array": "1",
+"d3-path": "1"
}
},
"d3-collection": {
@@ -180,8 +180,8 @@
"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz;,
"integrity":
"sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
"requires": {
-"d3-dispatch": "1.0.3",
-"d3-selection": "1.3.0"
+"d3-dispatch": "1",
+"d3-selection": "1"
}
},
"d3-dsv": {
@@ -189,9 +189,9 @@
"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz;,
"integrity":
"sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==",
"requ
[nifi] branch master updated: NIFI-7514: - Ensuring the group id is always set in the properties table when loading properties. - Using a common approach to getting parameters in nfControllerService.
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new eb2ebef NIFI-7514: - Ensuring the group id is always set in the
properties table when loading properties. - Using a common approach to getting
parameters in nfControllerService. - Code clean up. - Addressing review
feedback. - Ensuring the service dialog is closed when navigating to the
parameter context dialog.
eb2ebef is described below
commit eb2ebefc4682d3f95ba5c9cbb8f604f5331ec79e
Author: Matt Gilman
AuthorDate: Mon Jun 8 17:05:24 2020 -0400
NIFI-7514:
- Ensuring the group id is always set in the properties table when loading
properties.
- Using a common approach to getting parameters in nfControllerService.
- Code clean up.
- Addressing review feedback.
- Ensuring the service dialog is closed when navigating to the parameter
context dialog.
This closes #4322
---
.../jquery/propertytable/jquery.propertytable.js | 28 +++---
.../webapp/js/nf/canvas/nf-controller-service.js | 14 ++-
.../main/webapp/js/nf/canvas/nf-reporting-task.js | 6 +++--
.../src/main/webapp/js/nf/nf-processor-details.js | 10
4 files changed, 37 insertions(+), 21 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 4acaf94..4b08a31 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -1246,6 +1246,17 @@
};
var initPropertiesTable = function (table, options) {
+// function for closing the dialog
+var closeDialog = function () {
+// close the dialog
+var dialog = table.closest('.dialog');
+if (dialog.hasClass('modal')) {
+dialog.modal('hide');
+} else {
+dialog.hide();
+}
+}
+
// function for formatting the property name
var nameFormatter = function (row, cell, value, columnDef,
dataContext) {
var nameWidthOffset = 30;
@@ -1386,7 +1397,7 @@
}
if (referencesParam && canReadParamContext) {
-markup += '';
+markup += '';
}
if (options.readOnly !== true) {
@@ -1510,12 +1521,7 @@
dataType: 'json'
}).done(function (controllerServiceEntity) {
// close the dialog
-var dialog = table.closest('.dialog');
-if (dialog.hasClass('modal')) {
-dialog.modal('hide');
-} else {
-dialog.hide();
-}
+closeDialog();
var controllerService = controllerServiceEntity.component;
$.Deferred(function (deferred) {
@@ -1616,7 +1622,7 @@
propertyData.updateItem(property.id,
updatedItem);
});
}
-} else if (target.hasClass('goto-to-parameter')) {
+} else if (target.hasClass('go-to-parameter')) {
var parameterContext;
if (_.isFunction(options.getParameterContext)) {
parameterContext =
options.getParameterContext(groupId);
@@ -1627,6 +1633,9 @@
var paramRefsRegex = /#{([a-zA-Z0-9-_. ]+)}/;
var result = property.value.match(paramRefsRegex);
if (!_.isEmpty(result) && result.length === 2) {
+// close the dialog since we are sending the
user to the parameter context
+closeDialog();
+
var parameterName = result[1];
nfParameterContexts.showParameterContext(parameterContext.id, null,
parameterName);
}
@@ -2157,7 +2166,8 @@
},
/**
- * Sets the current group id.
+ * Sets the current group id. This is used to indicate where inline
Controller Services are created
+ * and to obtain the parameter context.
*/
setGroupId: function (currentGroupId) {
return this.each(function () {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canv
[nifi] branch master updated: NIFI-6868: Ensure that when a property value is obtained by calling ProcessContext.getPropertyValue(...).evaluateAttributeExpressions(...).getValue() that we still retain
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new ea31c1f NIFI-6868: Ensure that when a property value is obtained by
calling
ProcessContext.getPropertyValue(...).evaluateAttributeExpressions(...).getValue()
that we still retain the appropriate value even if the property references a
sensitive parameter * Added additional unit tests and updated
ParameterEvaluator to make sure that it follows the same logic as the
ParameterExpression in that sensitive parameters cannot be access from within EL
ea31c1f is described below
commit ea31c1fcbb270031339f75b1d6ca4a157fdb7594
Author: Mark Payne
AuthorDate: Thu Nov 14 13:49:20 2019 -0500
NIFI-6868: Ensure that when a property value is obtained by calling
ProcessContext.getPropertyValue(...).evaluateAttributeExpressions(...).getValue()
that we still retain the appropriate value even if the property references a
sensitive parameter
* Added additional unit tests and updated ParameterEvaluator to make sure
that it follows the same logic as the ParameterExpression in that sensitive
parameters cannot be access from within EL
This closes #3889
Signed-off-by: Rob Fellows
---
.../expression/language/ParameterExpression.java | 14 -
.../nifi/attribute/expression/language/Query.java | 20 ---
.../evaluation/selection/ParameterEvaluator.java | 2 +-
.../language/TestStandardPreparedQuery.java| 32 ++
.../nifi/integration/parameters/ParametersIT.java | 69 ++
5 files changed, 126 insertions(+), 11 deletions(-)
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ParameterExpression.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ParameterExpression.java
index 914a4d5..fe8595f 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ParameterExpression.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ParameterExpression.java
@@ -21,14 +21,24 @@ import org.apache.nifi.parameter.Parameter;
public class ParameterExpression implements Expression {
private final String parameterName;
+private final boolean allowSensitiveParameterReference;
-public ParameterExpression(final String parameterName) {
+public ParameterExpression(final String parameterName, final boolean
allowSensitiveParameterReference) {
this.parameterName = parameterName;
+this.allowSensitiveParameterReference =
allowSensitiveParameterReference;
}
@Override
public String evaluate(final EvaluationContext evaluationContext, final
AttributeValueDecorator decorator) {
final Parameter parameter =
evaluationContext.getParameter(parameterName);
-return parameter == null || parameter.getDescriptor().isSensitive() ?
null : parameter.getValue();
+if (parameter == null) {
+return null;
+}
+
+if (!allowSensitiveParameterReference &&
parameter.getDescriptor().isSensitive()) {
+return null;
+}
+
+return parameter.getValue();
}
}
diff --git
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
index e0f4cf0..5cbdf78 100644
---
a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
+++
b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
@@ -332,19 +332,19 @@ public class Query {
if (range.getStart() > lastIndex) {
String substring =
unescapeLeadingDollarSigns(query.substring(lastIndex, range.getStart()));
-addLiteralsAndParameters(parameterParser, substring,
expressions);
+addLiteralsAndParameters(parameterParser, substring,
expressions, true);
}
-addLiteralsAndParameters(parameterParser, treeText,
expressions);
+addLiteralsAndParameters(parameterParser, treeText,
expressions, true);
}
if (escapedRanges.isEmpty()) {
-addLiteralsAndParameters(parameterParser, query, expressions);
+addLiteralsAndParameters(parameterParser, query, expressions,
true);
} else {
final Range lastRange = escapedRanges.get(escapedRanges.size()
- 1);
if (lastRange.getEnd() + 1 < query.length()) {
final String treeText =
unescapeLead
[nifi] branch master updated: NIFI-6811: - Allowing enterGroup to complete prior to loading the controller service table.
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 9364f7d NIFI-6811: - Allowing enterGroup to complete prior to loading
the controller service table.
9364f7d is described below
commit 9364f7d2e80e7f3695f175d2d3c5d23883ad2ce4
Author: Matt Gilman
AuthorDate: Thu Oct 24 22:51:46 2019 -0400
NIFI-6811:
- Allowing enterGroup to complete prior to loading the controller service
table.
This closes #3846.
---
.../jquery/propertytable/jquery.propertytable.js | 26 ++-
.../webapp/js/nf/canvas/nf-controller-services.js | 38 +++---
2 files changed, 36 insertions(+), 28 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 369551b..4acaf94 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -29,6 +29,7 @@
'nf.Storage',
'nf.Client',
'nf.ErrorHandler',
+'nf.ProcessGroup',
'nf.ProcessGroupConfiguration',
'nf.Settings',
'nf.ParameterContexts',
@@ -41,6 +42,7 @@
nfStorage,
nfClient,
nfErrorHandler,
+ nfProcessGroup,
nfProcessGroupConfiguration,
nfSettings,
nfParameterContexts,
@@ -53,6 +55,7 @@
nfStorage,
nfClient,
nfErrorHandler,
+nfProcessGroup,
nfProcessGroupConfiguration,
nfSettings,
nfParameterContexts,
@@ -67,6 +70,7 @@
require('nf.Storage'),
require('nf.Client'),
require('nf.ErrorHandler'),
+require('nf.ProcessGroup'),
require('nf.ProcessGroupConfiguration'),
require('nf.Settings'),
recuire('nf.ParameterContexts'),
@@ -80,6 +84,7 @@
root.nf.Storage,
root.nf.Client,
root.nf.ErrorHandler,
+root.nf.ProcessGroup,
root.nf.ProcessGroupConfiguration,
root.nf.Settings,
root.nf.ParameterContexts,
@@ -93,6 +98,7 @@
nfStorage,
nfClient,
nfErrorHandler,
+ nfProcessGroup,
nfProcessGroupConfiguration,
nfSettings,
nfParameterContexts,
@@ -1514,15 +1520,17 @@
var controllerService = controllerServiceEntity.component;
$.Deferred(function (deferred) {
if
(nfCommon.isDefinedAndNotNull(controllerService.parentGroupId)) {
-if ($('#process-group-configuration').is(':visible')) {
-
nfProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function
() {
-deferred.resolve();
-});
-} else {
-
nfProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function
() {
-deferred.resolve();
-});
-}
+
nfProcessGroup.enterGroup(controllerService.parentGroupId).done(function () {
+if
($('#process-group-configuration').is(':visible')) {
+
nfProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function
() {
+deferred.resolve();
+});
+} else {
+
nfProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function
() {
+deferred.resolve();
+});
+}
+});
} else {
if ($('#settings').is(':visible')) {
// reload the settings
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
b/nifi-nar
[nifi] branch master updated: NIFI-6769: - Ensuring the users policy listing can handle when the specified policy is unknown.
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new ed1e843 NIFI-6769: - Ensuring the users policy listing can handle
when the specified policy is unknown.
ed1e843 is described below
commit ed1e843609af32711daac88bd423428b86a58a7c
Author: Matt Gilman
AuthorDate: Thu Oct 10 11:06:10 2019 -0400
NIFI-6769:
- Ensuring the users policy listing can handle when the specified policy is
unknown.
This closes #3807.
---
.../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 24 -
.../src/main/webapp/js/nf/users/nf-users-table.js | 30 +-
2 files changed, 41 insertions(+), 13 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index c7ca1ea..77d5847 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -1709,13 +1709,25 @@
return formattedGarbageCollections;
},
+/**
+ * Returns whether the specified resource is for a global policy.
+ *
+ * @param resource
+ */
+isGlobalPolicy: function (value) {
+return nfCommon.getPolicyTypeListing(value) !== null;
+},
+
+/**
+ * Gets the policy type for the specified resource.
+ *
+ * @param value
+ * @returns {*}
+ */
getPolicyTypeListing: function (value) {
-var nest = d3.nest()
-.key(function (d) {
-return d.value;
-})
-.map(policyTypeListing, d3.map);
-return nest.get(value)[0];
+return policyTypeListing.find(function (policy) {
+return value === policy.value;
+});
},
/**
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
index 93a8edd..b10385b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js
@@ -534,12 +534,21 @@
/**
* Generates a human readable global policy string.
*
+ * @param policy
+ * @returns {string}
+ */
+var globalResourceParser = function (policy) {
+return 'Global policy to ' + policy.text;
+};
+
+/**
+ * Generates a human readable policy string for an unknown resource.
+ *
* @param dataContext
* @returns {string}
*/
-var globalResourceParser = function (dataContext) {
-return 'Global policy to ' +
-
nfCommon.getPolicyTypeListing(nfCommon.substringAfterFirst(dataContext.component.resource,
'/')).text;
+var unknownResourceParser = function (dataContext) {
+return 'Unknown resource ' +
nfCommon.escapeHtml(dataContext.component.resource) + '';
};
/**
@@ -991,12 +1000,19 @@
if
(dataContext.component.resource.startsWith('/restricted-components')) {
// restricted components policy
return restrictedComponentResourceParser(dataContext);
-} else if
(nfCommon.isUndefinedOrNull(dataContext.component.componentReference)) {
-// global policy
-return globalResourceParser(dataContext);
-} else {
+} else if
(nfCommon.isDefinedAndNotNull(dataContext.component.componentReference)) {
// not restricted/global policy... check if user has access to the
component reference
return componentResourceParser(dataContext);
+} else {
+// may be a global policy
+var policy =
nfCommon.getPolicyTypeListing(nfCommon.substringAfterFirst(dataContext.component.resource,
'/'));
+
+// if known global policy, format it otherwise format as unknown
+if (nfCommon.isDefinedAndNotNull(policy)) {
+return globalResourceParser(policy);
+} else {
+return unknownResourceParser(dataContext);
+}
}
};
[nifi] branch master updated: NIFI-6751: - Fixing the identifier on the user table. In a previous task, this was changed to utilize the URI but that does not work with other code interacting with this
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/master by this push: new 9a496fe NIFI-6751: - Fixing the identifier on the user table. In a previous task, this was changed to utilize the URI but that does not work with other code interacting with this table. 9a496fe is described below commit 9a496fe9d2681fca06fb6f071d0fa39d71bc5268 Author: Matt Gilman AuthorDate: Wed Oct 9 10:55:06 2019 -0400 NIFI-6751: - Fixing the identifier on the user table. In a previous task, this was changed to utilize the URI but that does not work with other code interacting with this table. This closes #3798. --- .../nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js index 496dba9..9c6a522 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js @@ -1342,7 +1342,7 @@ }); // set the rows -usersData.setItems(users, 'uri'); +usersData.setItems(users); // end the update usersData.endUpdate(); @@ -1358,4 +1358,4 @@ }; return nfUsersTable; -})); \ No newline at end of file +}));
