http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js ---------------------------------------------------------------------- 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 552e68f..0000000 --- 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;
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.html ---------------------------------------------------------------------- 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 4d39e73..0000000 --- a/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.html +++ /dev/null @@ -1,29 +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. ---> - -<div class="fds-dialog-wrapper"> - <h3 class="fds-dialog-title mat-title" *ngIf="dialogTitle.length > 0"> - <ng-content select="fds-dialog-title"></ng-content> - </h3> - <div class="fds-dialog-content pad-bottom-md" *ngIf="dialogContent.length > 0"> - <ng-content select="fds-dialog-content"></ng-content> - </div> - <div class="fds-dialog-actions" *ngIf="dialogActions.length > 0" layout="row"> - <span flex></span> - <ng-content select="fds-dialog-actions"></ng-content> - </div> -</div> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialog.component.js ---------------------------------------------------------------------- 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 d71a292..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/dialogs/fds-dialogs.module.js ---------------------------------------------------------------------- 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 3758655..0000000 --- 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 -}; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/dialogs/services/dialog.service.js ---------------------------------------------------------------------- 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 9bf1ee9..0000000 --- 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<T>. - * @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 http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/fluid-design-system.module.js ---------------------------------------------------------------------- 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 7a7aaec..0000000 --- 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; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/_coaster.component.scss ---------------------------------------------------------------------- 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 b207c8d..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.html ---------------------------------------------------------------------- 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 8b8414b..0000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.html +++ /dev/null @@ -1,33 +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-snackbar> - <fds-snackbar-title *ngIf="title"> - <button class="coaster-close-icon" mat-icon-button (click)="cancel()"> - <mat-icon color="primary">close</mat-icon> - </button> - <i *ngIf="icon" class="{{icon}} fds-coaster-icon" aria-hidden="true"></i> - <div class="ellipsis" fxLayout="row" title="{{title}}" fxLayoutAlign="space-between center"> - {{title}} - </div> - </fds-snackbar-title> - <fds-snackbar-content title="{{message}}" class="fds-coaster-message ellipsis tc-grey-700"> - {{message}} - </fds-snackbar-content> - <fds-snackbar-actions> - </fds-snackbar-actions> -</fds-snackbar> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/coaster/coaster.component.js ---------------------------------------------------------------------- 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 0213f2e..0000000 --- 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; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.html ---------------------------------------------------------------------- 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 f3c6def..0000000 --- a/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.html +++ /dev/null @@ -1,29 +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. ---> - -<div class="fds-snackbar-wrapper"> - <div class="fds-snackbar-title md-title" *ngIf="snackBarTitle.length > 0"> - <ng-content select="fds-snackbar-title"></ng-content> - </div> - <div class="fds-snackbar-content" *ngIf="snackBarContent.length > 0"> - <ng-content select="fds-snackbar-content"></ng-content> - </div> - <div class="fds-snackbar-actions" *ngIf="snackBarActions.length > 0" layout="row"> - <span flex></span> - <ng-content select="fds-snackbar-actions"></ng-content> - </div> -</div> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbar.component.js ---------------------------------------------------------------------- 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 40c50c1..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/fds-snackbars.module.js ---------------------------------------------------------------------- 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 657b1ae..0000000 --- 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 -}; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/snackbars/services/snackbar.service.js ---------------------------------------------------------------------- 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 433db11..0000000 --- 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<T>. - * @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 http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/platform/core/theming/_all-theme.scss ---------------------------------------------------------------------- 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 747ab8b..0000000 --- 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); - -} http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/resources/filters/registry-min.properties ---------------------------------------------------------------------- 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 b0b7a26..b4cc4dd 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=<script src="nifi-registry/nf-registry.bundle.min.js?${project.version}"></script> nf.registry.style.tags=<link rel="stylesheet" href="nifi-registry/node_modules/@covalent/core/common/platform.css?${project.version}">\n\ -<link rel="stylesheet" href='nifi-registry/node_modules/@fluid-design-system/dist/platform/core/common/styles/css/fluid-design-system.min.css?${project.version}'/>\n\ +<link rel="stylesheet" href='nifi-registry/node_modules/@nifi-fds/core/common/styles/css/flow-design-system.min.css?${project.version}'/>\n\ <link rel="stylesheet" href='nifi-registry/css/nf-registry.min.css?${project.version}'/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/resources/filters/registry.properties ---------------------------------------------------------------------- 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 710aaff..704c763 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\ </script> nf.registry.style.tags=<link rel="stylesheet" href="nifi-registry/node_modules/@covalent/core/common/platform.css?${project.version}">\n\ -<link rel="stylesheet" href='nifi-registry/node_modules/@fluid-design-system/dist/platform/core/common/styles/css/fluid-design-system.min.css?${project.version}'/>\n\ +<link rel="stylesheet" href='nifi-registry/node_modules/@nifi-fds/core/common/styles/css/flow-design-system.min.css?${project.version}'/>\n\ <link rel="stylesheet" href='nifi-registry/css/nf-registry.min.css?${project.version}'/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- 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 c020795..6913e5e 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 @@ <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> <display-name>nifi-registry</display-name> - <!-- servlet to map to fluid design system page --> - <servlet> - <servlet-name>FluidDesignSystem</servlet-name> - <jsp-file>/WEB-INF/pages/index.jsp</jsp-file> - </servlet> - <servlet-mapping> - <servlet-name>FluidDesignSystem</servlet-name> - <url-pattern>/fluid-design-system</url-pattern> - </servlet-mapping> - <!-- servlet to map to login page --> <servlet> <servlet-name>Login</servlet-name> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/nf-registry-administration.spec.js ---------------------------------------------------------------------- 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 90b4965..fbf228a 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.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 17e6704..e808803 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user-to-groups/nf-registry-add-user-to-groups.spec.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.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 8996a32..1e0140d 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; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js ---------------------------------------------------------------------- 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 a725f5c..586b7f7 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. http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.js ---------------------------------------------------------------------- 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 56f615b..fff468b 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-users-to-group/nf-registry-add-users-to-group.spec.js ---------------------------------------------------------------------- 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 d8e41cb..c1d2c71 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; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/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/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 38297d8..bf8075e 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. http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js ---------------------------------------------------------------------- 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 db62a5c..552628f 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-adminstration.spec.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 f0bb42e..23751c8 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.js ---------------------------------------------------------------------- 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 c743fc7..7e48d79 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-group/nf-registry-manage-group.spec.js ---------------------------------------------------------------------- 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 b744f13..624447a 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.html ---------------------------------------------------------------------- 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 e362c37..791c1a5 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 @@ limitations under the License. <div flex fxLayout="row" fxLayoutAlign="space-between center"> <span class="md-card-title">Membership ({{nfRegistryService.user.userGroups.length}})</span> <button color="fds-secondary" - [disabled]="!nfRegistryService.currentUser.resourcePermissions.tenants.canWrite || !nfRegistryService.user.configurable" + [disabled]="!nfRegistryService.currentUser.resourcePermissions.tenants.canWrite || canAddNonConfigurableUserToGroup()" mat-raised-button (click)="addUserToGroups()"> Add To Group http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.js ---------------------------------------------------------------------- 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 d08ca2b..aa2b0fd 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'); @@ -585,6 +585,20 @@ NfRegistryManageUser.prototype = { }); } }); + }, + + /** + * Determine disabled state of 'Add to Groups' button + * @returns {boolean} + */ + canAddNonConfigurableUserToGroup: function() { + var disabled = true; + this.nfRegistryService.groups.forEach(function (userGroup) { + if(userGroup.configurable === true){ + disabled = false; + } + }); + return disabled; } }; http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/users/sidenav/manage-user/nf-registry-manage-user.spec.js ---------------------------------------------------------------------- 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 ec94fa8..5994dd4 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js ---------------------------------------------------------------------- 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 b20bff2..7b284e8 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. http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js ---------------------------------------------------------------------- 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 5a6b0c4..e756d34 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. http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/nf-registry-workflow-administration.spec.js ---------------------------------------------------------------------- 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 0b881c0..4e21ee4 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.js ---------------------------------------------------------------------- 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 692d5ab..bc6391e 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/sidenav/manage-bucket/nf-registry-manage-bucket.spec.js ---------------------------------------------------------------------- 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 19cff68..9415caf 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-bucket-grid-list-viewer.spec.js ---------------------------------------------------------------------- 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 700ed49..0a5299a 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-droplet-grid-list-viewer.spec.js ---------------------------------------------------------------------- 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 77488a9..523b813 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.spec.js ---------------------------------------------------------------------- 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 47ddab5..3d96228 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/explorer/nf-registry-explorer.spec.js ---------------------------------------------------------------------- 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 4cf6c5f..cc3a970 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.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 7ad52b8..1d10155 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'); /** http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/nf-registry.module.js ---------------------------------------------------------------------- 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 cafe1f6..c210ac4 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/nf-registry.spec.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 c9d90d6..7b6339a 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'); http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/186d9259/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js ---------------------------------------------------------------------- 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 9cde0d9..7db2253 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'}); @@ -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); }); },
