From 42dcd3afeadfe95eef07567900772ba0c09789cc Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Fri, 15 Jun 2018 10:04:49 -0400 Subject: [PATCH 1/6] [NIFIREG-39] leverage nifi-fds 0.1.0 npm package --- nifi-registry-web-ui/pom.xml | 57 +---- .../src/main/frontend/Gruntfile.js | 14 -- .../src/main/frontend/karma.conf.js | 12 +- .../src/main/frontend/package.json | 41 ++-- .../src/main/platform/core/README.md | 33 --- .../platform/core/common/fds-common.module.js | 48 ---- .../common/services/fds-storage.service.js | 219 ------------------ .../core/common/styles/_basicElements.scss | 130 ----------- .../core/common/styles/_buttonToggles.scss | 98 -------- .../platform/core/common/styles/_buttons.scss | 214 ----------------- .../core/common/styles/_checkboxes.scss | 85 ------- .../platform/core/common/styles/_chips.scss | 69 ------ .../core/common/styles/_expansionPanels.scss | 62 ----- .../core/common/styles/_globalVars.scss | 69 ------ .../core/common/styles/_helperClasses.scss | 85 ------- .../platform/core/common/styles/_inputs.scss | 109 --------- .../platform/core/common/styles/_links.scss | 35 --- .../platform/core/common/styles/_menus.scss | 118 ---------- .../platform/core/common/styles/_modals.scss | 23 -- .../platform/core/common/styles/_panels.scss | 54 ----- .../platform/core/common/styles/_radios.scss | 56 ----- .../platform/core/common/styles/_sideNav.scss | 20 -- .../platform/core/common/styles/_stepper.scss | 20 -- .../platform/core/common/styles/_tables.scss | 118 ---------- .../platform/core/common/styles/_tabs.scss | 41 ---- .../core/common/styles/_tooltips.scss | 24 -- .../common/styles/fluid-design-system.scss | 35 --- .../core/dialogs/_fds-dialog-component.scss | 21 -- .../confirm-dialog.component.html | 45 ---- .../confirm-dialog.component.js | 64 ----- .../core/dialogs/fds-dialog.component.html | 29 --- .../core/dialogs/fds-dialog.component.js | 82 ------- .../core/dialogs/fds-dialogs.module.js | 87 ------- .../core/dialogs/services/dialog.service.js | 134 ----------- .../core/fluid-design-system.module.js | 155 ------------- .../snackbars/coaster/_coaster.component.scss | 63 ----- .../snackbars/coaster/coaster.component.html | 33 --- .../snackbars/coaster/coaster.component.js | 70 ------ .../snackbars/fds-snackbar.component.html | 29 --- .../core/snackbars/fds-snackbar.component.js | 82 ------- .../core/snackbars/fds-snackbars.module.js | 87 ------- .../snackbars/services/snackbar.service.js | 132 ----------- .../platform/core/theming/_all-theme.scss | 36 --- .../resources/filters/registry-min.properties | 2 +- .../resources/filters/registry.properties | 2 +- .../src/main/webapp/WEB-INF/web.xml | 10 - .../nf-registry-administration.spec.js | 2 +- .../nf-registry-add-user-to-groups.js | 2 +- .../nf-registry-add-user-to-groups.spec.js | 2 +- .../dialogs/add-user/nf-registry-add-user.js | 2 +- .../nf-registry-add-users-to-group.js | 2 +- .../nf-registry-add-users-to-group.spec.js | 2 +- .../nf-registry-create-new-group.js | 2 +- .../users/nf-registry-users-administration.js | 2 +- .../nf-registry-users-adminstration.spec.js | 2 +- .../manage-group/nf-registry-manage-group.js | 4 +- .../nf-registry-manage-group.spec.js | 2 +- .../manage-user/nf-registry-manage-user.js | 4 +- .../nf-registry-manage-user.spec.js | 2 +- .../nf-registry-add-policy-to-bucket.js | 2 +- .../nf-registry-create-bucket.js | 2 +- ...f-registry-workflow-administration.spec.js | 2 +- .../nf-registry-manage-bucket.js | 4 +- .../nf-registry-manage-bucket.spec.js | 2 +- ...f-registry-bucket-grid-list-viewer.spec.js | 2 +- ...-registry-droplet-grid-list-viewer.spec.js | 2 +- .../nf-registry-grid-list-viewer.spec.js | 2 +- .../explorer/nf-registry-explorer.spec.js | 2 +- .../nf-registry-page-not-found.js | 2 +- .../src/main/webapp/nf-registry.module.js | 2 +- .../src/main/webapp/nf-registry.spec.js | 2 +- .../main/webapp/services/nf-registry.api.js | 2 +- .../webapp/services/nf-registry.api.spec.js | 2 +- .../nf-registry.auth-guard.service.js | 2 +- .../webapp/services/nf-registry.service.js | 4 +- .../services/nf-registry.service.spec.js | 4 +- .../main/webapp/systemjs.builder.config.js | 44 +++- .../src/main/webapp/systemjs.spec.config.js | 44 +++- .../webapp/theming/_structureElements.scss | 1 + .../users/_structureElements.scss | 6 +- .../workflow/_structureElements.scss | 6 +- .../src/main/webapp/theming/nf-registry.scss | 4 +- 82 files changed, 149 insertions(+), 3078 deletions(-) delete mode 100644 nifi-registry-web-ui/src/main/platform/core/README.md delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/fds-common.module.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/services/fds-storage.service.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_basicElements.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_buttonToggles.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_checkboxes.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_chips.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_expansionPanels.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_globalVars.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_helperClasses.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_inputs.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_links.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_menus.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_modals.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_panels.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_radios.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_sideNav.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_stepper.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_tables.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_tabs.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/_tooltips.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/common/styles/fluid-design-system.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/_fds-dialog-component.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.html delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialogs.module.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/dialogs/services/dialog.service.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/fluid-design-system.module.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/_coaster.component.scss delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.html delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.html delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbars.module.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/snackbars/services/snackbar.service.js delete mode 100644 nifi-registry-web-ui/src/main/platform/core/theming/_all-theme.scss diff --git a/nifi-registry-web-ui/pom.xml b/nifi-registry-web-ui/pom.xml index f4a0bea75..2b4a4e044 100644 --- a/nifi-registry-web-ui/pom.xml +++ b/nifi-registry-web-ui/pom.xml @@ -151,29 +151,6 @@ - - - copy-fluid-design-system - process-sources - - copy-resources - - - ${frontend.working.dir}/node_modules/@fluid-design-system/dist - - - - ${frontend.working.dir} - false - - platform/**/* - - - - - @@ -191,11 +168,11 @@ false - roboto-fontface/fonts/Roboto-Slab/Roboto-Slab-Regular.ttf - roboto-fontface/fonts/Roboto/Roboto-Regular.ttf - roboto-fontface/fonts/Roboto/Roboto-Medium.ttf - roboto-fontface/fonts/Roboto/Roboto-Light.ttf - roboto-fontface/fonts/Roboto/Roboto-Bold.ttf + roboto-fontface/fonts/roboto-slab/Roboto-Slab-Regular.ttf + roboto-fontface/fonts/roboto/Roboto-Regular.ttf + roboto-fontface/fonts/roboto/Roboto-Medium.ttf + roboto-fontface/fonts/roboto/Roboto-Light.ttf + roboto-fontface/fonts/roboto/Roboto-Bold.ttf roboto-fontface/LICENSE* @covalent/core/common/platform.css @@ -203,10 +180,10 @@ @covalent/core/common/styles/font/MaterialIcons-Regular.ttf @covalent/core/README.md - - @fluid-design-system/dist/platform/core/common/styles/css/* - - @fluid-design-system/dist/platform/core/LICENSE.md + @nifi-fds/core/common/styles/css/* + @nifi-fds/core/LICENSE + @nifi-fds/core/NOTICE + @nifi-fds/core/README.md font-awesome/css/font-awesome.css font-awesome/fonts/fontawesome-webfont.woff2 @@ -299,20 +276,6 @@ ${frontend.working.dir} - - - grunt-compile-fds-sass - - grunt - - generate-sources - - compile-fds-styles - ${frontend.working.dir} - - @@ -483,7 +446,7 @@ ${frontend.working.dir}/node_modules false - @fluid-design-system/**/* + @nifi-fds/**/* @angular/**/* hammerjs/**/* @covalent/**/* diff --git a/nifi-registry-web-ui/src/main/frontend/Gruntfile.js b/nifi-registry-web-ui/src/main/frontend/Gruntfile.js index 5ec5c61d7..2f7177053 100644 --- a/nifi-registry-web-ui/src/main/frontend/Gruntfile.js +++ b/nifi-registry-web-ui/src/main/frontend/Gruntfile.js @@ -25,11 +25,6 @@ module.exports = function (grunt) { outputStyle: 'compressed', sourceMap: true }, - minifyFds: { - files: [{ - './platform/core/common/styles/css/fluid-design-system.min.css': ['./platform/core/common/styles/fluid-design-system.scss'] - }] - }, minifyWebUi: { files: [{ './webapp/css/nf-registry.min.css': ['./webapp/theming/nf-registry.scss'] @@ -74,18 +69,9 @@ module.exports = function (grunt) { dest: './', ext: '.min.css.gz' }] - }, - fdsStyles: { - files: [{ - expand: true, - src: ['./platform/core/common/styles/css/fluid-design-system.min.css'], - dest: './', - ext: '.min.css.gz' - }] } } }); - grunt.registerTask('compile-fds-styles', ['sass:minifyFds', 'compress:fdsStyles']); grunt.registerTask('compile-web-ui-styles', ['sass:minifyWebUi', 'compress:webUiStyles']); grunt.registerTask('bundle-web-ui', ['systemjs:bundleWebUi', 'compress:webUi']); }; diff --git a/nifi-registry-web-ui/src/main/frontend/karma.conf.js b/nifi-registry-web-ui/src/main/frontend/karma.conf.js index ca61a89f5..669715268 100644 --- a/nifi-registry-web-ui/src/main/frontend/karma.conf.js +++ b/nifi-registry-web-ui/src/main/frontend/karma.conf.js @@ -77,7 +77,7 @@ module.exports = function (config) { {pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false}, {pattern: 'node_modules/@covalent/**/*.js', included: false, watched: false}, {pattern: 'node_modules/@covalent/**/*.js.map', included: false, watched: false}, - {pattern: 'node_modules/@fluid-design-system/**/*.js', included: false, watched: false}, + {pattern: 'node_modules/@nifi-fds/**/*.js', included: false, watched: false}, {pattern: 'node_modules/jquery/**/*.js', included: false, watched: false}, {pattern: 'node_modules/roboto-fontface/**/*.ttf', included: false, watched: false}, {pattern: 'node_modules/angular2-moment/**/*.js', included: false, watched: false}, @@ -88,23 +88,23 @@ module.exports = function (config) { {pattern: appBase + 'systemjs.spec.config.js', included: false, watched: false}, 'karma-test-shim.js', // optionally extend SystemJS mapping e.g., with barrels - // Include the Fluid Design System (which includes the Teradata Covalent and + // Include the Flow Design System (which includes the Teradata Covalent and // Angular Material themes) in the test suite. { - pattern: 'node_modules/@fluid-design-system/dist/platform/core/common/styles/css/*.min.css', + pattern: 'node_modules/@nifi-fds/core/common/styles/css/*.min.css', included: true, watched: true, served: true }, { - pattern: 'node_modules/@fluid-design-system/dist/platform/core/**/*.html', + pattern: 'node_modules/@nifi-fds/core/**/*.html', included: true, watched: true, served: true }, // Include the Nifi Registry styles (currently built based off of the - // @fluid-design-system/dist/platform/core/common/styles/_globalVars.scss) + // @nifi-fds/core/common/styles/_globalVars.scss) { pattern: 'webapp/css/*.css', included: true, @@ -121,7 +121,7 @@ module.exports = function (config) { {pattern: '**/*.svg', watched: false, included: true, served: true}, // Paths for debugging with source maps in dev tools - {pattern: 'node_modules/@fluid-design-system/dist/platform/**/*.css.map', included: false, watched: false}, + {pattern: 'node_modules/@nifi-fds/core/**/*.css.map', included: false, watched: false}, {pattern: appBase + '**/*.js.map', included: false, watched: false}, {pattern: appBase + '**/*.css.map', included: false, watched: false}, {pattern: appBase + '**/*.js', included: false, watched: false} diff --git a/nifi-registry-web-ui/src/main/frontend/package.json b/nifi-registry-web-ui/src/main/frontend/package.json index 896439720..85ef8c713 100644 --- a/nifi-registry-web-ui/src/main/frontend/package.json +++ b/nifi-registry-web-ui/src/main/frontend/package.json @@ -14,34 +14,35 @@ }, "dependencies": { "querystring": "0.2.0", - "reset-css": "2.2.0", - "rxjs": "5.4.3", - "superagent": "3.6.3", - "systemjs": "0.20.17", + "reset-css": "4.0.1", + "rxjs": "5.5.6", + "superagent": "3.8.3", + "systemjs": "0.21.3", "systemjs-plugin-text": "0.0.11", - "zone.js": "0.8.7", + "zone.js": "0.8.26", "tslib": "1.8.0", "material-design-icons": "3.0.1", - "jquery": "3.2.1", - "@angular/animations": "4.4.6", - "@angular/cdk": "2.0.0-beta.12", - "@angular/common": "4.4.6", - "@angular/compiler": "4.4.6", - "@angular/core": "4.4.6", - "@angular/flex-layout": "2.0.0-beta.9", - "@angular/forms": "4.4.6", - "@angular/http": "4.4.6", - "@angular/material": "2.0.0-beta.12", - "@angular/platform-browser": "4.4.6", - "@angular/platform-browser-dynamic": "4.4.6", - "@angular/router": "4.4.6", + "jquery": "3.3.1", + "@angular/animations": "5.2.0", + "@angular/cdk": "5.2.0", + "@angular/common": "5.2.0", + "@angular/compiler": "5.2.0", + "@angular/core": "5.2.0", + "@angular/flex-layout": "5.0.0-beta.14", + "@angular/forms": "5.2.0", + "@angular/http": "5.2.0", + "@angular/material": "5.2.0", + "@angular/platform-browser": "5.2.0", + "@angular/platform-browser-dynamic": "5.2.0", + "@angular/router": "5.2.0", "angular2-jwt": "0.2.3", - "@covalent/core": "1.0.0-beta.8-1", + "@covalent/core": "1.0.0", + "@nifi-fds/core": "0.1.0", "angular2-moment": "1.9.0", "font-awesome": "4.7.0", "moment": "2.22.1", "hammerjs": "2.0.8", - "roboto-fontface": "0.7.0" + "roboto-fontface": "0.9.0" }, "devDependencies": { "canonical-path": "0.0.2", diff --git a/nifi-registry-web-ui/src/main/platform/core/README.md b/nifi-registry-web-ui/src/main/platform/core/README.md deleted file mode 100644 index 2981e882c..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# Fluid Design System (FDS) - -FDS NiFi Registry UI/UX Platform for layouts, icons, custom components and themes. This should be added as a dependency for any project that wants to use layouts, icons and themes for Angular Material or Teradata Covalent. - -The FDS will have custom components that enforce standards and best practices through built-in design patterns. - -## Setup - -Import the **[FluidDesignSystemModule]** in your NgModule: - -```javascript -var fdsCore = require('@fluid-design-system/core'); -NfRegistryAppModule.prototype = { - constructor: NfRegistryAppModule -}; - -NfRegistryAppModule.annotations = [ - new ngCore.NgModule({ - imports: [ - fdsCore, - ... - ], - ... -}) -... -``` - - -## Styles, Icons and Theming - -See [theming](https://github.com/apache/nifi-registry.github.io) in the docs for more info (TBD). - -FDS NiFi Registry UI/UX Platform comes with a base CSS file `@fluid-design-system/core/common/styles/css/fluid-design-system.css` (includes icons). diff --git a/nifi-registry-web-ui/src/main/platform/core/common/fds-common.module.js b/nifi-registry-web-ui/src/main/platform/core/common/fds-common.module.js deleted file mode 100644 index 32b551240..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/fds-common.module.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); -var fdsStorageServiceModule = require('@fluid-design-system/storage-service'); - -/** - * FdsCommonsModule constructor. - * - * @constructor - */ -function FdsCommonsModule() { - -}; - -FdsCommonsModule.prototype = { - constructor: FdsCommonsModule -}; - -FdsCommonsModule.annotations = [ - new ngCore.NgModule({ - imports: [], - declarations: [], - exports: [], - providers: [ - fdsStorageServiceModule.FdsStorageService - ] - }) -]; - -module.exports = { - FdsCommonsModule: FdsCommonsModule, - FdsStorageService: fdsStorageServiceModule.FdsStorageService -}; diff --git a/nifi-registry-web-ui/src/main/platform/core/common/services/fds-storage.service.js b/nifi-registry-web-ui/src/main/platform/core/common/services/fds-storage.service.js deleted file mode 100644 index 8dff6792b..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/services/fds-storage.service.js +++ /dev/null @@ -1,219 +0,0 @@ -/* - * 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. - */ - -// Store items for two days before being eligible for removal. -var MILLIS_PER_DAY = 86400000; -var TWO_DAYS = MILLIS_PER_DAY * 2; - -var isUndefined = function (obj) { - return typeof obj === 'undefined'; -}; - -var isNull = function (obj) { - return obj === null; -}; - -var isDefinedAndNotNull = function (obj) { - return !isUndefined(obj) && !isNull(obj); -}; - -/** - * Checks the expiration for the specified entry. - * - * @param {object} entry - * @returns {boolean} - */ -var checkExpiration = function (entry) { - if (isDefinedAndNotNull(entry.expires)) { - // get the expiration - var expires = new Date(entry.expires); - var now = new Date(); - - // return whether the expiration date has passed - return expires.valueOf() < now.valueOf(); - } else { - return false; - } -}; - -/** - * Gets an enty for the key. The entry expiration is not checked. - * - * @param {string} key - */ -var getEntry = function (key) { - try { - // parse the entry - var entry = JSON.parse(localStorage.getItem(key)); - - // ensure the entry and item are present - if (isDefinedAndNotNull(entry)) { - return entry; - } else { - return null; - } - } catch (e) { - return null; - } -}; - -/** - * FdsStorageService constructor. - * @constructor - */ -function FdsStorageService() { -}; - -FdsStorageService.prototype = { - constructor: FdsStorageService, - /** - * Initializes the storage. Items will be persisted for two days. Once the scripts runs - * thereafter, all eligible items will be removed. This strategy does not support persistence. - */ - init: function () { - for (var i = 0; i < localStorage.length; i++) { - try { - // get the next item - var key = localStorage.key(i); - - // attempt to get the item which will expire if necessary - this.getItem(key); - } catch (e) { - } - } - }, - - /** - * Stores the specified item. - * - * @param {string} key - * @param {object} item - * @param {integer} expires - */ - setItem: function (key, item, expires) { - // calculate the expiration - expires = isDefinedAndNotNull(expires) ? expires : new Date().valueOf() + TWO_DAYS; - - // create the entry - var entry = { - expires: expires, - item: item - }; - - // store the item - localStorage.setItem(key, JSON.stringify(entry)); - }, - - /** - * Returns whether there is an entry for this key. This will not check the expiration. If - * the entry is expired, it will return null on a subsequent getItem invocation. - * - * @param {string} key - * @returns {boolean} - */ - hasItem: function (key) { - return getEntry(key) !== null; - }, - - /** - * Gets the item with the specified key. If an item with this key does - * not exist, null is returned. If an item exists but cannot be parsed - * or is malformed/unrecognized, null is returned. - * - * @param {type} key - */ - getItem: function (key) { - var entry = getEntry(key); - if (entry === null) { - return null; - } - - // if the entry is expired, drop it and return null - if (checkExpiration(entry)) { - this.removeItem(key); - return null; - } - - // if the entry has the specified field return its value - if (isDefinedAndNotNull(entry['item'])) { - return entry['item']; - } else { - return null; - } - }, - - /** - * Gets the expiration for the specified item. This will not check the expiration. If - * the entry is expired, it will return null on a subsequent getItem invocation. - * - * @param {string} key - * @returns {integer} - */ - getItemExpiration: function (key) { - var entry = getEntry(key); - if (entry === null) { - return null; - } - - // if the entry has the specified field return its value - if (isDefinedAndNotNull(entry['expires'])) { - return entry['expires']; - } else { - return null; - } - }, - - /** - * Extracts the subject from the specified jwt. If the jwt is not as expected - * an empty string is returned. - * - * @param {string} jwt - * @returns {string} - */ - getJwtPayload: function (jwt) { - if (isDefinedAndNotNull(jwt)) { - var segments = jwt.split(/\./); - if (segments.length !== 3) { - return ''; - } - - var rawPayload = window.atob(segments[1]); - var payload = JSON.parse(rawPayload); - - if (isDefinedAndNotNull(payload)) { - return payload; - } else { - return null; - } - } - - return null; - }, - - /** - * Removes the item with the specified key. - * - * @param {type} key - */ - removeItem: function (key) { - localStorage.removeItem(key); - } -}; - -FdsStorageService.parameters = []; - -module.exports = FdsStorageService; \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_basicElements.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_basicElements.scss deleted file mode 100644 index fc5808c5e..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_basicElements.scss +++ /dev/null @@ -1,130 +0,0 @@ -/* -* 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. -*/ - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 300; - src: local("Roboto Light"), local("Roboto-Light"), url("../../../../../../../roboto-fontface/fonts/Roboto/Roboto-Light.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto'; - font-style: italic; - font-weight: 300; - src: local("Roboto LightItalic"), local("Roboto-LightItalic"), url("../../../../../../../roboto-fontface/fonts/Roboto/Roboto-LightItalic.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: normal; - src: local("Roboto Regular"), local("Roboto-Regular"), url("../../../../../../../roboto-fontface/fonts/Roboto/Roboto-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 500; - src: local("Roboto Medium"), local("Roboto-Medium"), url("../../../../../../../roboto-fontface/fonts/Roboto/Roboto-Medium.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: bold; - src: local("Roboto Bold"), local("Roboto-Bold"), url("../../../../../../../roboto-fontface/fonts/Roboto/Roboto-Bold.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto'; - font-style: italic; - font-weight: normal; - src: local("Roboto Italic"), local("Roboto-Italic"), url("../../../../../../../roboto-fontface/fonts/Roboto/Roboto-RegularItalic.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto Slab'; - font-style: normal; - font-weight: normal; - src: local("RobotoSlab Regular"), local("RobotoSlab-Regular"), url("../../../../../../../roboto-fontface/fonts/Roboto-Slab/Roboto-Slab-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: 'Roboto Slab'; - font-style: normal; - font-weight: bold; - src: local("RobotoSlab Bold"), local("RobotoSlab-Bold"), url("../../../../../../../roboto-fontface/fonts/Roboto-Slab/Roboto-Slab-Bold.ttf") format("truetype"); -} - -body, -html { - height: 100%; -} - -body, -button, -input, -label, -select, -td, -textarea { - font-family: $fontPrimary; - font-size: 14px; -} - -body { - color: $bodyTextColor; -} - -strong { - font-weight: bold; -} - -pre { - overflow-x: auto; -} - -em { - font-style: italic; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: $fontPrimary; - font-weight: normal; - font-style: normal; - background: #FFFFFF; -} - -h1 { - color: $pageHeaderTextColor; -} - -h2 { - color: $subHeaderTextColor; -} - -table { - font-family: $fontPrimary; - font-size: 13px; - color: $grey2; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttonToggles.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttonToggles.scss deleted file mode 100644 index 73f4263b0..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttonToggles.scss +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ - -body[fds] .expansion-panel-filter-toggle-group { - box-shadow: none !important; -} - -body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle { - height: 75px; - width: 125px; - border: 1px solid $grey4; -} - -body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-label-content { - height: 100%; - width: 100%; - padding: 0; - line-height: 63px; - text-align: center; -} - -body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-checked { - background-color: $blue-grey1; - color: white; -} - -body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-checked .md-display-1 { - color: white; -} - -body[fds] .expansion-panel-filter-toggle-group .md-display-1 { - color: $blue-grey1; -} - -body[fds] .expansion-panel-filter-toggle-group div { - line-height: normal; -} - -body[fds] .tab-toggle-group { - box-shadow: none !important; -} - -body[fds] .tab-toggle-group .mat-button-toggle-label-content { - border-bottom: 2px solid $grey5; -} - -body[fds] .tab-toggle-group .mat-button-toggle-checked { - background: transparent; -} - -body[fds] .tab-toggle-group .mat-button-toggle-checked .mat-button-toggle-label-content { - border-bottom: 2px solid $blue-grey1; - background: transparent; -} - -body[fds] .on-off-toggle-group { - box-shadow: none !important; -} - -body[fds] .on-off-toggle-group .mat-button-toggle { - height: 20px; - width: 35px; - border: 1px solid $grey4; -} - -body[fds] .on-off-toggle-group .mat-button-toggle-label-content { - height: 100%; - width: 100%; - padding: 0; - line-height: 20px; - text-align: center; -} - -body[fds] .on-off-toggle-group .mat-button-toggle-checked { - background-color: $blue-grey1; - color: white; - border: 1px solid $blue-grey1; -} - -body[fds] .off-toggle.mat-button-toggle-checked { - background-color: $grey4; - color: $grey1; - border: 1px solid $grey4; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss deleted file mode 100644 index a9c962737..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss +++ /dev/null @@ -1,214 +0,0 @@ -/* -* 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. -*/ - -/* Buttons */ - -@mixin fds-buttons-theme($theme) { - $primaryColor: map-get(map-get($theme, primary), 500); - $primaryColorHover: map-get(map-get($theme, primary), 100); - $accentColor: map-get(map-get($theme, accent), 500); - $accentColorHover: map-get(map-get($theme, accent), 100); - $buttonFontColor: #FFFFFF; - $buttonFontColorDisabled: #D1E8D1; - $buttonBgColorPrimary: $primaryColor; - $buttonBgColorPrimaryHover: $primaryColorHover; - $buttonBgColorPrimaryDisabled: $primaryColor; - $buttonBgColorPrimarySelected: $primaryColor; - $buttonBgColorSecondary: #FFFFFF; - $buttonBgColorSecondaryHover: $primaryColorHover; - $buttonBgColorSecondarySelected: #FFFFFF; - $buttonBgColorRegular: #FFFFFF; - $buttonBgColorRegularHover: #808793; - $buttonBgColorRegularDisabled: #808793; - $buttonBgColorRegularSelected: #FFFFFF; - $buttonBorderColorSecondary: $primaryColor; - $buttonBorderColorSecondaryHover: $buttonBgColorSecondaryHover; - $buttonBorderColorSecondaryDisabled: $buttonBgColorSecondaryHover; - $buttonBorderColorSecondarySelected: $primaryColor; - $buttonBorderColorRegular: #CFD3D7; - $buttonBorderColorRegularHover: $buttonBgColorRegularHover; - $buttonBorderColorRegularDisabled: $buttonBgColorRegularHover; - $buttonBorderColorRegularSelected: #CFD3D7; - $buttonFontPrimaryColor: $buttonFontColor; - $buttonFontPrimaryColorHover: $buttonFontColor; - $buttonFontPrimaryColorDisabled: $buttonFontColorDisabled; - $buttonFontPrimaryColorSelected: $buttonFontColor; - $buttonFontSecondaryColor: $primaryColorHover; - $buttonFontSecondaryColorHover: $buttonFontColor; - $buttonFontSecondaryColorDisabled: $buttonFontColorDisabled; - $buttonFontSecondaryColorSelected: $primaryColorHover; - $buttonFontRegularColor: $descriptionTextColor; - $buttonFontRegularColorHover: $buttonFontColor; - $buttonFontRegularColorDisabled: $buttonFontColorDisabled; - $buttonFontRegularColorSelected: $bodyTextColor; - $buttonFontWarnColor: $buttonFontColor; - $buttonFontWarnColorHover: $buttonFontColor; - $buttonFontWarnColorDisabled: $buttonFontColorDisabled; - $buttonFontWarnColorSelected: $buttonFontColor; - $buttonFontCriticalColor: $buttonFontColor; - $buttonFontCriticalColorHover: $buttonFontColor; - $buttonFontCriticalColorDisabled: $buttonFontColorDisabled; - $buttonFontCriticalColorSelected: $buttonFontColor; - - body[fds] .mat-raised-button { - height: 34px; - font-family: $fontPrimary; - font-weight: normal; - font-size: 14px; - text-transform: uppercase; - line-height: normal; - box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12); - } - - body[fds] .mat-raised-button.cdk-focused:focus { - box-shadow: 0px 0px 2px 0px rgba(19, 145, 193, 1); - } - - body[fds] .mat-raised-button[disabled] { - opacity: .6; - cursor: not-allowed; - } - - body[fds] .mat-button-toggle-disabled .mat-button-toggle-label-content { - cursor: not-allowed; - } - - body[fds] .mat-button-focus-overlay { - background-color: transparent; - } - - body[fds] .mat-raised-button.mat-fds-primary { - border: 1px solid $buttonBgColorPrimary; - background-color: $buttonBgColorPrimary; - color: $buttonFontPrimaryColor; - } - - body[fds] .mat-raised-button.mat-fds-primary:hover { - background-color: $buttonBgColorPrimaryHover; - color: $buttonFontPrimaryColorHover; - } - - body[fds] .mat-raised-button.mat-fds-primary.mat-button-focus { - color: $buttonFontPrimaryColorSelected; - background-color: $buttonBgColorPrimarySelected; - } - - body[fds] .mat-raised-button.mat-fds-primary[disabled] { - color: $buttonFontPrimaryColorDisabled; - background-color: $buttonBgColorPrimaryDisabled; - color: $buttonFontPrimaryColorDisabled; - } - - body[fds] .mat-raised-button.mat-fds-secondary { - color: $buttonFontSecondaryColor; - border: 1px solid $buttonBorderColorSecondary; - } - - body[fds] .mat-raised-button.mat-fds-secondary:hover:not([disabled]) { - color: $buttonFontSecondaryColorHover; - background-color: $buttonBgColorSecondaryHover; - border: 1px solid $buttonBorderColorSecondaryHover; - } - - body[fds] .mat-raised-button.mat-fds-secondary.mat-button-focus { - color: $buttonFontSecondaryColorSelected; - background-color: $buttonBgColorSecondarySelected; - border: 1px solid $buttonBorderColorSecondarySelected; - } - - body[fds] .mat-raised-button.mat-fds-secondary[disabled] { - color: $buttonFontPrimaryColorDisabled; - background-color: $buttonBgColorPrimaryDisabled; - } - - body[fds] .mat-raised-button.mat-fds-regular { - color: $buttonFontRegularColor; - background-color: $buttonBgColorRegular; - border: 1px solid $buttonBorderColorRegular; - } - - body[fds] .mat-raised-button.mat-fds-regular:hover { - color: $buttonFontRegularColorHover; - background-color: $buttonBgColorRegularHover; - border: 1px solid $buttonBorderColorRegularHover; - } - - body[fds] .mat-raised-button.mat-fds-regular.mat-button-focus { - color: $buttonFontRegularColorSelected; - background-color: $buttonBgColorRegularSelected; - border: 1px solid $buttonBorderColorRegularSelected; - } - - body[fds] .mat-raised-button.mat-fds-regular[disabled] { - color: $buttonFontRegularColorDisabled; - background-color: $buttonBgColorRegularDisabled; - border: 1px solid $buttonBorderColorRegularDisabled; - } - - body[fds] .mat-raised-button.mat-fds-warn { - border: 1px solid $warnColor; - background-color: $warnColor; - color: $buttonFontWarnColor; - } - - body[fds] .mat-raised-button.mat-fds-warn:hover { - color: $buttonFontWarnColorHover; - background-color: $red2; - border: 1px solid $warnColor; - } - - body[fds] .mat-raised-button.mat-fds-warn.mat-button-focus { - color: $buttonFontWarnColorSelected; - background-color: $warnColor; - border: 1px solid $buttonBorderColorRegularSelected; - } - - body[fds] .mat-raised-button.mat-fds-warn[disabled] { - color: $buttonFontWarnColorDisabled; - background-color: $warnColor; - border: 1px solid $warnColor; - } - - body[fds] .mat-raised-button.mat-fds-critical { - color: $buttonFontCriticalColor; - background-color: $orange1; - border: 1px solid $orange1; - } - - body[fds] .mat-raised-button.mat-fds-critical:hover { - color: $buttonFontCriticalColorHover; - background-color: $orange2; - border: 1px solid $orange2; - } - - body[fds] .mat-raised-button.mat-fds-critical.mat-button-focus { - color: $buttonFontCriticalColorSelected; - background-color: $orange2; - border: 1px solid $buttonBorderColorRegularSelected; - } - - body[fds] .mat-raised-button.mat-fds-critical[disabled] { - color: $buttonFontCriticalColorDisabled; - background-color: $orange1; - border: 1px solid $orange1; - } - - .fds-primary-dropdown-button-menu .cdk-focused { - color: $buttonFontPrimaryColorSelected; - background-color: $buttonBgColorPrimarySelected; - } -} \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_checkboxes.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_checkboxes.scss deleted file mode 100644 index 0268fdeb0..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_checkboxes.scss +++ /dev/null @@ -1,85 +0,0 @@ -/* -* 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. -*/ - -/* Checkboxes */ - -body[fds] .mat-checkbox-inner-container { - height: 10px !important; - width: 10px !important; -} - -body[fds] .mat-checkbox-frame { - height: 10px; - width: 10px; - border-color: $grey7; -} - -body[fds] .mat-checkbox-ripple { - left: -7px; - top: -7px; - right: -7px; - bottom: -7px; -} - -body[fds] .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, -body[fds] .mat-checkbox-checked.mat-accent .mat-checkbox-background { - background-color: $blue-grey1; -} - -body[fds] .mat-checkbox-inner-container:hover { - background-color: $blue-grey1; - border-radius: 2px; -} - -body[fds] .mat-checkbox-background { - height: 10px; - width: 10px; -} - -/* Covalent TdDataTableComponent 'selectable' property checkboxes */ - -body[fds] .mat-pseudo-checkbox { - height: 10px !important; - width: 10px !important; - border: 1px solid $grey7; -} - -body[fds] .mat-pseudo-checkbox:hover { - background-color: $blue-grey1; - border: 1px solid $blue-grey1; -} - -body[fds] .mat-pseudo-checkbox-checked::after { - content: '\f00c'; - font-size: 8px; - font-family: fontawesome; - margin-top: -9px; - margin-left: -1px; - border: none; - transform: initial; -} - -body[fds] .mat-pseudo-checkbox-checked, body[fds] .mat-pseudo-checkbox-indeterminate { - background-color: $blue-grey1; - border: 1px solid $blue-grey1; - height: 10px; - width: 10px; -} - -body[fds] .mat-checkbox-disabled { - cursor: not-allowed; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_chips.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_chips.scss deleted file mode 100644 index 894fbecf5..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_chips.scss +++ /dev/null @@ -1,69 +0,0 @@ -/* -* 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. -*/ - -/* Chips */ - -body[fds] .mat-chip { - border-radius: 2px; - font-size: 10px; - font-family: $fontPrimary; - font-style: normal; - font-weight: normal; - padding: 4px 12px 4px 12px; -} - -body[fds] .mat-chip i { - margin-left: 10px; - float: right; - margin-top: 2px; -} - -body[fds] .mat-basic-chip { - color: $grey2; - height: 24px; - margin: 22px 8px 0 0; -} - -body[fds] .mat-basic-chip i { - margin-left: 10px; - float: right; - margin-top: 2px; -} - -body[fds] .mat-basic-chip .td-chip { - font-size: 10px; - min-height: unset; - line-height: 20px; - position: relative; - top: -2px; -} - -body[fds] .td-chip span { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - width: 65px; -} - -body[fds] .td-chip-disabled .td-chip { - padding: 0px 0px 0px 12px; -} - -body[fds] .mat-basic-chip mat-icon.td-chip-removal { - font-size: 15px; - margin-bottom: 7px; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_expansionPanels.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_expansionPanels.scss deleted file mode 100644 index fdf9d4f6d..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_expansionPanels.scss +++ /dev/null @@ -1,62 +0,0 @@ -/* -* 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. -*/ - -/* Expansion Panels */ - -@mixin fds-expansion-panels-theme($theme) { - $primaryColor: map-get(map-get($theme, primary), 500); - $primaryColorHover: map-get(map-get($theme, primary), 100); - $accentColor: map-get(map-get($theme, accent), 500); - $accentColorHover: map-get(map-get($theme, accent), 100); - - body[fds] td-expansion-panel:not(:last-of-type) .td-expanded { - margin-bottom: 0px; - } - - body[fds] .td-expansion-panel-header-content { - height: 80px !important; - padding: 0px 30px !important; - border-bottom: 1px solid $grey7; - } - - body[fds] .td-expansion-content form { - padding: 15px 10px 20px 20px; - } - - body[fds] .md-subhead { - font-size: 18px; - color: $grey3; - } - - body[fds] td-expansion-panel .td-expansion-panel-header .td-expansion-panel-header-content mat-icon.td-expand-icon { - font-size: 28px; - color: $blue-grey1; - font-weight: bold; - } - - body[fds] td-expansion-panel .td-expansion-panel-header:hover:not(.mat-disabled) { - background: $blue4; - } - - body[fds] td-expansion-panel .td-expansion-panel-header:focus { - background: #FFFFFF; - } - - body[fds] td-expansion-panel .td-expansion-panel-header:focus .td-expansion-panel-header-content { - border-bottom: 1px solid $primaryColor; - } -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_globalVars.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_globalVars.scss deleted file mode 100644 index aede0a380..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_globalVars.scss +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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. - */ - -/* Text */ - -$fontPrimary: "Roboto", -sans-serif; -$fontSecondary: "Robot Slab", -sans-serif; -$fontMedium: "Roboto Medium", -sans-serif; -$fontLight: "Roboto Light", -sans-serif; - -/* Define colors */ - -$grey1: #333333; -$grey2: #666666; -$grey3: #999999; -$grey4: #CCCCCC; -$grey5: #EEEEEE; -$grey6: #F8F9F9; -$grey7: #DDDDDD; -$grey8: #CFD3D7; -$grey9: #b2b8c1; -$grey10: #dbdee2; -$grey11: #2C3E44; -$grey12: #EEEFF0; -$grey13: #808793; -$blue1: #1491C1; -$blue2: #E7f6Fc; -$blue3: #A7DFF2; -$blue4: #F3FAFF; -$blue5: #728E9B; -$blue6: #004849; -$blue7: #d0dbe0; -$blue8: #1291c1; -$red1: #EF6162; -$red2: #D14A50; -$orange1: #E98A40; -$orange2: #D3702D; -$green1: #1EB475; -$green2: #3FAE2A; -$green3: #429929; -$rose1: #9E737D; -$rose2: #915D69; -$blue-grey1: #6B8791; -$blue-grey2: #B2C1C6; -$bodyTextColor: $grey1; -$pageHeaderTextColor: $grey1; -$subHeaderTextColor: $grey2; -$descriptionTextColor: $grey2; -$linkColor: $blue-grey1; -$linkColorDisabled: $grey1; -$warnColor: $red1; \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_helperClasses.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_helperClasses.scss deleted file mode 100644 index 129835807..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_helperClasses.scss +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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. - */ - -/* Text */ - -.camel-case { - text-transform: capitalize; -} - -.header { - font-family: $fontMedium; - font-size: 16px; - color: $pageHeaderTextColor; - padding-bottom: 10px; -} - -.help-icon { - font-size: 12px; - color: $blue1; -} - -.details-header { - height: 92px; -} - -.details-header-container { - position: relative; - top: 22px; - left: 10px; -} - -.description { - font-family: $fontLight; - font-size: 12px; - color: $descriptionTextColor; -} - -.description i { - padding-right: 5px; -} - -.label { - font-family: $fontMedium; - font-size: 14px; - color: $bodyTextColor; - text-transform: uppercase; -} - -.units { - font-family: $fontLight; - font-size: 14px; - color: $bodyTextColor; -} - -.align-vertical { - margin-top: auto; - margin-bottom: auto; -} - -.align-horizontal { - margin-left: auto; - margin-right: auto; -} - -.fill-available-width { - width: 100%; -} - -.pointer { - cursor: pointer; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_inputs.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_inputs.scss deleted file mode 100644 index 392f5cb13..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_inputs.scss +++ /dev/null @@ -1,109 +0,0 @@ -/* -* 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. -*/ - -/* Inputs */ - -body[fds] .mat-input-container { - min-width: 200px; -} - -body[fds] .mat-input-wrapper { - margin: 0; - padding-bottom: 0; -} - -body[fds] input.mat-input-element, body[fds] textarea.mat-input-element { - border-radius: 2px; - color: $grey2; - border: 1px solid $grey8; - height: 32px; - padding: 0px 10px; - width: calc(100% - 26px); -} - -body[fds] textarea.mat-input-element { - padding: 10px 10px; -} - -body[fds] input.mat-input-element[disabled], body[fds] textarea.mat-input-element[disabled] { - background: $grey9; - color: $grey10; - border: 1px solid $grey9; -} - -body[fds] .mat-input-subscript-wrapper { - margin-top: 18px; - width: calc(100% - 23px); -} - -body[fds] input.mat-input-element:focus, body[fds] textarea.mat-input-element:focus { - border-color: $blue-grey1; -} - -body[fds] .mat-input-underline { - display: none; -} - -body[fds] .mat-input-placeholder { - font-size: 14px; - color: $grey3; - font-weight: 300; -} - -body[fds] .mat-input-placeholder { - top: 29px; - left: 10px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - width: calc(100% - 44px); -} - -body[fds] mat-input-container.mat-focused .mat-input-placeholder { - transform: translateY(-26px) translateX(-10px) scale(0.75); -} - -body[fds] .mat-form-field-can-float.mat-form-field-should-float .mat-form-field-placeholder { - transform: translateY(-26px) translateX(-10px) scale(.75); -} - -body[fds] .mat-form-field-can-float .mat-form-field-autofill-control:-webkit-autofill+.mat-form-field-placeholder-wrapper .mat-form-field-placeholder { - transform: translateY(-26px) translateX(-10px) scale(.75); -} - -body[fds] .input-button { - top: 5px; - left: -4px; - border-left: none !important; -} - -body[fds] .input-button.mat-raised-button[disabled] { - opacity: 1; -} - -body[fds] td-chips .mat-input-placeholder-wrapper::after { - content: '\f0b0'; - display: inline-table; - font-family: FontAwesome; - float: right; - margin: 12px 10px 0px 0px; - color: $grey3; -} - -body[fds] .mat-hint { - color: $grey3; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_links.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_links.scss deleted file mode 100644 index 1a5896dd9..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_links.scss +++ /dev/null @@ -1,35 +0,0 @@ -/* -* 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. -*/ - -/* Links */ - -body[fds] .link { - color: $linkColor; - font-size: 14px; - text-decoration: none; - line-height: 24px; - cursor: pointer; -} - -body[fds] .link:hover { - text-decoration: underline; -} - -body[fds] .link .disabled { - color: $linkColorDisabled; - text-decoration: none; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_menus.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_menus.scss deleted file mode 100644 index 3f5aadfbd..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_menus.scss +++ /dev/null @@ -1,118 +0,0 @@ -/* -* 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. -*/ - -/* Menus */ - -@mixin fds-menus-theme($theme) { - $primaryColor: map-get(map-get($theme, primary), 500); - $primaryColorHover: map-get(map-get($theme, primary), 100); - $accentColor: map-get(map-get($theme, accent), 500); - $accentColorHover: map-get(map-get($theme, accent), 100); - - body[fds] .mat-menu-panel { - border-radius: 2px; - } - - body[fds] .mat-menu-item { - font-size: 14px; - color: $bodyTextColor; - min-width: 200px; - text-transform: none; - height: 24px; - line-height: 24px; - } - - body[fds] .regular-button-menu .mat-menu-item:hover { - color: #ffffff; - background-color: #808793; - } - - body[fds] .mat-menu-item[disabled] { - color: rgba(0, 0, 0, 0.38); - background-color: #ffffff; - cursor: not-allowed; - } - - body[fds] .mat-menu-item .mat-icon { - font-size: 14px; - } - - body[fds] .mat-menu-item .fa { - font-size: 14px; - width: 1em; - height: 1em; - } - - body[fds] .mat-menu-item[disabled] .mat-icon { - color: rgba(0, 0, 0, 0.38); - } - - body[fds] .mat-menu-item[disabled] .fa { - color: rgba(0, 0, 0, 0.38); - } - - body[fds] .mat-menu-item:hover:not([disabled]) .mat-icon { - color: #ffffff; - } - - body[fds] .mat-menu-item:hover:not([disabled]) .fa { - color: #ffffff; - } - - body[fds] .mat-menu-item:hover:not([disabled]), - body[fds] .mat-menu-item:focus:not([disabled]) { - color: #ffffff; - background-color: #808793; - } - - body[fds] .fds-primary-dropdown-button-menu .mat-menu-item:hover:not([disabled]), - body[fds] .fds-primary-dropdown-button-menu .mat-menu-item:focus:not([disabled]) { - color: #FFFFFF; - background-color: $primaryColorHover; - } - - .mat-raised-button .mat-button-wrapper i { - padding-left: 10px; - } - - body[fds] .mat-option { - font-size: 14px; - color: $bodyTextColor; - text-transform: none; - height: 24px; - line-height: 24px; - } - - body[fds] .mat-autocomplete-panel.mat-autocomplete-panel-below { - top: 0; - } - - body[fds] .regular-button-menu .mat-option:hover { - color: #ffffff; - background-color: #808793; - } - - body[fds] .mat-option:hover:not([disabled]), - body[fds] .mat-option:focus:not([disabled]) { - color: #ffffff; - background-color: #808793; - } - - body[fds] .mat-select-underline { - display: none; - } -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_modals.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_modals.scss deleted file mode 100644 index 51c7bad94..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_modals.scss +++ /dev/null @@ -1,23 +0,0 @@ -/* -* 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. -*/ - -/* Modals */ - -body[fds] .mat-dialog-container { - padding: 20px; - width: 400px; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_panels.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_panels.scss deleted file mode 100644 index 6ead00d14..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_panels.scss +++ /dev/null @@ -1,54 +0,0 @@ -/* -* 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. -*/ - -/* Panels */ - -body[fds] .md-card-title { - font-size: 20px; - color: $grey1; - margin-bottom: 0px; -} - -body[fds] md-card-title { - padding-top: 20px; - padding-left: 20px; - padding-right: 20px; -} - -body[fds] .md-card-subtitle { - padding-left: 20px; - padding-right: 20px; - padding-top: 10px; - margin-bottom: 0px; -} - -body[fds] .md-card-content { - color: $grey2; - padding: 10px 20px 20px 20px; - margin: 0px; -} - -body[fds] .md-card .md-card-actions:last-child, body[fds] .md-card .md-card .md-card-actions:last-child { - padding: 0px 20px 20px 20px; - margin: 0px; -} - -body[fds] .fds-panel-menu-button { - position: absolute; - right: 0px; - z-index: 2; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_radios.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_radios.scss deleted file mode 100644 index 2d9ca8e1b..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_radios.scss +++ /dev/null @@ -1,56 +0,0 @@ -/* -* 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. -*/ - -/* Radios */ - -body[fds] .mat-radio-container { - height: 12px; - width: 12px; -} - -body[fds] .mat-radio-outer-circle { - height: 12px; - width: 12px; - background-color: #FFFFFF; - border: 1px solid $grey7; -} - -body[fds] .mat-radio-outer-circle:hover { - background-color: $blue-grey1; - border-color: $blue-grey1; -} - -body[fds] .mat-radio-checked .mat-radio-outer-circle { - border: 1px solid $blue-grey1; - background-color: $blue-grey1; -} - -body[fds] .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: $blue-grey1; -} - -body[fds] .mat-radio-inner-circle { - height: 10px; - width: 10px; - left: 1px; - top: 1px; - background-color: #FFFFFF; -} - -body[fds] .mat-radio-checked .mat-radio-inner-circle { - background-color: #FFFFFF; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_sideNav.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_sideNav.scss deleted file mode 100644 index af3514d3d..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_sideNav.scss +++ /dev/null @@ -1,20 +0,0 @@ -/* -* 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. -*/ - -body[fds] .mat-sidenav-container { - height: 100%; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_stepper.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_stepper.scss deleted file mode 100644 index fda0b87f6..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_stepper.scss +++ /dev/null @@ -1,20 +0,0 @@ -/* -* 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. -*/ - -.td-step-header span { - display: none; -} \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_tables.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_tables.scss deleted file mode 100644 index 9bfec9003..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_tables.scss +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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. - */ - -/* Tables */ - -body[fds] .td-data-table-cell { - font-size: 13px; - color: $grey2; - padding: 0 28px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - height: 100%; - line-height: 30px; -} - -body[fds] .td-data-table-column { - color: $grey3; - font-weight: normal; -} - -body[fds] .td-data-table-row { - height: 34px; - border-top: 1px solid #fff; - border-left: 1px solid #fff; - border-right: 1px solid #fff; - border-bottom: 1px solid $grey5; -} - -body[fds] .td-data-table-row.selected { - background-color: $grey5; - border: 1px solid $grey5; -} - -body[fds] .td-data-table-row:hover { - background-color: $grey6; - border: 1px solid $blue-grey2; -} - -body[fds] .td-data-table-cell .mat-icon-button { - color: $linkColor; -} - -body[fds] .td-data-table-cell .mat-icon-button:disabled { - color: $grey13; - cursor: not-allowed; -} - -body[fds] .td-data-table-cell .mat-button, body[fds] .td-data-table-cell .mat-icon-button, body[fds] .td-data-table-cell .mat-raised-button { - height: 24px; - width: 24px; - line-height: 0; -} - -body[fds] .td-data-table-cell .mat-icon-button.badge { - border-top-left-radius: 0px; - border-top-right-radius: 0px; -} - -body[fds] .td-data-table-cell .mat-icon-button.badge[disabled] { - opacity: .3; -} - -body[fds] .td-data-table-column { - font-size: 12px; - color: $grey3; - height: 34px; - line-height: 34px; - padding: 0 28px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} - -body[fds] .td-data-table-column .fa-caret-up, body[fds] .td-data-table-column .fa-caret-down { - color: $blue-grey1; - font-size: 12px; - margin-bottom: 2px; -} - -body[fds] td-paging-bar { - color: $grey3; -} - -body[fds] td-paging-bar mat-select .mat-select-value, body[fds] td-paging-bar mat-select .mat-select-arrow { - color: $blue-grey1; -} - -body[fds] .table-title { - font-size: 20px; - color: $grey1; - min-width: 250px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 50%; - margin-right: 10px; -} - -body[fds] div .td-data-table { - border-bottom: 2px solid $grey7; - border-right: 1px transparent; - border-left: 1px transparent; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_tabs.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_tabs.scss deleted file mode 100644 index df5d653a0..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_tabs.scss +++ /dev/null @@ -1,41 +0,0 @@ -/* -* 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. -*/ - -/* Tabs */ - -body[fds] .mat-tab-label { - line-height: 72px; - text-transform: uppercase; - color: $grey2; -} - -body[fds] .mat-tab-label:hover:not([disabled]) { - color: $grey1; -} - -body[fds] .mat-tab-label:focus:not([disabled]) { - background-color: #FFFFFF; -} - -body[fds] .mat-tab-label-active { - color: $grey1; -} - -body[fds] .mat-tab-nav-bar, -body[fds] .mat-tab-header { - border-bottom: 0px; -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_tooltips.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_tooltips.scss deleted file mode 100644 index 563565f91..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_tooltips.scss +++ /dev/null @@ -1,24 +0,0 @@ -/* -* 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. -*/ - -/* Tooltips */ - -body[fds] .mat-tooltip { - background: $grey2; - opacity: .9; - box-shadow: inset 0px 0px 3px 0px rgba(19, 145, 193, 1); -} diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/fluid-design-system.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/fluid-design-system.scss deleted file mode 100644 index b04cb46bd..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/fluid-design-system.scss +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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. - */ - -@import 'globalVars'; -@import 'basicElements'; -@import 'helperClasses'; -@import 'buttonToggles'; -@import 'checkboxes'; -@import 'radios'; -@import 'chips'; -@import 'modals'; -@import 'tabs'; -@import 'inputs'; -@import 'panels'; -@import 'links'; -@import 'sideNav'; -@import 'stepper'; -@import 'tooltips'; -@import 'tables'; -@import '../../dialogs/fds-dialog-component'; -@import '../../snackbars/coaster/coaster.component'; diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/_fds-dialog-component.scss b/nifi-registry-web-ui/src/main/platform/core/dialogs/_fds-dialog-component.scss deleted file mode 100644 index f8784a474..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/_fds-dialog-component.scss +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ - -.fds-dialog-title { - margin-top: 0; - margin-bottom: 20px; -} \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html b/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html deleted file mode 100644 index efc1b876b..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - -
- {{title}} - -
- - - {{message}} - - - - - - \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js b/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js deleted file mode 100644 index 552e68f0f..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); - -/** - * FdsConfirmDialogComponent constructor. - * - * @constructor - */ -function FdsConfirmDialogComponent() { - this.title = ''; - this.message = ''; - this.acceptButton = ''; - this.acceptButtonColor = 'fds-primary'; - this.cancelButton = ''; - this.cancelButtonColor = 'fds-regular'; - this.dialogRef = undefined; - this.viewContainerRef = undefined; - this.disableClose = true; -}; - -FdsConfirmDialogComponent.prototype = { - constructor: FdsConfirmDialogComponent, - - /** - * Close the dialog and send a cancel response to any subscribers. - */ - cancel: function () { - this.dialogRef.close(false); - }, - - /** - * Close the dialog and send an accept response to any subscribers. - */ - accept: function () { - this.dialogRef.close(true); - } -}; - -FdsConfirmDialogComponent.annotations = [ - new ngCore.Component({ - selector: 'fds-confirm-dialog', - template: require('./confirm-dialog.component.html!text') - }) -]; - -FdsConfirmDialogComponent.parameters = []; - -module.exports = FdsConfirmDialogComponent; diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.html b/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.html deleted file mode 100644 index 4d39e736a..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
-

- -

-
- -
-
- - -
-
diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.js b/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.js deleted file mode 100644 index d71a2923a..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.js +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); - -var FdsDialogTitleDirective = new ngCore.Class({ - extends: ngCore.Directive({selector: 'fds-dialog-title'}), - constructor: function () { - } -}); -var FdsDialogContentDirective = new ngCore.Class({ - extends: ngCore.Directive({selector: 'fds-dialog-content'}), - constructor: function () { - } -}); -var FdsDialogActionsDirective = new ngCore.Class({ - extends: ngCore.Directive({selector: 'fds-dialog-actions'}), - constructor: function () { - } -}); - -/** - * FdsDialogComponent constructor - * - * @constructor - */ -function FdsDialogComponent() { -}; - -FdsDialogComponent.prototype = { - constructor: FdsDialogComponent, - - /** - * Respond after Angular projects external content into the component's view. - */ - ngAfterContentInit: function () { - if (this.dialogTitle.length > 1) { - throw new Error('Duplicate fds-dialog-title component at in fds-dialog.'); - } - if (this.dialogContent.length > 1) { - throw new Error('Duplicate fds-dialog-content component at in fds-dialog.'); - } - if (this.dialogActions.length > 1) { - throw new Error('Duplicate fds-dialog-actions component at in fds-dialog.'); - } - } -} - -FdsDialogComponent.annotations = [ - new ngCore.Component({ - selector: 'fds-dialog', - template: require('./fds-dialog.component.html!text'), - queries: { - dialogTitle: new ngCore.ContentChildren(FdsDialogTitleDirective), - dialogContent: new ngCore.ContentChildren(FdsDialogContentDirective), - dialogActions: new ngCore.ContentChildren(FdsDialogActionsDirective) - } - }) -]; - -FdsDialogComponent.parameters = []; - -module.exports = { - FdsDialogTitleDirective: FdsDialogTitleDirective, - FdsDialogContentDirective: FdsDialogContentDirective, - FdsDialogActionsDirective: FdsDialogActionsDirective, - FdsDialogComponent: FdsDialogComponent -}; \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialogs.module.js b/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialogs.module.js deleted file mode 100644 index 3758655b7..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialogs.module.js +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); -var ngMaterial = require('@angular/material'); -var ngFlex = require('@angular/flex-layout'); -var ngCommon = require('@angular/common'); -var ngForms = require('@angular/forms'); -var fdsDialogComponentModule = require('@fluid-design-system/dialog-component'); -var fdsDialogServiceModule = require('@fluid-design-system/dialog-service'); -var FdsConfirmDialogComponent = require('@fluid-design-system/confirm-dialog-component'); - -var FDS_DIALOGS = [ - fdsDialogComponentModule.FdsDialogComponent, - fdsDialogComponentModule.FdsDialogTitleDirective, - fdsDialogComponentModule.FdsDialogActionsDirective, - fdsDialogComponentModule.FdsDialogContentDirective, - FdsConfirmDialogComponent -]; - -var FDS_DIALOGS_ENTRY_COMPONENTS = [ - FdsConfirmDialogComponent -]; - -/** - * FdsDialogsModule constructor. - * - * @constructor - */ -function FdsDialogsModule() { - -}; - -FdsDialogsModule.prototype = { - constructor: FdsDialogsModule -}; - -FdsDialogsModule.annotations = [ - new ngCore.NgModule({ - imports: [ - ngFlex.FlexLayoutModule, - ngForms.FormsModule, - ngCommon.CommonModule, - ngMaterial.MatDialogModule, - ngMaterial.MatInputModule, - ngMaterial.MatButtonModule, - ngMaterial.MatIconModule - ], - declarations: [ - FDS_DIALOGS - ], - exports: [ - FDS_DIALOGS - ], - providers: [ - fdsDialogServiceModule.FdsDialogService - ], - entryComponents: [ - FDS_DIALOGS_ENTRY_COMPONENTS - ] - }) -]; - -module.exports = { - FdsDialogsModule: FdsDialogsModule, - IConfirmConfig: fdsDialogServiceModule.IConfirmConfig, - FdsDialogService: fdsDialogServiceModule.FdsDialogService, - FdsDialogComponent: fdsDialogComponentModule.FdsDialogComponent, - FdsDialogTitleDirective: fdsDialogComponentModule.FdsDialogTitleDirective, - FdsDialogContentDirective: fdsDialogComponentModule.FdsDialogContentDirective, - FdsDialogActionsDirective: fdsDialogComponentModule.FdsDialogActionsDirective, - FdsConfirmDialogComponent: FdsConfirmDialogComponent -}; diff --git a/nifi-registry-web-ui/src/main/platform/core/dialogs/services/dialog.service.js b/nifi-registry-web-ui/src/main/platform/core/dialogs/services/dialog.service.js deleted file mode 100644 index 9bf1ee960..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/services/dialog.service.js +++ /dev/null @@ -1,134 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); -var ngMaterial = require('@angular/material'); -var FdsConfirmDialogComponent = require('@fluid-design-system/confirm-dialog-component'); - -var IDialogConfig = new ngCore.Class({ - extends: ngMaterial.MatDialogConfig, - constructor: function () { - this.title = ''; - this.message = ''; - this.dialogRef = undefined; - this.viewContainerRef = undefined; - this.disableClose = true; - } -}); - -var IConfirmConfig = new ngCore.Class({ - extends: IDialogConfig, - constructor: function () { - this.acceptButton = 'ACCEPT'; - this.acceptButtonColor = 'fds-primary'; - this.cancelButton = 'CANCEL'; - this.cancelButtonColor = 'fds-secondary'; - } -}); - -function createConfig(config) { - var dialogConfig = new IConfirmConfig(); - dialogConfig.viewContainerRef = config.viewContainerRef; - dialogConfig.disableClose = config.disableClose; - return dialogConfig; -} - -/** - * FdsDialogService constructor. - * - * @param MatDialog The angular material MatDialog. - * @constructor - */ -function FdsDialogService(MatDialog) { - this.dialogService = MatDialog; -} - -FdsDialogService.prototype = { - contstructor: FdsDialogService, - - /** - * Wrapper function over the open() method in MatDialog. - * Opens a modal dialog containing the given component. - * - * @param component The angular ComponentType. - * @param config The angular material MatDialogConfig. - * - * @returns {MatDialoRef} The reference to the dialog. - */ - open: function (component, config) { - return this.dialogService.open(component, config); - }, - - /** - * Wrapper function over the closeAll() method in MatDialog. - * Closes all of the currently-open dialogs. - */ - closeAll: function () { - this.dialogService.closeAll(); - }, - - /** - * Opens a confirm dialog with the provided config. - * - * @param config IConfirmConfig { - * message?: string; - * title?: string; - * dialogRef?: MatDialoRef; - * viewContainerRef?: ViewContainerRef; - * disableClose?: boolean; - * acceptButton?: string; - * acceptButtonColor?: string; - * cancelButton?: string; - * cancelButtonColor?: string; - * } - * - * @returns {MatDialoRef} The reference to the dialog. - */ - openConfirm: function (config) { - var dialogConfig = createConfig(config); - var dialogRef = this.dialogService.open(FdsConfirmDialogComponent, dialogConfig); - var confirmDialogComponent = dialogRef.componentInstance; - confirmDialogComponent.dialogRef = dialogRef; - if (config.title) { - confirmDialogComponent.title = config.title; - } - if (config.message) { - confirmDialogComponent.message = config.message; - } - if (config.acceptButton) { - confirmDialogComponent.acceptButton = config.acceptButton; - } - if (config.acceptButtonColor) { - confirmDialogComponent.acceptButtonColor = config.acceptButtonColor; - } - if (config.cancelButton) { - confirmDialogComponent.cancelButton = config.cancelButton; - } - if (config.cancelButtonColor) { - confirmDialogComponent.cancelButtonColor = config.cancelButtonColor; - } - return dialogRef; - }, -} - -FdsDialogService.parameters = [ngMaterial.MatDialog]; - -module.exports = { - IDialogConfig: IDialogConfig, - IConfirmConfig: IConfirmConfig, - FdsDialogService: FdsDialogService -}; \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/fluid-design-system.module.js b/nifi-registry-web-ui/src/main/platform/core/fluid-design-system.module.js deleted file mode 100644 index 7a7aaec43..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/fluid-design-system.module.js +++ /dev/null @@ -1,155 +0,0 @@ -/* - * 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. - */ - -var $ = require('jquery'); -var ngCore = require('@angular/core'); -var ngFlex = require('@angular/flex-layout'); -var ngMaterial = require('@angular/material'); -var ngCommon = require('@angular/common'); -var ngPlatformBrowser = require('@angular/platform-browser'); -var ngAnimations = require('@angular/platform-browser/animations'); -var covalentCore = require('@covalent/core'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); - -/** - * FluidDesignSystemModule constructor. - * - * @constructor - */ -function FluidDesignSystemModule() { - $(document).ready(function () { - //add fds attr to body tag to allow fine grain style overrides - document.body.setAttribute('fds', ''); - - //override the hover styles for checkbox borders - $(document.body).on('mouseenter', '.mat-checkbox-inner-container', function () { - $(this).find('.mat-checkbox-frame').css('border-color', '#1491C1'); - }); - $(document.body).on('mouseleave', '.mat-checkbox-inner-container', function () { - $(this).find('.mat-checkbox-frame').css('border-color', '#DDDDDD'); - }); - }); -}; - -FluidDesignSystemModule.prototype = { - constructor: FluidDesignSystemModule -}; - -FluidDesignSystemModule.annotations = [ - new ngCore.NgModule({ - imports: [ - ngFlex.FlexLayoutModule, - ngAnimations.BrowserAnimationsModule, - ngCommon.CommonModule, - ngPlatformBrowser.BrowserModule, - ngMaterial.MatAutocompleteModule, - ngMaterial.MatButtonModule, - ngMaterial.MatButtonToggleModule, - ngMaterial.MatCardModule, - ngMaterial.MatCheckboxModule, - ngMaterial.MatChipsModule, - ngMaterial.MatDatepickerModule, - ngMaterial.MatDialogModule, - ngMaterial.MatExpansionModule, - ngMaterial.MatFormFieldModule, - ngMaterial.MatGridListModule, - ngMaterial.MatIconModule, - ngMaterial.MatInputModule, - ngMaterial.MatListModule, - ngMaterial.MatMenuModule, - ngMaterial.MatProgressBarModule, - ngMaterial.MatProgressSpinnerModule, - ngMaterial.MatRadioModule, - ngMaterial.MatSelectModule, - ngMaterial.MatSlideToggleModule, - ngMaterial.MatSliderModule, - ngMaterial.MatSidenavModule, - ngMaterial.MatSnackBarModule, - ngMaterial.MatStepperModule, - ngMaterial.MatTabsModule, - ngMaterial.MatToolbarModule, - ngMaterial.MatTooltipModule, - ngMaterial.MatPaginatorModule, - ngMaterial.MatSortModule, - ngMaterial.MatTableModule, - covalentCore.CovalentCommonModule, - covalentCore.CovalentChipsModule, - covalentCore.CovalentDataTableModule, - covalentCore.CovalentDialogsModule, - fdsDialogsModule.FdsDialogsModule, - fdsSnackBarsModule.FdsSnackBarsModule, - covalentCore.CovalentExpansionPanelModule, - covalentCore.CovalentLoadingModule, - covalentCore.CovalentMenuModule, - covalentCore.CovalentNotificationsModule, - covalentCore.CovalentPagingModule, - covalentCore.CovalentSearchModule, - covalentCore.CovalentStepsModule - ], - exports: [ - ngFlex.FlexLayoutModule, - ngAnimations.BrowserAnimationsModule, - ngCommon.CommonModule, - ngPlatformBrowser.BrowserModule, - ngMaterial.MatAutocompleteModule, - ngMaterial.MatButtonModule, - ngMaterial.MatButtonToggleModule, - ngMaterial.MatCardModule, - ngMaterial.MatCheckboxModule, - ngMaterial.MatChipsModule, - ngMaterial.MatDatepickerModule, - ngMaterial.MatDialogModule, - ngMaterial.MatExpansionModule, - ngMaterial.MatFormFieldModule, - ngMaterial.MatGridListModule, - ngMaterial.MatIconModule, - ngMaterial.MatInputModule, - ngMaterial.MatListModule, - ngMaterial.MatMenuModule, - ngMaterial.MatProgressBarModule, - ngMaterial.MatProgressSpinnerModule, - ngMaterial.MatRadioModule, - ngMaterial.MatSelectModule, - ngMaterial.MatSlideToggleModule, - ngMaterial.MatSliderModule, - ngMaterial.MatSidenavModule, - ngMaterial.MatSnackBarModule, - ngMaterial.MatStepperModule, - ngMaterial.MatTabsModule, - ngMaterial.MatToolbarModule, - ngMaterial.MatTooltipModule, - ngMaterial.MatPaginatorModule, - ngMaterial.MatSortModule, - ngMaterial.MatTableModule, - covalentCore.CovalentCommonModule, - covalentCore.CovalentChipsModule, - covalentCore.CovalentDataTableModule, - covalentCore.CovalentDialogsModule, - fdsDialogsModule.FdsDialogsModule, - fdsSnackBarsModule.FdsSnackBarsModule, - covalentCore.CovalentExpansionPanelModule, - covalentCore.CovalentLoadingModule, - covalentCore.CovalentMenuModule, - covalentCore.CovalentNotificationsModule, - covalentCore.CovalentPagingModule, - covalentCore.CovalentSearchModule, - covalentCore.CovalentStepsModule - ] - }) -]; -module.exports = FluidDesignSystemModule; diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/_coaster.component.scss b/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/_coaster.component.scss deleted file mode 100644 index b207c8daa..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/_coaster.component.scss +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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. - */ - -body[fds] snack-bar-container { - background: #FFFFFF; - padding: 0; - box-shadow: 0px 0px 3px 0px rgba(19, 145, 193, 1); -} - -fds-snackbar-title mat-icon.mat-icon.mat-primary.material-icons { - font-size: 10px; - height: 10px; - width: 10px; - line-height: 10px; - color: $grey3; -} - -.fds-coaster-message { - font-size: 12px; -} - -.fds-snackbar-title { - font-size: 14px; -} - -.fds-snackbar-title i { - font-size: 24px; -} - -.fds-coaster-icon { - position: absolute; - top: 24px; - left: 15px; -} - -.coaster-close-icon { - height: 10px !important; - width: 10px !important; - line-height: 10px !important; - right: 10px; - position: absolute !important; - top: 10px; -} - -.fds-snackbar-wrapper { - border-radius: 2px; - border-width: 1px; - border-style: solid; -} \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.html b/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.html deleted file mode 100644 index 8b8414bd8..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - -
- {{title}} -
- - - {{message}} - - - - \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.js b/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.js deleted file mode 100644 index 0213f2ed1..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.js +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); -var $ = require('jquery'); - -/** - * FdsCoasterComponent constructor. - * - * @constructor - */ -function FdsCoasterComponent() { - this.title = ''; - this.message = ''; - this.icon = ''; - this.color = ''; - this.snackBarRef = undefined; - this.viewContainerRef = undefined; -}; - -FdsCoasterComponent.prototype = { - constructor: FdsCoasterComponent, - - /** - * Initialize the component. - */ - ngAfterViewChecked: function () { - $('.fds-snackbar-wrapper').css('border-color', this.color); - $('.fds-snackbar-title').css('color', this.color); - $('.fds-coaster-icon').css('color', this.color); - - if (this.icon) { - $('.fds-snackbar-wrapper').css('padding', '15px 15px 15px 45px'); - } else { - $('.fds-snackbar-wrapper').css('padding', '15px 15px 15px 15px'); - } - }, - - /** - * Close the snackbar and send a cancel response to any subscribers. - */ - cancel: function () { - this.snackBarRef.dismiss(false); - } -}; - -FdsCoasterComponent.annotations = [ - new ngCore.Component({ - selector: 'fds-coaster', - template: require('./coaster.component.html!text') - }) -]; - -FdsCoasterComponent.parameters = []; - -module.exports = FdsCoasterComponent; diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.html b/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.html deleted file mode 100644 index f3c6defbb..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
-
- -
-
- -
-
- - -
-
diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.js b/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.js deleted file mode 100644 index 40c50c15d..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.js +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); - -var FdsSnackBarTitleDirective = new ngCore.Class({ - extends: ngCore.Directive({selector: 'fds-snackbar-title'}), - constructor: function () { - } -}); -var FdsSnackBarContentDirective = new ngCore.Class({ - extends: ngCore.Directive({selector: 'fds-snackbar-content'}), - constructor: function () { - } -}); -var FdsSnackBarActionsDirective = new ngCore.Class({ - extends: ngCore.Directive({selector: 'fds-snackbar-actions'}), - constructor: function () { - } -}); - -/** - * FdsSnackBarComponent constructor - * - * @constructor - */ -function FdsSnackBarComponent() { -}; - -FdsSnackBarComponent.prototype = { - constructor: FdsSnackBarComponent, - - /** - * Respond after Angular projects external content into the component's view. - */ - ngAfterContentInit: function () { - if (this.snackBarTitle.length > 1) { - throw new Error('Duplicate fds-snackbar-title component at in fds-snackbar.'); - } - if (this.snackBarContent.length > 1) { - throw new Error('Duplicate fds-snackbar-content component at in fds-snackbar.'); - } - if (this.snackBarActions.length > 1) { - throw new Error('Duplicate fds-snackbar-actions component at in fds-snackbar.'); - } - } -} - -FdsSnackBarComponent.annotations = [ - new ngCore.Component({ - selector: 'fds-snackbar', - template: require('./fds-snackbar.component.html!text'), - queries: { - snackBarTitle: new ngCore.ContentChildren(FdsSnackBarTitleDirective), - snackBarContent: new ngCore.ContentChildren(FdsSnackBarContentDirective), - snackBarActions: new ngCore.ContentChildren(FdsSnackBarActionsDirective) - } - }) -]; - -FdsSnackBarComponent.parameters = []; - -module.exports = { - FdsSnackBarTitleDirective: FdsSnackBarTitleDirective, - FdsSnackBarContentDirective: FdsSnackBarContentDirective, - FdsSnackBarActionsDirective: FdsSnackBarActionsDirective, - FdsSnackBarComponent: FdsSnackBarComponent -}; \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbars.module.js b/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbars.module.js deleted file mode 100644 index 657b1aed4..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbars.module.js +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); -var ngMaterial = require('@angular/material'); -var ngFlex = require('@angular/flex-layout'); -var ngCommon = require('@angular/common'); -var ngForms = require('@angular/forms'); -var fdsSnackBarComponentModule = require('@fluid-design-system/snackbar-component'); -var fdsSnackBarServiceModule = require('@fluid-design-system/snackbar-service'); -var FdsCoasterComponent = require('@fluid-design-system/coaster-component'); - -var FDS_SNACKBARS = [ - fdsSnackBarComponentModule.FdsSnackBarComponent, - fdsSnackBarComponentModule.FdsSnackBarTitleDirective, - fdsSnackBarComponentModule.FdsSnackBarActionsDirective, - fdsSnackBarComponentModule.FdsSnackBarContentDirective, - FdsCoasterComponent -]; - -var FDS_SNACKBARS_ENTRY_COMPONENTS = [ - FdsCoasterComponent -]; - -/** - * FdsSnackBarsModule constructor. - * - * @constructor - */ -function FdsSnackBarsModule() { - -}; - -FdsSnackBarsModule.prototype = { - constructor: FdsSnackBarsModule -}; - -FdsSnackBarsModule.annotations = [ - new ngCore.NgModule({ - imports: [ - ngFlex.FlexLayoutModule, - ngForms.FormsModule, - ngCommon.CommonModule, - ngMaterial.MatSnackBarModule, - ngMaterial.MatInputModule, - ngMaterial.MatButtonModule, - ngMaterial.MatIconModule - ], - declarations: [ - FDS_SNACKBARS - ], - exports: [ - FDS_SNACKBARS - ], - providers: [ - fdsSnackBarServiceModule.FdsSnackBarService - ], - entryComponents: [ - FDS_SNACKBARS_ENTRY_COMPONENTS - ] - }) -]; - -module.exports = { - FdsSnackBarsModule: FdsSnackBarsModule, - ICoasterConfig: fdsSnackBarServiceModule.ICoasterConfig, - FdsSnackBarService: fdsSnackBarServiceModule.FdsSnackBarService, - FdsSnackBarComponent: fdsSnackBarComponentModule.FdsSnackBarComponent, - FdsSnackBarTitleDirective: fdsSnackBarComponentModule.FdsSnackBarTitleDirective, - FdsSnackBarContentDirective: fdsSnackBarComponentModule.FdsSnackBarContentDirective, - FdsSnackBarActionsDirective: fdsSnackBarComponentModule.FdsSnackBarActionsDirective, - FdsCoasterComponent: FdsCoasterComponent -}; diff --git a/nifi-registry-web-ui/src/main/platform/core/snackbars/services/snackbar.service.js b/nifi-registry-web-ui/src/main/platform/core/snackbars/services/snackbar.service.js deleted file mode 100644 index 433db1166..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/services/snackbar.service.js +++ /dev/null @@ -1,132 +0,0 @@ -/* - * 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. - */ - -var ngCore = require('@angular/core'); -var ngMaterial = require('@angular/material'); -var FdsCoasterComponent = require('@fluid-design-system/coaster-component'); -var $ = require('jquery'); - -var ISnackBarConfig = new ngCore.Class({ - extends: ngMaterial.MatSnackBarConfig, - constructor: function () { - this.title = ''; - this.message = ''; - this.snackBarRef = undefined; - this.viewContainerRef = undefined; - } -}); - -var ICoasterConfig = new ngCore.Class({ - extends: ISnackBarConfig, - constructor: function () { - this.icon = ''; - this.color = ''; - } -}); - -/** - * FdsSnackBarService constructor. - * - * @param MatSnackBar The angular material MatSnackBar. - * @constructor - */ -function FdsSnackBarService(MatSnackBar) { - this.snackBarService = MatSnackBar; -} - -FdsSnackBarService.prototype = { - contstructor: FdsSnackBarService, - - /** - * Wrapper function over the open() method in MatSnackBar. - * - * @param message The message to show in the snackbar. - * @param action The label for the snackbar action. - * @param config Additional configuration options for the snackbar. - * - * @returns {MatSnackBarRef} The reference to the snackbar. - */ - open: function (message, action, config) { - return this.snackBarService.open(message, action, config); - }, - - /** - * Wrapper function over the openFromComponent() method in MatSnackBar. - * Opens a snackbar containing the given component. - * - * @param component The angular ComponentType. - * @param config The angular material MatSnackBarConfig. - * - * @returns {MatSnackBarRef} The reference to the snackbar. - */ - openFromComponent: function (component, config) { - return this.snackBarService.openFromComponent(component, config); - }, - - /** - * Wrapper function over the dismiss() method in MatSnackBar. - * Dismisses the currently-open snackbar. - */ - dismiss: function () { - this.snackBarService.dismiss(); - }, - - /** - * Opens a coaster snackbar with the provided config. - * - * @param config ICoasterConfig { - * message?: string; - * title?: string; - * snackBarRef?: MatSnackBarRef; - * viewContainerRef?: ViewContainerRef; - * icon?: string; - * color?: string; - * } - * - * @returns {MatSnackBarRef} The reference to the snackbar. - */ - openCoaster: function (config) { - var snackBarConfig = new ICoasterConfig(); - snackBarConfig.verticalPosition = config.verticalPosition; - snackBarConfig.horizontalPosition = config.horizontalPosition; - snackBarConfig.duration = config.duration; - var snackBarRef = this.snackBarService.openFromComponent(FdsCoasterComponent, snackBarConfig); - var coasterComponent = snackBarRef.instance; - coasterComponent.snackBarRef = snackBarRef; - if (config.title) { - coasterComponent.title = config.title; - } - if (config.message) { - coasterComponent.message = config.message; - } - if (config.icon) { - coasterComponent.icon = config.icon; - } - if (config.color) { - coasterComponent.color = config.color; - } - return snackBarRef; - }, -} - -FdsSnackBarService.parameters = [ngMaterial.MatSnackBar]; - -module.exports = { - ISnackBarConfig: ISnackBarConfig, - ICoasterConfig: ICoasterConfig, - FdsSnackBarService: FdsSnackBarService -}; \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/platform/core/theming/_all-theme.scss b/nifi-registry-web-ui/src/main/platform/core/theming/_all-theme.scss deleted file mode 100644 index 747ab8b51..000000000 --- a/nifi-registry-web-ui/src/main/platform/core/theming/_all-theme.scss +++ /dev/null @@ -1,36 +0,0 @@ -/* -* 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. -*/ - -@import '../../../node_modules/@angular/material/theming'; -@import '../../../node_modules/@covalent/core/theming/all-theme'; -@import '../common/styles/buttons'; -@import '../common/styles/expansionPanels'; -@import '../common/styles/menus'; - -// Create a theme. -@mixin fds-theme($theme) { - - // Include theme styles for core and each component used in your app. - // Alternatively, you can import and @include the theme mixins for each component - // that you are using. - @include angular-material-theme($theme); - @include covalent-theme($theme); - @include fds-buttons-theme($theme); - @include fds-expansion-panels-theme($theme); - @include fds-menus-theme($theme); - -} diff --git a/nifi-registry-web-ui/src/main/resources/filters/registry-min.properties b/nifi-registry-web-ui/src/main/resources/filters/registry-min.properties index b0b7a2605..b4cc4dd28 100644 --- a/nifi-registry-web-ui/src/main/resources/filters/registry-min.properties +++ b/nifi-registry-web-ui/src/main/resources/filters/registry-min.properties @@ -15,5 +15,5 @@ nf.registry.script.tags= nf.registry.style.tags=\n\ -\n\ +\n\ \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/resources/filters/registry.properties b/nifi-registry-web-ui/src/main/resources/filters/registry.properties index 710aaff88..704c763bf 100644 --- a/nifi-registry-web-ui/src/main/resources/filters/registry.properties +++ b/nifi-registry-web-ui/src/main/resources/filters/registry.properties @@ -22,5 +22,5 @@ console.error(err);\n\ });\n\ nf.registry.style.tags=\n\ -\n\ +\n\ \ No newline at end of file diff --git a/nifi-registry-web-ui/src/main/webapp/WEB-INF/web.xml b/nifi-registry-web-ui/src/main/webapp/WEB-INF/web.xml index c02079579..6913e5e6c 100644 --- a/nifi-registry-web-ui/src/main/webapp/WEB-INF/web.xml +++ b/nifi-registry-web-ui/src/main/webapp/WEB-INF/web.xml @@ -16,16 +16,6 @@ nifi-registry - - - FluidDesignSystem - /WEB-INF/pages/index.jsp - - - FluidDesignSystem - /fluid-design-system - - Login diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/nf-registry-administration.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/nf-registry-administration.spec.js index 90b49652d..fbf228a9f 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/nf-registry-administration.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/nf-registry-administration.spec.js @@ -37,7 +37,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var NfLoginComponent = require('nifi-registry/components/login/nf-registry-login.js'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.js index 17e670443..e80880386 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.js @@ -18,7 +18,7 @@ var covalentCore = require('@covalent/core'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var ngCore = require('@angular/core'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var ngMaterial = require('@angular/material'); var $ = require('jquery'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.spec.js index 8996a3257..1e0140d41 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.spec.js @@ -20,7 +20,7 @@ var NfRegistryService = require('nifi-registry/services/nf-registry.service.js') var NfRegistryAddUserToGroups = require('nifi-registry/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.js'); var rxjs = require('rxjs/Rx'); var covalentCore = require('@covalent/core'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); describe('NfRegistryAddUserToGroups Component isolated unit tests', function () { var comp; diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js index a725f5c9b..586b7f72a 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js @@ -19,7 +19,7 @@ var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var ngMaterial = require('@angular/material'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); /** * NfRegistryAddUser constructor. diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.js index 56f615be7..fff468b7b 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.js @@ -18,7 +18,7 @@ var covalentCore = require('@covalent/core'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var ngCore = require('@angular/core'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var ngMaterial = require('@angular/material'); var $ = require('jquery'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.spec.js index d8e41cbe1..c1d2c712f 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.spec.js @@ -20,7 +20,7 @@ var NfRegistryService = require('nifi-registry/services/nf-registry.service.js') var NfRegistryAddUsersToGroup = require('nifi-registry/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.js'); var rxjs = require('rxjs/Rx'); var covalentCore = require('@covalent/core'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); describe('NfRegistryAddUsersToGroup Component isolated unit tests', function () { var comp; diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js index 38297d813..bf8075e11 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js @@ -19,7 +19,7 @@ var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var ngMaterial = require('@angular/material'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); /** * NfRegistryCreateNewGroup constructor. diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js index db62a5c56..552628f10 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js @@ -22,7 +22,7 @@ var NfStorage = require('nifi-registry/services/nf-storage.service.js'); var ngRouter = require('@angular/router'); var nfRegistryAnimations = require('nifi-registry/nf-registry.animations.js'); var ngMaterial = require('@angular/material'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); var NfRegistryAddUser = require('nifi-registry/components/administration/users/dialogs/add-user/nf-registry-add-user.js'); var NfRegistryCreateNewGroup = require('nifi-registry/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-adminstration.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-adminstration.spec.js index f0bb42e9b..23751c877 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-adminstration.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-adminstration.spec.js @@ -37,7 +37,7 @@ var NfRegistryCreateBucket = require('nifi-registry/components/administration/wo var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.js index c743fc77f..7e48d792c 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.js @@ -16,8 +16,8 @@ */ var covalentCore = require('@covalent/core'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var ngRouter = require('@angular/router'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.spec.js index b744f1320..624447a8a 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.spec.js @@ -40,7 +40,7 @@ var NfRegistryCreateBucket = require('nifi-registry/components/administration/wo var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.js index d08ca2b8c..074a80082 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.js @@ -16,8 +16,8 @@ */ var covalentCore = require('@covalent/core'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var ngRouter = require('@angular/router'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.spec.js index ec94fa8a3..5994dd4b0 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.spec.js @@ -40,7 +40,7 @@ var NfRegistryCreateBucket = require('nifi-registry/components/administration/wo var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js index b20bff27f..7b284e8b6 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js @@ -22,7 +22,7 @@ var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var ngMaterial = require('@angular/material'); var ngRouter = require('@angular/router'); var covalentCore = require('@covalent/core'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); /** * NfRegistryAddPolicyToBucket constructor. diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js index 5a6b0c471..e756d341c 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js @@ -18,7 +18,7 @@ var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var ngMaterial = require('@angular/material'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); /** * NfRegistryCreateBucket constructor. diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/nf-registry-workflow-administration.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/nf-registry-workflow-administration.spec.js index 0b881c0c5..4e21ee428 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/nf-registry-workflow-administration.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/nf-registry-workflow-administration.spec.js @@ -37,7 +37,7 @@ var NfRegistryCreateBucket = require('nifi-registry/components/administration/wo var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.js b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.js index 692d5abaf..bc6391ebb 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.js @@ -17,8 +17,8 @@ var rxjs = require('rxjs/Observable'); var covalentCore = require('@covalent/core'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var ngRouter = require('@angular/router'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.spec.js b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.spec.js index 19cff68d4..9415cafc4 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.spec.js @@ -40,7 +40,7 @@ var NfRegistryCreateBucket = require('nifi-registry/components/administration/wo var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.spec.js b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.spec.js index 700ed492b..0a5299a7e 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.spec.js @@ -34,7 +34,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.spec.js b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.spec.js index 77488a920..523b813a7 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.spec.js @@ -34,7 +34,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.spec.js b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.spec.js index 47ddab5d9..3d96228a7 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.spec.js @@ -34,7 +34,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/explorer/nf-registry-explorer.spec.js b/nifi-registry-web-ui/src/main/webapp/components/explorer/nf-registry-explorer.spec.js index 4cf6c5f4d..cc3a97069 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/explorer/nf-registry-explorer.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/components/explorer/nf-registry-explorer.spec.js @@ -33,7 +33,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var ngCommonHttp = require('@angular/common/http'); var NfRegistryTokenInterceptor = require('nifi-registry/services/nf-registry.token.interceptor.js'); diff --git a/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js b/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js index 7ad52b8e0..1d1015523 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js +++ b/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js @@ -17,7 +17,7 @@ var ngCore = require('@angular/core'); var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var nfRegistryAnimations = require('nifi-registry/nf-registry.animations.js'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); var ngRouter = require('@angular/router'); /** diff --git a/nifi-registry-web-ui/src/main/webapp/nf-registry.module.js b/nifi-registry-web-ui/src/main/webapp/nf-registry.module.js index cafe1f6bb..c210ac433 100644 --- a/nifi-registry-web-ui/src/main/webapp/nf-registry.module.js +++ b/nifi-registry-web-ui/src/main/webapp/nf-registry.module.js @@ -41,7 +41,7 @@ var NfRegistryCreateBucket = require('nifi-registry/components/administration/wo var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngCommonHttp = require('@angular/common/http'); var NfRegistryTokenInterceptor = require('nifi-registry/services/nf-registry.token.interceptor.js'); var nfRegistryAuthGuardService = require('nifi-registry/services/nf-registry.auth-guard.service.js'); diff --git a/nifi-registry-web-ui/src/main/webapp/nf-registry.spec.js b/nifi-registry-web-ui/src/main/webapp/nf-registry.spec.js index c9d90d677..7b6339a66 100644 --- a/nifi-registry-web-ui/src/main/webapp/nf-registry.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/nf-registry.spec.js @@ -33,7 +33,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var ngHttp = require('@angular/http'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js index 9cde0d961..f75934fac 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js @@ -17,7 +17,7 @@ var NfStorage = require('nifi-registry/services/nf-storage.service.js'); var ngCommonHttp = require('@angular/common/http'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); var rxjs = require('rxjs/Observable'); var MILLIS_PER_SECOND = 1000; var headers = new Headers({'Content-Type': 'application/json'}); diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.spec.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.spec.js index c544d22d0..dce8af6d6 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.spec.js @@ -34,7 +34,7 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); var ngCommonHttp = require('@angular/common/http'); diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js index 12221c265..41b167588 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js @@ -18,7 +18,7 @@ var NfRegistryService = require('nifi-registry/services/nf-registry.service.js'); var NfStorage = require('nifi-registry/services/nf-storage.service.js'); var ngRouter = require('@angular/router'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); /** diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js index 51018ef8a..da71cdd83 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js @@ -17,8 +17,8 @@ var covalentCore = require('@covalent/core'); var ngRouter = require('@angular/router'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); -var fdsSnackBarsModule = require('@fluid-design-system/snackbars'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); +var fdsSnackBarsModule = require('@flow-design-system/snackbars'); var NfRegistryApi = require('nifi-registry/services/nf-registry.api.js'); var NfStorage = require('nifi-registry/services/nf-storage.service.js'); var rxjs = require('rxjs/Observable'); diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.spec.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.spec.js index 1341abd04..7ed75cc49 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.spec.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.spec.js @@ -34,10 +34,10 @@ var NfRegistryWorkflowAdministration = require('nifi-registry/components/adminis var NfRegistryGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.js'); var NfRegistryBucketGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.js'); var NfRegistryDropletGridListViewer = require('nifi-registry/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.js'); -var fdsCore = require('@fluid-design-system/core'); +var fdsCore = require('@flow-design-system/core'); var ngMoment = require('angular2-moment'); var rxjs = require('rxjs/Rx'); -var fdsDialogsModule = require('@fluid-design-system/dialogs'); +var fdsDialogsModule = require('@flow-design-system/dialogs'); var ngRouter = require('@angular/router'); var ngCommonHttp = require('@angular/common/http'); var NfRegistryTokenInterceptor = require('nifi-registry/services/nf-registry.token.interceptor.js'); diff --git a/nifi-registry-web-ui/src/main/webapp/systemjs.builder.config.js b/nifi-registry-web-ui/src/main/webapp/systemjs.builder.config.js index fda4f9fd2..882fd946c 100644 --- a/nifi-registry-web-ui/src/main/webapp/systemjs.builder.config.js +++ b/nifi-registry-web-ui/src/main/webapp/systemjs.builder.config.js @@ -40,7 +40,27 @@ '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', '@angular/flex-layout': 'npm:@angular/flex-layout/bundles/flex-layout.umd.js', + '@angular/flex-layout/core': 'npm:@angular/flex-layout/bundles/flex-layout-core.umd.js', + '@angular/flex-layout/extended': 'npm:@angular/flex-layout/bundles/flex-layout-extended.umd.js', + '@angular/flex-layout/flex': 'npm:@angular/flex-layout/bundles/flex-layout-flex.umd.js', '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + '@angular/material/core': 'npm:@angular/material/bundles/material-core.umd.js', + '@angular/material/card': 'npm:@angular/material/bundles/material-card.umd.js', + '@angular/material/divider': 'npm:@angular/material/bundles/material-divider.umd.js', + '@angular/material/progress-bar': 'npm:@angular/material/bundles/material-progress-bar.umd.js', + '@angular/material/progress-spinner': 'npm:@angular/material/bundles/material-progress-spinner.umd.js', + '@angular/material/chips': 'npm:@angular/material/bundles/material-chips.umd.js', + '@angular/material/input': 'npm:@angular/material/bundles/material-input.umd.js', + '@angular/material/icon': 'npm:@angular/material/bundles/material-icon.umd.js', + '@angular/material/button': 'npm:@angular/material/bundles/material-button.umd.js', + '@angular/material/checkbox': 'npm:@angular/material/bundles/material-checkbox.umd.js', + '@angular/material/tooltip': 'npm:@angular/material/bundles/material-tooltip.umd.js', + '@angular/material/dialog': 'npm:@angular/material/bundles/material-dialog.umd.js', + '@angular/material/sidenav': 'npm:@angular/material/bundles/material-sidenav.umd.js', + '@angular/material/menu': 'npm:@angular/material/bundles/material-menu.umd.js', + '@angular/material/form-field': 'npm:@angular/material/bundles/material-form-field.umd.js', + '@angular/material/toolbar': 'npm:@angular/material/bundles/material-toolbar.umd.js', + '@angular/material/autocomplete': 'npm:@angular/material/bundles/material-autocomplete.umd.js', '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js', '@angular/cdk': 'npm:@angular/cdk/bundles/cdk.umd.js', '@angular/cdk/accordion': 'npm:@angular/cdk/bundles/cdk-accordion.umd.js', @@ -66,7 +86,8 @@ 'hammerjs': 'npm:hammerjs/hammer.min.js', // Covalent - '@covalent/core': 'npm:@covalent/core/bundles/core.umd.min.js', + '@covalent/core': 'npm:@covalent/core/bundles/covalent-core.umd.min.js', + '@covalent/core/common': 'npm:@covalent/core/bundles/covalent-core-common.umd.min.js', // other libraries 'rxjs': 'npm:rxjs', @@ -79,16 +100,17 @@ 'querystring': 'npm:querystring', 'tslib': 'npm:tslib/tslib.js', - // Fluid Design System - '@fluid-design-system/core': 'npm:@fluid-design-system/dist/platform/core/fluid-design-system.module.js', - '@fluid-design-system/dialogs': 'npm:@fluid-design-system/dist/platform/core/dialogs/fds-dialogs.module.js', - '@fluid-design-system/dialog-component': 'npm:@fluid-design-system/dist/platform/core/dialogs/fds-dialog.component.js', - '@fluid-design-system/dialog-service': 'npm:@fluid-design-system/dist/platform/core/dialogs/services/dialog.service.js', - '@fluid-design-system/confirm-dialog-component': 'npm:@fluid-design-system/dist/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js', - '@fluid-design-system/snackbars': 'npm:@fluid-design-system/dist/platform/core/snackbars/fds-snackbars.module.js', - '@fluid-design-system/snackbar-component': 'npm:@fluid-design-system/dist/platform/core/snackbars/fds-snackbar.component.js', - '@fluid-design-system/snackbar-service': 'npm:@fluid-design-system/dist/platform/core/snackbars/services/snackbar.service.js', - '@fluid-design-system/coaster-component': 'npm:@fluid-design-system/dist/platform/core/snackbars/coaster/coaster.component.js', + // Flow Design System + '@flow-design-system/core': 'npm:@nifi-fds/core/flow-design-system.module.js', + '@flow-design-system/dialogs': 'npm:@nifi-fds/core/dialogs/fds-dialogs.module.js', + '@flow-design-system/dialog-component': 'npm:@nifi-fds/core/dialogs/fds-dialog.component.js', + '@flow-design-system/dialog-service': 'npm:@nifi-fds/core/dialogs/services/dialog.service.js', + '@flow-design-system/confirm-dialog-component': 'npm:@nifi-fds/core/dialogs/confirm-dialog/confirm-dialog.component.js', + '@flow-design-system/snackbars': 'npm:@nifi-fds/core/snackbars/fds-snackbars.module.js', + '@flow-design-system/snackbar-component': 'npm:@nifi-fds/core/snackbars/fds-snackbar.component.js', + '@flow-design-system/snackbar-service': 'npm:@nifi-fds/core/snackbars/services/snackbar.service.js', + '@flow-design-system/coaster-component': 'npm:@nifi-fds/core/snackbars/coaster/coaster.component.js', + '@flow-design-system/common/storage-service': 'npm:@nifi-fds/core/common/services/fds-storage.service.js', // Nifi Registry 'nifi-registry/nf-registry.module.js': 'nf-registry.module.js', diff --git a/nifi-registry-web-ui/src/main/webapp/systemjs.spec.config.js b/nifi-registry-web-ui/src/main/webapp/systemjs.spec.config.js index 87f1d1336..52c6206bd 100644 --- a/nifi-registry-web-ui/src/main/webapp/systemjs.spec.config.js +++ b/nifi-registry-web-ui/src/main/webapp/systemjs.spec.config.js @@ -40,7 +40,27 @@ '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', '@angular/flex-layout': 'npm:@angular/flex-layout/bundles/flex-layout.umd.js', + '@angular/flex-layout/core': 'npm:@angular/flex-layout/bundles/flex-layout-core.umd.js', + '@angular/flex-layout/extended': 'npm:@angular/flex-layout/bundles/flex-layout-extended.umd.js', + '@angular/flex-layout/flex': 'npm:@angular/flex-layout/bundles/flex-layout-flex.umd.js', '@angular/material': 'npm:@angular/material/bundles/material.umd.js', + '@angular/material/core': 'npm:@angular/material/bundles/material-core.umd.js', + '@angular/material/card': 'npm:@angular/material/bundles/material-card.umd.js', + '@angular/material/divider': 'npm:@angular/material/bundles/material-divider.umd.js', + '@angular/material/progress-bar': 'npm:@angular/material/bundles/material-progress-bar.umd.js', + '@angular/material/progress-spinner': 'npm:@angular/material/bundles/material-progress-spinner.umd.js', + '@angular/material/chips': 'npm:@angular/material/bundles/material-chips.umd.js', + '@angular/material/input': 'npm:@angular/material/bundles/material-input.umd.js', + '@angular/material/icon': 'npm:@angular/material/bundles/material-icon.umd.js', + '@angular/material/button': 'npm:@angular/material/bundles/material-button.umd.js', + '@angular/material/checkbox': 'npm:@angular/material/bundles/material-checkbox.umd.js', + '@angular/material/tooltip': 'npm:@angular/material/bundles/material-tooltip.umd.js', + '@angular/material/dialog': 'npm:@angular/material/bundles/material-dialog.umd.js', + '@angular/material/sidenav': 'npm:@angular/material/bundles/material-sidenav.umd.js', + '@angular/material/menu': 'npm:@angular/material/bundles/material-menu.umd.js', + '@angular/material/form-field': 'npm:@angular/material/bundles/material-form-field.umd.js', + '@angular/material/toolbar': 'npm:@angular/material/bundles/material-toolbar.umd.js', + '@angular/material/autocomplete': 'npm:@angular/material/bundles/material-autocomplete.umd.js', '@angular/platform-browser/animations': 'npm:@angular/platform-browser/bundles/platform-browser-animations.umd.js', '@angular/cdk': 'npm:@angular/cdk/bundles/cdk.umd.js', '@angular/cdk/a11y': 'npm:@angular/cdk/bundles/cdk-a11y.umd.js', @@ -66,7 +86,8 @@ 'hammerjs': 'npm:hammerjs/hammer.min.js', // Covalent - '@covalent/core': 'npm:@covalent/core/bundles/core.umd.min.js', + '@covalent/core': 'npm:@covalent/core/bundles/covalent-core.umd.min.js', + '@covalent/core/common': 'npm:@covalent/core/bundles/covalent-core-common.umd.min.js', // other libraries 'rxjs': 'npm:rxjs', @@ -79,16 +100,17 @@ 'querystring': 'npm:querystring', 'tslib': 'npm:tslib/tslib.js', - // Fluid Design System - '@fluid-design-system/core': 'npm:@fluid-design-system/dist/platform/core/fluid-design-system.module.js', - '@fluid-design-system/dialogs': 'npm:@fluid-design-system/dist/platform/core/dialogs/fds-dialogs.module.js', - '@fluid-design-system/dialog-component': 'npm:@fluid-design-system/dist/platform/core/dialogs/fds-dialog.component.js', - '@fluid-design-system/dialog-service': 'npm:@fluid-design-system/dist/platform/core/dialogs/services/dialog.service.js', - '@fluid-design-system/confirm-dialog-component': 'npm:@fluid-design-system/dist/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js', - '@fluid-design-system/snackbars': 'npm:@fluid-design-system/dist/platform/core/snackbars/fds-snackbars.module.js', - '@fluid-design-system/snackbar-component': 'npm:@fluid-design-system/dist/platform/core/snackbars/fds-snackbar.component.js', - '@fluid-design-system/snackbar-service': 'npm:@fluid-design-system/dist/platform/core/snackbars/services/snackbar.service.js', - '@fluid-design-system/coaster-component': 'npm:@fluid-design-system/dist/platform/core/snackbars/coaster/coaster.component.js' + // Flow Design System + '@flow-design-system/core': 'npm:@nifi-fds/core/flow-design-system.module.js', + '@flow-design-system/dialogs': 'npm:@nifi-fds/core/dialogs/fds-dialogs.module.js', + '@flow-design-system/dialog-component': 'npm:@nifi-fds/core/dialogs/fds-dialog.component.js', + '@flow-design-system/dialog-service': 'npm:@nifi-fds/core/dialogs/services/dialog.service.js', + '@flow-design-system/confirm-dialog-component': 'npm:@nifi-fds/core/dialogs/confirm-dialog/confirm-dialog.component.js', + '@flow-design-system/snackbars': 'npm:@nifi-fds/core/snackbars/fds-snackbars.module.js', + '@flow-design-system/snackbar-component': 'npm:@nifi-fds/core/snackbars/fds-snackbar.component.js', + '@flow-design-system/snackbar-service': 'npm:@nifi-fds/core/snackbars/services/snackbar.service.js', + '@flow-design-system/coaster-component': 'npm:@nifi-fds/core/snackbars/coaster/coaster.component.js', + '@flow-design-system/common/storage-service': 'npm:@nifi-fds/core/common/services/fds-storage.service.js' }, // packages tells the System loader how to load when no filename and/or no extension packages: { diff --git a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss index 396648344..bd3532808 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss @@ -83,6 +83,7 @@ body { #nifi-registry-toolbar span, #nifi-registry-toolbar .link { color: $grey5; + font-weight: normal; } #nf-registry-perspectives-container { diff --git a/nifi-registry-web-ui/src/main/webapp/theming/components/administration/users/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/components/administration/users/_structureElements.scss index 105245b85..ab211a811 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/components/administration/users/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/components/administration/users/_structureElements.scss @@ -28,9 +28,9 @@ overflow-y: auto; position: absolute; bottom: 30px; - top: 148px; - left: 30px; - right: 30px; + top: 142px; + left: 24px; + right: 24px; overflow-x: hidden; } diff --git a/nifi-registry-web-ui/src/main/webapp/theming/components/administration/workflow/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/components/administration/workflow/_structureElements.scss index 8802d0524..77f46804e 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/components/administration/workflow/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/components/administration/workflow/_structureElements.scss @@ -28,9 +28,9 @@ overflow-y: auto; position: absolute; bottom: 30px; - top: 148px; - left: 30px; - right: 30px; + top: 142px; + left: 24px; + right: 24px; overflow-x: hidden; } diff --git a/nifi-registry-web-ui/src/main/webapp/theming/nf-registry.scss b/nifi-registry-web-ui/src/main/webapp/theming/nf-registry.scss index 0d70b20c3..c27c511e7 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/nf-registry.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/nf-registry.scss @@ -19,8 +19,8 @@ * In this file you should centralize your imports. After compilation simply import this file using the following HTML or equivalent: * */ -@import '../../platform/core/common/styles/globalVars'; -@import '../../platform/core/theming/all-theme'; +@import '../../node_modules/@nifi-fds/core/common/styles/globalVars'; +@import '../../node_modules/@nifi-fds/core/theming/all-theme'; @import 'structureElements'; @import 'helperClasses'; @import 'components/administration/structureElements'; From de7b6935aebdeee039cbe082b61bf37dd70a7df4 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Fri, 15 Jun 2018 10:28:05 -0400 Subject: [PATCH 2/6] [NIFIREG-39] unset td-chips input width --- .../src/main/webapp/theming/_structureElements.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss index bd3532808..bb3b770b4 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss @@ -137,3 +137,7 @@ mat-sidenav { left: 0px; overflow: auto; } + +body[fds] mat-form-field.td-chips-form-field.mat-input-container { + width: unset; +} From 159014fb48c2826bdf44b0a7194c6b7a2451e8dd Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Fri, 15 Jun 2018 13:20:08 -0400 Subject: [PATCH 3/6] [NIFIREG-39] update expansion, breadcrumb, and chip font styles --- .../src/main/webapp/services/nf-registry.api.js | 12 ------------ .../main/webapp/theming/_structureElements.scss | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js index f75934fac..7db225364 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js @@ -559,12 +559,6 @@ NfRegistryApi.prototype = { return response; }) .catch(function (error) { - self.dialogService.openConfirm({ - title: 'Error', - message: error.error, - acceptButton: 'Ok', - acceptButtonColor: 'fds-warn' - }); return rxjs.Observable.of(error); }); }, @@ -583,12 +577,6 @@ NfRegistryApi.prototype = { return response; }) .catch(function (error) { - self.dialogService.openConfirm({ - title: 'Error', - message: error.error, - acceptButton: 'Ok', - acceptButtonColor: 'fds-warn' - }); return rxjs.Observable.of(error); }); }, diff --git a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss index bb3b770b4..f05cf3bc0 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss @@ -83,7 +83,7 @@ body { #nifi-registry-toolbar span, #nifi-registry-toolbar .link { color: $grey5; - font-weight: normal; + font-weight: lighter; } #nf-registry-perspectives-container { @@ -141,3 +141,16 @@ mat-sidenav { body[fds] mat-form-field.td-chips-form-field.mat-input-container { width: unset; } + +body[fds] .md-title { + font-weight: normal; + color: $grey3; +} + +body[fds] .md-subhead { + font-weight: lighter; +} + +body[fds] .td-chip span { + font-size: 10px; +} From 8629a82a8b8bf37bd10148eb875e3b53e1038480 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Fri, 15 Jun 2018 13:51:43 -0400 Subject: [PATCH 4/6] [NIFIREG-39] update td-datat-table to flex --- .../src/main/webapp/theming/_structureElements.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss index f05cf3bc0..aebed598b 100644 --- a/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss +++ b/nifi-registry-web-ui/src/main/webapp/theming/_structureElements.scss @@ -154,3 +154,7 @@ body[fds] .md-subhead { body[fds] .td-chip span { font-size: 10px; } + +body[fds] div .td-data-table { + display: flex; +} \ No newline at end of file From e3a960d16dffb2fb58cd8da4d39dc35de25d1c27 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Fri, 15 Jun 2018 14:14:03 -0400 Subject: [PATCH 5/6] [NIFIREG-39] enable Add to group button if any group is configurable --- .../manage-user/nf-registry-manage-user.html | 2 +- .../sidenav/manage-user/nf-registry-manage-user.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html index e362c3727..791c1a550 100644 --- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html +++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html @@ -154,7 +154,7 @@
Membership ({{nfRegistryService.user.userGroups.length}})