This is an automated email from the ASF dual-hosted git repository. zjffdu pushed a commit to branch web_angular in repository https://gitbox.apache.org/repos/asf/zeppelin.git
commit c5658b2c0905e4abf52ea0fe95a8849d3df94a6c Author: Hsuan Lee <hsua...@gmail.com> AuthorDate: Thu Dec 12 11:35:34 2019 +0800 [ZEPPELIN-4501] Use secondary entry imports ### What is this PR for? Use secondary entry to speed up the build ### What type of PR is it? [Refactoring] ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-4501 ### How should this be tested? Not applicable ### Screenshots (if appropriate) Not applicable ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Hsuan Lee <hsua...@gmail.com> Closes #3561 from hsuanxyz/refactor/use-secondary-entry and squashes the following commits: 3c3e6e0be [Hsuan Lee] refactor: use secondary entry imports --- zeppelin-web-angular/package-lock.json | 6 + zeppelin-web-angular/package.json | 1 + .../src/app/app-message.interceptor.ts | 3 +- zeppelin-web-angular/src/app/app.module.ts | 4 +- zeppelin-web-angular/src/app/core/public-api.ts | 1 + .../index.ts} | 5 +- .../runtime-dynamic-module/ng-zorro-antd-module.ts | 148 +++++++++++++++++++++ .../{ => runtime-dynamic-module}/public-api.ts | 5 +- .../runtime-dynamic-module.module.ts | 10 ++ .../src/app/pages/login/login.module.ts | 5 +- .../configuration/configuration.module.ts | 2 +- .../workspace/credential/credential.component.ts | 3 +- .../workspace/credential/credential.module.ts | 26 ++-- .../src/app/pages/workspace/home/home.module.ts | 4 +- .../create-repository-modal.component.ts | 2 +- .../workspace/interpreter/interpreter.component.ts | 4 +- .../workspace/interpreter/interpreter.module.ts | 38 +++--- .../workspace/job-manager/job-manager.component.ts | 2 +- .../workspace/job-manager/job-manager.module.ts | 31 ++--- .../notebook-repos/notebook-repos.module.ts | 16 +-- .../notebook/action-bar/action-bar.component.ts | 3 +- .../interpreter-binding.component.ts | 2 +- .../pages/workspace/notebook/notebook.module.ts | 32 +++-- .../paragraph/control/control.component.ts | 3 +- .../notebook/permissions/permissions.component.ts | 3 +- .../pages/workspace/notebook/share/share.module.ts | 2 +- .../share/dynamic-forms/dynamic-forms.component.ts | 2 +- .../src/app/pages/workspace/share/share.module.ts | 18 ++- .../src/app/pages/workspace/workspace.component.ts | 2 +- .../app/services/ng-template-adapter.service.ts | 2 +- .../src/app/services/note-action.service.ts | 2 +- .../src/app/services/runtime-compiler.service.ts | 7 +- .../src/app/services/ticket.service.ts | 2 +- .../share/folder-rename/folder-rename.component.ts | 2 +- .../src/app/share/header/header.component.ts | 2 +- .../share/ng1-migration/ng1-migration.component.ts | 2 +- .../src/app/share/node-list/node-list.component.ts | 3 +- .../app/share/note-create/note-create.component.ts | 2 +- .../app/share/note-import/note-import.component.ts | 3 +- .../app/share/note-rename/note-rename.component.ts | 2 +- .../app/share/page-header/page-header.component.ts | 2 +- zeppelin-web-angular/src/app/share/share.module.ts | 46 +++---- .../table/table-visualization.component.ts | 2 +- .../src/app/visualizations/visualization.module.ts | 26 ++-- zeppelin-web-angular/tslint.json | 3 +- 45 files changed, 324 insertions(+), 167 deletions(-) diff --git a/zeppelin-web-angular/package-lock.json b/zeppelin-web-angular/package-lock.json index cd5fb2f..da898b0 100644 --- a/zeppelin-web-angular/package-lock.json +++ b/zeppelin-web-angular/package-lock.json @@ -10311,6 +10311,12 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, + "nz-tslint-rules": { + "version": "0.800.2", + "resolved": "https://registry.npmjs.org/nz-tslint-rules/-/nz-tslint-rules-0.800.2.tgz", + "integrity": "sha512-iMDMG8XYpOlZ/Shr2qomFEaU9ptRmQNkPT8g+BGeZo7LUBrnSTKlvuak2ZWjEMjpgivZIEo861laow18QDuwcQ==", + "dev": true + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", diff --git a/zeppelin-web-angular/package.json b/zeppelin-web-angular/package.json index 9d9aa93..670c73c 100644 --- a/zeppelin-web-angular/package.json +++ b/zeppelin-web-angular/package.json @@ -74,6 +74,7 @@ "monaco-editor-webpack-plugin": "^1.7.0", "ng-packagr": "^5.4.0", "ngx-build-plus": "^8.1.5", + "nz-tslint-rules": "^0.800.2", "prettier": "^1.17.0", "protractor": "~5.4.0", "ts-node": "~7.0.0", diff --git a/zeppelin-web-angular/src/app/app-message.interceptor.ts b/zeppelin-web-angular/src/app/app-message.interceptor.ts index 0e9843d..02fdf96 100644 --- a/zeppelin-web-angular/src/app/app-message.interceptor.ts +++ b/zeppelin-web-angular/src/app/app-message.interceptor.ts @@ -13,7 +13,8 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { NzModalService, NzNotificationService } from 'ng-zorro-antd'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { NzNotificationService } from 'ng-zorro-antd/notification'; import { MessageInterceptor } from '@zeppelin/interfaces'; import { MessageReceiveDataTypeMap, OP, WebSocketMessage } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/app.module.ts b/zeppelin-web-angular/src/app/app.module.ts index ae3347c..06be7f4 100644 --- a/zeppelin-web-angular/src/app/app.module.ts +++ b/zeppelin-web-angular/src/app/app.module.ts @@ -20,7 +20,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { Router, RouterModule } from '@angular/router'; import { ZeppelinHeliumModule } from '@zeppelin/helium'; -import { en_US, NzModalService, NzNotificationService, NZ_I18N } from 'ng-zorro-antd'; +import { en_US, NZ_I18N } from 'ng-zorro-antd/i18n'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { NzNotificationService } from 'ng-zorro-antd/notification'; import { MESSAGE_INTERCEPTOR, TRASH_FOLDER_ID_TOKEN } from '@zeppelin/interfaces'; import { loadMonacoLanguage } from '@zeppelin/languages'; diff --git a/zeppelin-web-angular/src/app/core/public-api.ts b/zeppelin-web-angular/src/app/core/public-api.ts index 3bcd355..3f334c8 100644 --- a/zeppelin-web-angular/src/app/core/public-api.ts +++ b/zeppelin-web-angular/src/app/core/public-api.ts @@ -14,3 +14,4 @@ export * from './message-listener'; export * from './destroy-hook'; export * from './copy-text'; export * from './paragraph-base'; +export * from './runtime-dynamic-module'; diff --git a/zeppelin-web-angular/src/app/core/public-api.ts b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/index.ts similarity index 80% copy from zeppelin-web-angular/src/app/core/public-api.ts copy to zeppelin-web-angular/src/app/core/runtime-dynamic-module/index.ts index 3bcd355..49e4740 100644 --- a/zeppelin-web-angular/src/app/core/public-api.ts +++ b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/index.ts @@ -10,7 +10,4 @@ * limitations under the License. */ -export * from './message-listener'; -export * from './destroy-hook'; -export * from './copy-text'; -export * from './paragraph-base'; +export * from './public-api'; diff --git a/zeppelin-web-angular/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts new file mode 100644 index 0000000..42c2d11 --- /dev/null +++ b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts @@ -0,0 +1,148 @@ +/* + * Licensed 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 { NgModule } from '@angular/core'; + +import { NzAffixModule } from 'ng-zorro-antd/affix'; +import { NzAlertModule } from 'ng-zorro-antd/alert'; +import { NzAnchorModule } from 'ng-zorro-antd/anchor'; +import { NzAutocompleteModule } from 'ng-zorro-antd/auto-complete'; +import { NzAvatarModule } from 'ng-zorro-antd/avatar'; +import { NzBackTopModule } from 'ng-zorro-antd/back-top'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; +import { NzBreadCrumbModule } from 'ng-zorro-antd/breadcrumb'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCalendarModule } from 'ng-zorro-antd/calendar'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzCarouselModule } from 'ng-zorro-antd/carousel'; +import { NzCascaderModule } from 'ng-zorro-antd/cascader'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzCollapseModule } from 'ng-zorro-antd/collapse'; +import { NzCommentModule } from 'ng-zorro-antd/comment'; +import { NzNoAnimationModule, NzTransButtonModule, NzWaveModule } from 'ng-zorro-antd/core'; +import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; +import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzDrawerModule } from 'ng-zorro-antd/drawer'; +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzI18nModule } from 'ng-zorro-antd/i18n'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzInputNumberModule } from 'ng-zorro-antd/input-number'; +import { NzLayoutModule } from 'ng-zorro-antd/layout'; +import { NzListModule } from 'ng-zorro-antd/list'; +import { NzMentionModule } from 'ng-zorro-antd/mention'; +import { NzMenuModule } from 'ng-zorro-antd/menu'; +import { NzMessageModule } from 'ng-zorro-antd/message'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzNotificationModule } from 'ng-zorro-antd/notification'; +import { NzPageHeaderModule } from 'ng-zorro-antd/page-header'; +import { NzPaginationModule } from 'ng-zorro-antd/pagination'; +import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; +import { NzPopoverModule } from 'ng-zorro-antd/popover'; +import { NzProgressModule } from 'ng-zorro-antd/progress'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { NzRateModule } from 'ng-zorro-antd/rate'; +import { NzResultModule } from 'ng-zorro-antd/result'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'; +import { NzSliderModule } from 'ng-zorro-antd/slider'; +import { NzSpinModule } from 'ng-zorro-antd/spin'; +import { NzStatisticModule } from 'ng-zorro-antd/statistic'; +import { NzStepsModule } from 'ng-zorro-antd/steps'; +import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzTabsModule } from 'ng-zorro-antd/tabs'; +import { NzTagModule } from 'ng-zorro-antd/tag'; +import { NzTimePickerModule } from 'ng-zorro-antd/time-picker'; +import { NzTimelineModule } from 'ng-zorro-antd/timeline'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; +import { NzTransferModule } from 'ng-zorro-antd/transfer'; +import { NzTreeModule } from 'ng-zorro-antd/tree'; +import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; +import { NzTypographyModule } from 'ng-zorro-antd/typography'; +import { NzUploadModule } from 'ng-zorro-antd/upload'; + +@NgModule({ + exports: [ + NzAffixModule, + NzAlertModule, + NzAnchorModule, + NzAutocompleteModule, + NzAvatarModule, + NzBackTopModule, + NzBadgeModule, + NzButtonModule, + NzBreadCrumbModule, + NzCalendarModule, + NzCardModule, + NzCarouselModule, + NzCascaderModule, + NzCheckboxModule, + NzCollapseModule, + NzCommentModule, + NzDatePickerModule, + NzDescriptionsModule, + NzDividerModule, + NzDrawerModule, + NzDropDownModule, + NzEmptyModule, + NzFormModule, + NzGridModule, + NzI18nModule, + NzIconModule, + NzInputModule, + NzInputNumberModule, + NzLayoutModule, + NzListModule, + NzMentionModule, + NzMenuModule, + NzMessageModule, + NzModalModule, + NzNoAnimationModule, + NzNotificationModule, + NzPageHeaderModule, + NzPaginationModule, + NzPopconfirmModule, + NzPopoverModule, + NzProgressModule, + NzRadioModule, + NzRateModule, + NzResultModule, + NzSelectModule, + NzSkeletonModule, + NzSliderModule, + NzSpinModule, + NzStatisticModule, + NzStepsModule, + NzSwitchModule, + NzTableModule, + NzTabsModule, + NzTagModule, + NzTimePickerModule, + NzTimelineModule, + NzToolTipModule, + NzTransButtonModule, + NzTransferModule, + NzTreeModule, + NzTreeSelectModule, + NzTypographyModule, + NzUploadModule, + NzWaveModule + ] +}) +export class NzModule { + constructor() {} +} diff --git a/zeppelin-web-angular/src/app/core/public-api.ts b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/public-api.ts similarity index 80% copy from zeppelin-web-angular/src/app/core/public-api.ts copy to zeppelin-web-angular/src/app/core/runtime-dynamic-module/public-api.ts index 3bcd355..a8a0702 100644 --- a/zeppelin-web-angular/src/app/core/public-api.ts +++ b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/public-api.ts @@ -10,7 +10,4 @@ * limitations under the License. */ -export * from './message-listener'; -export * from './destroy-hook'; -export * from './copy-text'; -export * from './paragraph-base'; +export * from './runtime-dynamic-module.module'; diff --git a/zeppelin-web-angular/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts new file mode 100644 index 0000000..d6cb44c --- /dev/null +++ b/zeppelin-web-angular/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts @@ -0,0 +1,10 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { NzModule } from './ng-zorro-antd-module'; + +@NgModule({ + declarations: [], + exports: [CommonModule, FormsModule, NzModule] +}) +export class RuntimeDynamicModuleModule {} diff --git a/zeppelin-web-angular/src/app/pages/login/login.module.ts b/zeppelin-web-angular/src/app/pages/login/login.module.ts index 46f40a0..7a040a6 100644 --- a/zeppelin-web-angular/src/app/pages/login/login.module.ts +++ b/zeppelin-web-angular/src/app/pages/login/login.module.ts @@ -14,7 +14,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { NzButtonModule, NzFormModule, NzIconModule, NzInputModule } from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; import { LoginRoutingModule } from './login-routing.module'; import { LoginComponent } from './login.component'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.module.ts b/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.module.ts index ff64f89..9540170 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.module.ts @@ -13,7 +13,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ShareModule } from '@zeppelin/share'; -import { NzTableModule } from 'ng-zorro-antd'; +import { NzTableModule } from 'ng-zorro-antd/table'; import { ConfigurationRoutingModule } from './configuration-routing.module'; import { ConfigurationComponent } from './configuration.component'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts index 47150db..b28a6a6 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts @@ -12,7 +12,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { collapseMotion, NzMessageService } from 'ng-zorro-antd'; +import { collapseMotion } from 'ng-zorro-antd/core'; +import { NzMessageService } from 'ng-zorro-antd/message'; import { finalize } from 'rxjs/operators'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.module.ts b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.module.ts index a126980..39756ed 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/credential/credential.module.ts @@ -14,20 +14,18 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ShareModule } from '@zeppelin/share'; -import { - NzAutocompleteModule, - NzButtonModule, - NzCardModule, - NzDividerModule, - NzFormModule, - NzGridModule, - NzIconModule, - NzInputModule, - NzMessageModule, - NzPopconfirmModule, - NzTableModule, - NzToolTipModule -} from 'ng-zorro-antd'; +import { NzAutocompleteModule } from 'ng-zorro-antd/auto-complete'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzMessageModule } from 'ng-zorro-antd/message'; +import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { CredentialRoutingModule } from './credential-routing.module'; import { CredentialComponent } from './credential.component'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/home/home.module.ts b/zeppelin-web-angular/src/app/pages/workspace/home/home.module.ts index 24e59a7..49a2973 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/home/home.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/home/home.module.ts @@ -13,7 +13,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { NzGridModule, NzIconModule, NzToolTipModule } from 'ng-zorro-antd'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { ShareModule } from '@zeppelin/share'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts b/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts index 8dd38c9..90e02a7 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts @@ -14,7 +14,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { takeUntil } from 'rxjs/operators'; -import { NzModalRef } from 'ng-zorro-antd'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { DestroyHookComponent } from '@zeppelin/core'; import { CreateInterpreterRepositoryForm } from '@zeppelin/interfaces'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.ts b/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.ts index 8e21628..0507cd8 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.ts @@ -14,7 +14,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { collapseMotion, NzMessageService, NzModalService } from 'ng-zorro-antd'; +import { collapseMotion } from 'ng-zorro-antd/core'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { Interpreter, InterpreterPropertyTypes, InterpreterRepository } from '@zeppelin/interfaces'; import { InterpreterService } from '@zeppelin/services'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.module.ts b/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.module.ts index 37a9a0e..6ed202f 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.module.ts @@ -13,26 +13,24 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { - NzAlertModule, - NzBadgeModule, - NzButtonModule, - NzCardModule, - NzCheckboxModule, - NzDividerModule, - NzDropDownModule, - NzFormModule, - NzIconModule, - NzInputModule, - NzMessageModule, - NzModalModule, - NzRadioModule, - NzSelectModule, - NzSwitchModule, - NzTableModule, - NzTagModule, - NzToolTipModule -} from 'ng-zorro-antd'; +import { NzAlertModule } from 'ng-zorro-antd/alert'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzMessageModule } from 'ng-zorro-antd/message'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzTagModule } from 'ng-zorro-antd/tag'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { ShareModule } from '@zeppelin/share'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.ts b/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.ts index 8e426fd..fef8441 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.ts @@ -13,7 +13,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { NzModalService } from 'ng-zorro-antd'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { MessageListener, MessageListenersManager } from '@zeppelin/core'; import { JobsItem, JobStatus, ListNoteJobs, ListUpdateNoteJobs, OP } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.module.ts b/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.module.ts index 5ce1f07..c8b1b18 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.module.ts @@ -16,23 +16,20 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { IconDefinition } from '@ant-design/icons-angular'; import { ClockCircleOutline, FileOutline, FileUnknownOutline, SearchOutline } from '@ant-design/icons-angular/icons'; -import { - NzBadgeModule, - NzCardModule, - NzDividerModule, - NzEmptyModule, - NzFormModule, - NzGridModule, - NzHighlightModule, - NzIconModule, - NzInputModule, - NzModalModule, - NzProgressModule, - NzSelectModule, - NzSkeletonModule, - NzToolTipModule, - NZ_ICONS -} from 'ng-zorro-antd'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzHighlightModule } from 'ng-zorro-antd/core'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzEmptyModule } from 'ng-zorro-antd/empty'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule, NZ_ICONS } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzProgressModule } from 'ng-zorro-antd/progress'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { ShareModule } from '@zeppelin/share'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts index 2bb9d25..9f30074 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts @@ -14,15 +14,13 @@ import { NgModule } from '@angular/core'; import { ShareModule } from '@zeppelin/share'; -import { - NzButtonModule, - NzCardModule, - NzFormModule, - NzIconModule, - NzInputModule, - NzSelectModule, - NzTableModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzTableModule } from 'ng-zorro-antd/table'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NotebookRepoItemComponent } from './item/item.component'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts index f4968d7..994acc1 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts @@ -21,7 +21,8 @@ import { Output } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { NzMessageService, NzModalService } from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { MessageListener, MessageListenersManager } from '@zeppelin/core'; import { TRASH_FOLDER_ID_TOKEN } from '@zeppelin/interfaces'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts index 377a869..34a9990 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts @@ -13,7 +13,7 @@ import { moveItemInArray, CdkDragDrop } from '@angular/cdk/drag-drop'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core'; -import { NzModalService } from 'ng-zorro-antd'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { InterpreterBindingItem } from '@zeppelin/sdk'; import { InterpreterService, MessageService } from '@zeppelin/services'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.module.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.module.ts index 0258bbe..64cfdee 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.module.ts @@ -16,24 +16,22 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { - NzButtonModule, - NzDividerModule, - NzDropDownModule, - NzFormModule, - NzGridModule, - NzIconModule, - NzInputModule, - NzNoAnimationModule, - NzPopconfirmModule, - NzPopoverModule, - NzProgressModule, - NzRadioModule, - NzSelectModule, - NzSwitchModule, - NzToolTipModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; import { NzCodeEditorModule } from 'ng-zorro-antd/code-editor'; +import { NzNoAnimationModule } from 'ng-zorro-antd/core'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; +import { NzPopoverModule } from 'ng-zorro-antd/popover'; +import { NzProgressModule } from 'ng-zorro-antd/progress'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { ShareModule } from '@zeppelin/share'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.ts index eacf2da..846a46d 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.ts @@ -23,7 +23,8 @@ import { } from '@angular/core'; import { copyTextToClipboard } from '@zeppelin/core'; -import { NzMessageService, NzModalService } from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { ActivatedRoute } from '@angular/router'; import { RuntimeInfos } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.ts index eb749c1..6ceaaeb 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.ts @@ -21,7 +21,8 @@ import { Output } from '@angular/core'; -import { NzMessageService, NzModalService } from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { Permissions } from '@zeppelin/interfaces'; import { SecurityService, TicketService } from '@zeppelin/services'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/share/share.module.ts b/zeppelin-web-angular/src/app/pages/workspace/notebook/share/share.module.ts index c97c48e..b8ae9a7 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/notebook/share/share.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/notebook/share/share.module.ts @@ -14,7 +14,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { NzInputModule } from 'ng-zorro-antd'; +import { NzInputModule } from 'ng-zorro-antd/input'; import { ElasticInputComponent } from './elastic-input/elastic-input.component'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts b/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts index 0dab7ec..338a434 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts @@ -25,7 +25,7 @@ import { import { Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; -import { NzCheckBoxOptionInterface } from 'ng-zorro-antd'; +import { NzCheckBoxOptionInterface } from 'ng-zorro-antd/checkbox'; import { DynamicForms, DynamicFormsItem, DynamicFormsType, DynamicFormParams } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/share.module.ts b/zeppelin-web-angular/src/app/pages/workspace/share/share.module.ts index 4c7ef1d..a381779 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/share/share.module.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/share/share.module.ts @@ -15,17 +15,15 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { - NzButtonModule, - NzCheckboxModule, - NzDropDownModule, - NzIconModule, - NzRadioModule, - NzSelectModule, - NzSwitchModule, - NzToolTipModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; import { NzResizableModule } from 'ng-zorro-antd/resizable'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzSwitchModule } from 'ng-zorro-antd/switch'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { ShareModule } from '@zeppelin/share'; import { VisualizationModule } from '@zeppelin/visualizations/visualization.module'; diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace.component.ts b/zeppelin-web-angular/src/app/pages/workspace/workspace.component.ts index c89d287e..976e44b 100644 --- a/zeppelin-web-angular/src/app/pages/workspace/workspace.component.ts +++ b/zeppelin-web-angular/src/app/pages/workspace/workspace.component.ts @@ -18,7 +18,7 @@ import { ActivatedRoute, NavigationEnd, Route, Router } from '@angular/router'; import { publishedSymbol, Published } from '@zeppelin/core/paragraph-base/published'; import { HeliumManagerService } from '@zeppelin/helium-manager'; import { MessageService } from '@zeppelin/services'; -import { log } from 'ng-zorro-antd'; +import { log } from 'ng-zorro-antd/core'; @Component({ selector: 'zeppelin-workspace', diff --git a/zeppelin-web-angular/src/app/services/ng-template-adapter.service.ts b/zeppelin-web-angular/src/app/services/ng-template-adapter.service.ts index 651b709..f965e1d 100644 --- a/zeppelin-web-angular/src/app/services/ng-template-adapter.service.ts +++ b/zeppelin-web-angular/src/app/services/ng-template-adapter.service.ts @@ -12,7 +12,7 @@ import { Injectable } from '@angular/core'; import { Ng1MigrationComponent } from '@zeppelin/share/ng1-migration/ng1-migration.component'; -import { NzModalService } from 'ng-zorro-antd'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { Observable } from 'rxjs'; export interface NgTemplateCheckResult { diff --git a/zeppelin-web-angular/src/app/services/note-action.service.ts b/zeppelin-web-angular/src/app/services/note-action.service.ts index 8a2bd10..44e0ca8 100644 --- a/zeppelin-web-angular/src/app/services/note-action.service.ts +++ b/zeppelin-web-angular/src/app/services/note-action.service.ts @@ -12,7 +12,7 @@ import { Injectable } from '@angular/core'; -import { NzModalService } from 'ng-zorro-antd'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { FolderRenameComponent } from '@zeppelin/share/folder-rename/folder-rename.component'; import { NoteCreateComponent } from '@zeppelin/share/note-create/note-create.component'; diff --git a/zeppelin-web-angular/src/app/services/runtime-compiler.service.ts b/zeppelin-web-angular/src/app/services/runtime-compiler.service.ts index 9c91b69..8ec7f2c 100644 --- a/zeppelin-web-angular/src/app/services/runtime-compiler.service.ts +++ b/zeppelin-web-angular/src/app/services/runtime-compiler.service.ts @@ -10,7 +10,6 @@ * limitations under the License. */ -import { CommonModule } from '@angular/common'; import { Compiler, Component, @@ -20,10 +19,8 @@ import { NgModuleFactory, Type } from '@angular/core'; -import { FormsModule } from '@angular/forms'; - -import { NgZorroAntdModule } from 'ng-zorro-antd'; +import { RuntimeDynamicModuleModule } from '@zeppelin/core'; import { NgZService } from './ng-z.service'; export class DynamicTemplate { @@ -63,7 +60,7 @@ export class RuntimeCompilerService { declarations: [dynamicComponent], exports: [dynamicComponent], entryComponents: [dynamicComponent], - imports: [CommonModule, NgZorroAntdModule, FormsModule] + imports: [RuntimeDynamicModuleModule] })(class DynamicModule {}); this.compiledModule = await this.compiler.compileModuleAndAllComponentsAsync(dynamicModule); diff --git a/zeppelin-web-angular/src/app/services/ticket.service.ts b/zeppelin-web-angular/src/app/services/ticket.service.ts index 9254cdc..a23bc0d 100644 --- a/zeppelin-web-angular/src/app/services/ticket.service.ts +++ b/zeppelin-web-angular/src/app/services/ticket.service.ts @@ -16,7 +16,7 @@ import { Router } from '@angular/router'; import { forkJoin, BehaviorSubject, Subject } from 'rxjs'; import { map, tap } from 'rxjs/operators'; -import { NzMessageService } from 'ng-zorro-antd'; +import { NzMessageService } from 'ng-zorro-antd/message'; import { ITicket, ITicketWrapped, IZeppelinVersion } from '@zeppelin/interfaces'; import { ConfigurationsInfo } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.ts b/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.ts index 250dac3..4b50f3b 100644 --- a/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.ts +++ b/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.ts @@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; -import { NzModalRef } from 'ng-zorro-antd'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { MessageService } from '@zeppelin/services/message.service'; import { NoteListService } from '@zeppelin/services/note-list.service'; diff --git a/zeppelin-web-angular/src/app/share/header/header.component.ts b/zeppelin-web-angular/src/app/share/header/header.component.ts index d9e4cc7..e69b89e 100644 --- a/zeppelin-web-angular/src/app/share/header/header.component.ts +++ b/zeppelin-web-angular/src/app/share/header/header.component.ts @@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; -import { NzModalService } from 'ng-zorro-antd'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; diff --git a/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.ts b/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.ts index 340330e..eaf32db 100644 --- a/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.ts +++ b/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy } from '@angular/core'; import { editor, IDisposable, Range } from 'monaco-editor'; -import { NzModalRef } from 'ng-zorro-antd'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { defaultTemplateUpdaterRules, LogLevel, diff --git a/zeppelin-web-angular/src/app/share/node-list/node-list.component.ts b/zeppelin-web-angular/src/app/share/node-list/node-list.component.ts index c9206fd..5d9abb4 100644 --- a/zeppelin-web-angular/src/app/share/node-list/node-list.component.ts +++ b/zeppelin-web-angular/src/app/share/node-list/node-list.component.ts @@ -12,7 +12,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; -import { NzModalService, NzTreeNode } from 'ng-zorro-antd'; +import { NzTreeNode } from 'ng-zorro-antd/core'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { MessageListener, MessageListenersManager } from '@zeppelin/core'; import { MessageReceiveDataTypeMap, OP } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/share/note-create/note-create.component.ts b/zeppelin-web-angular/src/app/share/note-create/note-create.component.ts index 42d9a95..dfa9af4 100644 --- a/zeppelin-web-angular/src/app/share/note-create/note-create.component.ts +++ b/zeppelin-web-angular/src/app/share/note-create/note-create.component.ts @@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; -import { NzModalRef } from 'ng-zorro-antd'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { MessageListener, MessageListenersManager } from '@zeppelin/core'; import { InterpreterItem, MessageReceiveDataTypeMap, Note, OP } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/share/note-import/note-import.component.ts b/zeppelin-web-angular/src/app/share/note-import/note-import.component.ts index 4e928c9..7317b34 100644 --- a/zeppelin-web-angular/src/app/share/note-import/note-import.component.ts +++ b/zeppelin-web-angular/src/app/share/note-import/note-import.component.ts @@ -14,7 +14,8 @@ import { HttpClient } from '@angular/common/http'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { get } from 'lodash'; -import { NzModalRef, UploadFile } from 'ng-zorro-antd'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { UploadFile } from 'ng-zorro-antd/upload'; import { MessageListener, MessageListenersManager } from '@zeppelin/core'; import { OP } from '@zeppelin/sdk'; diff --git a/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.ts b/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.ts index 3b07b8d..1413e1d 100644 --- a/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.ts +++ b/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.ts @@ -12,7 +12,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { NzModalRef } from 'ng-zorro-antd'; +import { NzModalRef } from 'ng-zorro-antd/modal'; import { MessageService } from '@zeppelin/services/message.service'; diff --git a/zeppelin-web-angular/src/app/share/page-header/page-header.component.ts b/zeppelin-web-angular/src/app/share/page-header/page-header.component.ts index 601726e..0ec5925 100644 --- a/zeppelin-web-angular/src/app/share/page-header/page-header.component.ts +++ b/zeppelin-web-angular/src/app/share/page-header/page-header.component.ts @@ -11,7 +11,7 @@ */ import { ChangeDetectionStrategy, Component, Input, OnInit, TemplateRef } from '@angular/core'; -import { InputBoolean } from 'ng-zorro-antd'; +import { InputBoolean } from 'ng-zorro-antd/core'; @Component({ selector: 'zeppelin-page-header', diff --git a/zeppelin-web-angular/src/app/share/share.module.ts b/zeppelin-web-angular/src/app/share/share.module.ts index 3f7a003..26047e4 100644 --- a/zeppelin-web-angular/src/app/share/share.module.ts +++ b/zeppelin-web-angular/src/app/share/share.module.ts @@ -15,30 +15,28 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { - NzAddOnModule, - NzAlertModule, - NzBadgeModule, - NzButtonModule, - NzCardModule, - NzDividerModule, - NzDropDownModule, - NzFormModule, - NzGridModule, - NzIconModule, - NzInputModule, - NzMenuModule, - NzMessageModule, - NzModalModule, - NzNotificationModule, - NzPopconfirmModule, - NzProgressModule, - NzSelectModule, - NzTabsModule, - NzToolTipModule, - NzTreeModule, - NzUploadModule -} from 'ng-zorro-antd'; +import { NzAlertModule } from 'ng-zorro-antd/alert'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzAddOnModule } from 'ng-zorro-antd/core'; +import { NzDividerModule } from 'ng-zorro-antd/divider'; +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzMenuModule } from 'ng-zorro-antd/menu'; +import { NzMessageModule } from 'ng-zorro-antd/message'; +import { NzModalModule } from 'ng-zorro-antd/modal'; +import { NzNotificationModule } from 'ng-zorro-antd/notification'; +import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; +import { NzProgressModule } from 'ng-zorro-antd/progress'; +import { NzSelectModule } from 'ng-zorro-antd/select'; +import { NzTabsModule } from 'ng-zorro-antd/tabs'; +import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; +import { NzTreeModule } from 'ng-zorro-antd/tree'; +import { NzUploadModule } from 'ng-zorro-antd/upload'; import { AboutZeppelinComponent } from '@zeppelin/share/about-zeppelin/about-zeppelin.component'; import { CodeEditorModule } from '@zeppelin/share/code-editor'; diff --git a/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.ts b/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.ts index 09fa077..d098631 100644 --- a/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.ts +++ b/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.ts @@ -13,7 +13,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, OnInit, ViewChild } from '@angular/core'; import { filter, maxBy, minBy, orderBy, sumBy } from 'lodash'; -import { NzTableComponent } from 'ng-zorro-antd'; +import { NzTableComponent } from 'ng-zorro-antd/table'; import { utils, writeFile, WorkSheet } from 'xlsx'; import { TableData, Visualization, VISUALIZATION } from '@zeppelin/visualization'; diff --git a/zeppelin-web-angular/src/app/visualizations/visualization.module.ts b/zeppelin-web-angular/src/app/visualizations/visualization.module.ts index fe2f4a1..ab72210 100644 --- a/zeppelin-web-angular/src/app/visualizations/visualization.module.ts +++ b/zeppelin-web-angular/src/app/visualizations/visualization.module.ts @@ -15,20 +15,18 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { - NzButtonModule, - NzCardModule, - NzCheckboxModule, - NzDropDownModule, - NzFormModule, - NzGridModule, - NzIconModule, - NzInputModule, - NzMenuModule, - NzRadioModule, - NzTableModule, - NzTagModule -} from 'ng-zorro-antd'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +import { NzCardModule } from 'ng-zorro-antd/card'; +import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; +import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; +import { NzFormModule } from 'ng-zorro-antd/form'; +import { NzGridModule } from 'ng-zorro-antd/grid'; +import { NzIconModule } from 'ng-zorro-antd/icon'; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { NzMenuModule } from 'ng-zorro-antd/menu'; +import { NzRadioModule } from 'ng-zorro-antd/radio'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { NzTagModule } from 'ng-zorro-antd/tag'; import { AreaChartVisualizationComponent } from './area-chart/area-chart-visualization.component'; import { BarChartVisualizationComponent } from './bar-chart/bar-chart-visualization.component'; diff --git a/zeppelin-web-angular/tslint.json b/zeppelin-web-angular/tslint.json index 74aed25..045107b 100644 --- a/zeppelin-web-angular/tslint.json +++ b/zeppelin-web-angular/tslint.json @@ -1,6 +1,7 @@ { - "rulesDirectory": ["node_modules/codelyzer"], + "rulesDirectory": ["node_modules/codelyzer", "node_modules/nz-tslint-rules"], "rules": { + "nz-secondary-entry-imports": true, "banana-in-box": true, "templates-no-negated-async": true, "no-life-cycle-call": false,