Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-13147 

Remove include-new-ui profile and include it by default always.
This closes #8749.

Signed-off-by: Joseph Witt <joewitt@apache.org>
This commit is contained in:
Matt Gilman 2024-05-06 10:47:57 -04:00 committed by Joseph Witt
parent 68a885d390
commit b0ace45b55
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
5 changed files with 13 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -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

3
.github/workflows/ci-workflow.yml vendored
View File

@ -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:

15
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/README.md
View File

@ -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

50
nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
View File

@ -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>

25
nifi-framework-bundle/nifi-server-nar/pom.xml
View File

@ -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>