This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit b0ace45b554b0a81ffa86ad4e86cc1a486239675
Author: Matt Gilman <matt.c.gil...@gmail.com>
AuthorDate: Mon May 6 10:47:57 2024 -0400
NIFI-13147
Remove include-new-ui profile and include it by default always.
This closes #8749.
Signed-off-by: Joseph Witt <joew...@apache.org>
---
.github/PULL_REQUEST_TEMPLATE.md | 2 +-
.github/workflows/ci-workflow.yml | 3 --
.../nifi-web-frontend/src/main/nifi/README.md | 15 +++----
.../nifi-framework/nifi-web/pom.xml | 50 +---------------------
nifi-framework-bundle/nifi-server-nar/pom.xml | 25 +++--------
5 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4d507003bf..b459fbbb3a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -44,7 +44,7 @@ Please indicate the verification steps performed prior to
pull request creation.
### 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).
+- [ ] NiFi is modernizing its UI. Any contributions that update the [current
UI](https://github.com/apache/nifi/tree/main/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-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi).
### Licensing
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index bd63b1296c..c5a9a02ce5 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -53,7 +53,6 @@ env:
-pl -:nifi-nar-provider-assembly
-pl -:nifi-py4j-integration-tests
-pl -:nifi-python-extensions-bundle
- -P include-new-ui
MAVEN_VERIFY_COMMAND: >-
verify
--show-version
@@ -63,7 +62,6 @@ env:
-D dir-only
MAVEN_BUILD_PROFILES: >-
-P skip-nifi-bin-assembly
- -P include-new-ui
MAVEN_PROJECTS: >-
-pl -minifi/minifi-assembly
-pl -minifi/minifi-toolkit/minifi-toolkit-assembly
@@ -114,7 +112,6 @@ jobs:
--no-transfer-progress
--fail-fast
-P contrib-check
- -P include-new-ui
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md
index a846a526db..3c9a5e1caa 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md
@@ -6,17 +6,12 @@ This module is the primary UI for NiFi. It contains the
canvas and all UI's for
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.
+On startup, NiFi has been updated to locate the new UI and deploy it to a new
context path (`/nf`). 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`).
-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 anymore.
+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. At that time
+the context path for the new UI will be updated to use `/nifi`. Following
this, the logout redirection issue called out above won’t be a problem anymore.
## Source Structure
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
b/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
index e3eada5d8d..6ce20781e0 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
@@ -31,57 +31,9 @@
<module>nifi-web-docs</module>
<module>nifi-web-content-viewer</module>
<module>nifi-web-ui</module>
+ <module>nifi-web-frontend</module>
<module>nifi-jetty</module>
<module>nifi-web-content-access</module>
<module>nifi-ui-extension</module>
</modules>
-
- <!-- Only include the new UI if the profile is active -->
- <profiles>
- <profile>
- <id>include-new-ui</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>include-new-ui</name>
- </property>
- </activation>
- <modules>
- <module>nifi-web-frontend</module>
- </modules>
- </profile>
- <profile>
- <id>apply-nifi-web-frontend-rat-config</id>
- <activation>
- <property>
- <name>!include-new-ui</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
-
<exclude>nifi-web-frontend/src/main/nifi/coverage/**/*</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/node_modules/**/*</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/src/assets/fonts/**/*</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/.editorconfig</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/README.md</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/proxy.config.mjs</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/.prettierignore</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/.prettierrc</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/src/.eslintrc</exclude>
-
<exclude>nifi-web-frontend/target/**/*</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/dist/**/*</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/.angular/**/*</exclude>
-
<exclude>nifi-web-frontend/src/main/nifi/.nx/**/*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/nifi-framework-bundle/nifi-server-nar/pom.xml
b/nifi-framework-bundle/nifi-server-nar/pom.xml
index cc3d470a93..e54cf11d1f 100644
--- a/nifi-framework-bundle/nifi-server-nar/pom.xml
+++ b/nifi-framework-bundle/nifi-server-nar/pom.xml
@@ -60,29 +60,16 @@
<version>2.0.0-SNAPSHOT</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-web-frontend</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>include-new-ui</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>include-new-ui</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-frontend</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
