NIFI-12260: Remove templates from frontend (apache#7924)

* remove templates from frontend * remove more references to removed files * removing more template references * remove unused css template styles
exceptionfactory · Oct 26, 2023 · c4ff8de · c4ff8de
1 parent 361e31f
commit c4ff8de
Show file tree

Hide file tree

Showing 28 changed files with 6 additions and 1,925 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
@@ -31,7 +31,6 @@
         <summary.filter>summary.properties</summary.filter>
         <counters.filter>counters.properties</counters.filter>
         <cluster.filter>cluster.properties</cluster.filter>
-        <templates.filter>templates.properties</templates.filter>
         <users.filter>users.properties</users.filter>
         <bulletin.board.filter>bulletin-board.properties</bulletin.board.filter>
         <login.filter>login.properties</login.filter>
@@ -58,7 +57,6 @@
             <filter>src/main/resources/filters/${summary.filter}</filter>
             <filter>src/main/resources/filters/${counters.filter}</filter>
             <filter>src/main/resources/filters/${cluster.filter}</filter>
-            <filter>src/main/resources/filters/${templates.filter}</filter>
             <filter>src/main/resources/filters/${users.filter}</filter>
             <filter>src/main/resources/filters/${bulletin.board.filter}</filter>
             <filter>src/main/resources/filters/${login.filter}</filter>
@@ -95,7 +93,6 @@
                                 **/provenance.jsp,
                                 **/counters.jsp,
                                 **/cluster.jsp,
-                                **/templates.jsp,
                                 **/users.jsp,
                                 **/bulletin-board.jsp,
                                 **/login.jsp,
@@ -328,14 +325,6 @@
                             </includes>
                             <filtering>true</filtering>
                         </resource>
-                        <resource>
-                            <directory>src/main/webapp/WEB-INF/pages</directory>
-                            <targetPath>WEB-INF/pages</targetPath>
-                            <includes>
-                                <include>templates.jsp</include>
-                            </includes>
-                            <filtering>true</filtering>
-                        </resource>
                         <resource>
                             <directory>src/main/webapp/WEB-INF/pages</directory>
                             <targetPath>WEB-INF/pages</targetPath>
@@ -449,7 +438,6 @@
                 <summary.filter>summary-min.properties</summary.filter>
                 <counters.filter>counters-min.properties</counters.filter>
                 <cluster.filter>cluster-min.properties</cluster.filter>
-                <templates.filter>templates-min.properties</templates.filter>
                 <users.filter>users-min.properties</users.filter>
                 <bulletin.board.filter>bulletin-board-min.properties</bulletin.board.filter>
                 <login.filter>login-min.properties</login.filter>
@@ -558,7 +546,6 @@
                                                 <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-group-component.js</include>
                                                 <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-remote-process-group-component.js</include>
                                                 <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-funnel-component.js</include>
-                                                <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-template-component.js</include>
                                                 <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-registry-import-component.js</include>
                                                 <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-label-component.js</include>
                                                 <include>${staging.dir}/js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js</include>
@@ -663,21 +650,6 @@
                                                 <include>${staging.dir}/js/nf/users/nf-users.js</include>
                                             </includes>
                                         </aggregation>
-                                        <aggregation>
-                                            <insertNewLine>true</insertNewLine>
-                                            <output>${project.build.directory}/${project.build.finalName}/js/nf/templates/nf-templates-all.js</output>
-                                            <includes>
-                                                <include>${staging.dir}/js/nf/nf-dialog.js</include>
-                                                <include>${staging.dir}/js/nf/nf-authorization-storage.js</include>
-                                                <include>${staging.dir}/js/nf/nf-storage.js</include>
-                                                <include>${staging.dir}/js/nf/nf-common.js</include>
-                                                <include>${staging.dir}/js/nf/nf-error-handler.js</include>
-                                                <include>${staging.dir}/js/nf/nf-universal-capture.js</include>
-                                                <include>${staging.dir}/js/nf/nf-ajax-setup.js</include>
-                                                <include>${staging.dir}/js/nf/templates/nf-templates-table.js</include>
-                                                <include>${staging.dir}/js/nf/templates/nf-templates.js</include>
-                                            </includes>
-                                        </aggregation>
                                         <aggregation>
                                             <insertNewLine>true</insertNewLine>
                                             <output>${project.build.directory}/${project.build.finalName}/js/nf/cluster/nf-cluster-all.js</output>
@@ -843,16 +815,6 @@
                                                 <include>${staging.dir}/css/users.css</include>
                                             </includes>
                                         </aggregation>
-                                        <aggregation>
-                                            <insertNewLine>true</insertNewLine>
-                                            <output>${project.build.directory}/${project.build.finalName}/css/nf-templates-all.css</output>
-                                            <includes>
-                                                <include>${staging.dir}/css/main.css</include>
-                                                <include>${staging.dir}/css/banner.css</include>
-                                                <include>${staging.dir}/css/dialog.css</include>
-                                                <include>${staging.dir}/css/templates.css</include>
-                                            </includes>
-                                        </aggregation>
                                         <aggregation>
                                             <insertNewLine>true</insertNewLine>
                                             <output>${project.build.directory}/${project.build.finalName}/css/nf-bulletin-board-all.css</output>
@@ -911,7 +873,6 @@
                                 css/nf-counters-all.css,
                                 css/nf-cluster-all.css,
                                 css/nf-users-all.css,
-                                css/nf-templates-all.css,
                                 css/nf-bulletin-board-all.css,
                                 css/nf-login-all.css,
                                 css/nf-logout-all.css,
@@ -935,7 +896,6 @@
                                 js/nf/counters/nf-counters-all.js,
                                 js/nf/cluster/nf-cluster-all.js,
                                 js/nf/users/nf-users-all.js,
-                                js/nf/templates/nf-templates-all.js,
                                 js/nf/bulletin-board/nf-bulletin-board-all.js,
                                 js/nf/login/nf-login-all.js,
                                 js/nf/logout/nf-logout-all.js,

diff --git a/...k-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties b/...k-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties
@@ -88,7 +88,6 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-ng-bridge.js?
 <script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-group-component.js?${project.version}"></script>\n\
 <script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-remote-process-group-component.js?${project.version}"></script>\n\
 <script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-funnel-component.js?${project.version}"></script>\n\
-<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-template-component.js?${project.version}"></script>\n\
 <script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-registry-import-component.js?${project.version}"></script>\n\
 <script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-label-component.js?${project.version}"></script>\n\
 <script type="text/javascript" src="js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js?${project.version}"></script>\n\

diff --git a/...e/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates-min.properties b/...e/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates-min.properties
diff --git a/...undle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties b/...undle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties
diff --git a/...ework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/...ework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -119,9 +119,6 @@
         <jsp:include page="/WEB-INF/partials/canvas/new-port-dialog.jsp"/>
         <jsp:include page="/WEB-INF/partials/canvas/new-process-group-dialog.jsp"/>
         <jsp:include page="/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp"/>
-        <jsp:include page="/WEB-INF/partials/canvas/new-template-dialog.jsp"/>
-        <jsp:include page="/WEB-INF/partials/canvas/upload-template-dialog.jsp"/>
-        <jsp:include page="/WEB-INF/partials/canvas/instantiate-template-dialog.jsp"/>
         <jsp:include page="/WEB-INF/partials/canvas/fill-color-dialog.jsp"/>
         <jsp:include page="/WEB-INF/partials/canvas/connections-dialog.jsp"/>
         <jsp:include page="/WEB-INF/partials/canvas/save-flow-version-dialog.jsp"/>

diff --git a/...rk-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp b/...rk-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
diff --git a/...eb/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp b/...eb/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
@@ -17,7 +17,7 @@
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
 <div id="bulletin-board">
     <div id="bulletin-board-header-and-filter">
-        <div id="bulletin-board-header-text">NiFi Templates</div>
+        <div id="bulletin-board-header-text"></div>
         <div id="bulletin-board-filter-controls">
             <div id="bulletin-board-filter-container" class="filter-container">
                 <input type="text" placeholder="Filter" id="bulletin-board-filter" class="filter"/>

diff --git a/...-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp b/...-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
@@ -174,13 +174,6 @@
                         </a>
                     </md-menu-item>
                     <md-menu-divider></md-menu-divider>
-                    <md-menu-item layout-align="space-around center">
-                        <a id="templates-link"
-                           ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();">
-                            <i class="icon icon-template"></i>Templates
-                        </a>
-                    </md-menu-item>
-                    <md-menu-divider></md-menu-divider>
                     <md-menu-item layout-align="space-around center">
                         <a id="help-link"
                            ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();">

diff --git a/...i-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp b/...i-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp