From e1ebbb9ab298a433e4800241efd84c44d80cef04 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 16 Mar 2023 23:19:42 +0200 Subject: [PATCH] make empty-state standalone --- src/index.ts | 2 +- src/lib/common-ui.module.ts | 11 +---------- .../empty-state/empty-state.component.html | 0 .../empty-state/empty-state.component.scss | 0 .../empty-state/empty-state.component.ts | 9 +++++++-- src/lib/empty-state/index.ts | 1 + src/lib/empty-states/empty-state.module.ts | 15 --------------- src/lib/empty-states/index.ts | 2 -- src/lib/filtering/filters.module.ts | 12 ++++++++++-- src/lib/listing/listing.module.ts | 5 ++--- 10 files changed, 22 insertions(+), 35 deletions(-) rename src/lib/{empty-states => }/empty-state/empty-state.component.html (100%) rename src/lib/{empty-states => }/empty-state/empty-state.component.scss (100%) rename src/lib/{empty-states => }/empty-state/empty-state.component.ts (70%) create mode 100644 src/lib/empty-state/index.ts delete mode 100644 src/lib/empty-states/empty-state.module.ts delete mode 100644 src/lib/empty-states/index.ts diff --git a/src/index.ts b/src/index.ts index 7ba5ca1..c19f671 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,7 +14,7 @@ export * from './lib/loading'; export * from './lib/error'; export * from './lib/search'; export * from './lib/upload-file'; -export * from './lib/empty-states'; +export * from './lib/empty-state'; export * from './lib/scrollbar'; export * from './lib/caching'; export * from './lib/users'; diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts index 7b5ec70..1493707 100644 --- a/src/lib/common-ui.module.ts +++ b/src/lib/common-ui.module.ts @@ -11,7 +11,6 @@ import { IqserListingModule } from './listing'; import { IqserFiltersModule } from './filtering'; import { IqserInputsModule } from './inputs'; import { IqserScrollbarModule } from './scrollbar'; -import { IqserEmptyStatesModule } from './empty-states'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; @@ -35,15 +34,7 @@ const matModules = [ MatTooltipModule, MatProgressBarModule, ]; -const modules = [ - IqserListingModule, - IqserFiltersModule, - IqserInputsModule, - IqserScrollbarModule, - IqserEmptyStatesModule, - IqserSkeletonModule, - HttpClientModule, -]; +const modules = [IqserListingModule, IqserFiltersModule, IqserInputsModule, IqserScrollbarModule, IqserSkeletonModule, HttpClientModule]; const components = [ConnectionStatusComponent, FullPageErrorComponent, HiddenActionComponent, ConfirmationDialogComponent, ToastComponent]; const pipes = [SortByPipe]; diff --git a/src/lib/empty-states/empty-state/empty-state.component.html b/src/lib/empty-state/empty-state.component.html similarity index 100% rename from src/lib/empty-states/empty-state/empty-state.component.html rename to src/lib/empty-state/empty-state.component.html diff --git a/src/lib/empty-states/empty-state/empty-state.component.scss b/src/lib/empty-state/empty-state.component.scss similarity index 100% rename from src/lib/empty-states/empty-state/empty-state.component.scss rename to src/lib/empty-state/empty-state.component.scss diff --git a/src/lib/empty-states/empty-state/empty-state.component.ts b/src/lib/empty-state/empty-state.component.ts similarity index 70% rename from src/lib/empty-states/empty-state/empty-state.component.ts rename to src/lib/empty-state/empty-state.component.ts index a97ac1d..0217eb0 100644 --- a/src/lib/empty-states/empty-state/empty-state.component.ts +++ b/src/lib/empty-state/empty-state.component.ts @@ -1,12 +1,17 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { IconButtonTypes } from '../../buttons'; -import { randomString } from '../../utils'; +import { IconButtonComponent, IconButtonTypes } from '../buttons'; +import { randomString } from '../utils'; +import { NgIf, NgStyle } from '@angular/common'; +import { MatIconModule } from '@angular/material/icon'; +import { IqserHelpModeModule } from '../help-mode'; @Component({ selector: 'iqser-empty-state [text]', templateUrl: './empty-state.component.html', styleUrls: ['./empty-state.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [NgStyle, MatIconModule, NgIf, IconButtonComponent, IqserHelpModeModule], }) export class EmptyStateComponent implements OnInit { readonly iconButtonTypes = IconButtonTypes; diff --git a/src/lib/empty-state/index.ts b/src/lib/empty-state/index.ts new file mode 100644 index 0000000..45c7975 --- /dev/null +++ b/src/lib/empty-state/index.ts @@ -0,0 +1 @@ +export * from './empty-state.component'; diff --git a/src/lib/empty-states/empty-state.module.ts b/src/lib/empty-states/empty-state.module.ts deleted file mode 100644 index 2d9c626..0000000 --- a/src/lib/empty-states/empty-state.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { EmptyStateComponent } from './empty-state/empty-state.component'; -import { IconButtonComponent } from '../buttons'; -import { IqserHelpModeModule } from '../help-mode'; -import { MatIconModule } from '@angular/material/icon'; - -const components = [EmptyStateComponent]; - -@NgModule({ - declarations: [...components], - imports: [CommonModule, MatIconModule, IqserHelpModeModule, IconButtonComponent], - exports: [...components], -}) -export class IqserEmptyStatesModule {} diff --git a/src/lib/empty-states/index.ts b/src/lib/empty-states/index.ts deleted file mode 100644 index 987730b..0000000 --- a/src/lib/empty-states/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './empty-state.module'; -export * from './empty-state/empty-state.component'; diff --git a/src/lib/filtering/filters.module.ts b/src/lib/filtering/filters.module.ts index 6792de7..2848d79 100644 --- a/src/lib/filtering/filters.module.ts +++ b/src/lib/filtering/filters.module.ts @@ -13,12 +13,20 @@ import { FilterCardComponent } from './filter-card/filter-card.component'; import { MatIconModule } from '@angular/material/icon'; const matModules = [MatCheckboxModule, MatMenuModule]; -const modules = [TranslateModule, IqserInputsModule, IqserHelpModeModule]; const components = [QuickFiltersComponent, PopupFilterComponent, SingleFilterComponent, FilterCardComponent]; @NgModule({ declarations: [...components], exports: [...components], - imports: [CommonModule, ...matModules, ...modules, IconButtonComponent, ChevronButtonComponent, MatIconModule], + imports: [ + CommonModule, + ...matModules, + TranslateModule, + IqserInputsModule, + IqserHelpModeModule, + IconButtonComponent, + ChevronButtonComponent, + MatIconModule, + ], }) export class IqserFiltersModule {} diff --git a/src/lib/listing/listing.module.ts b/src/lib/listing/listing.module.ts index be31890..5a848ab 100644 --- a/src/lib/listing/listing.module.ts +++ b/src/lib/listing/listing.module.ts @@ -12,7 +12,6 @@ import { SyncWidthDirective } from './sync-width.directive'; import { ScrollingModule } from '@angular/cdk/scrolling'; import { IqserScrollbarModule } from '../scrollbar'; import { RouterModule } from '@angular/router'; -import { IqserEmptyStatesModule } from '../empty-states'; import { WorkflowComponent } from './workflow/workflow.component'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { PageHeaderComponent } from './page-header/page-header.component'; @@ -22,6 +21,7 @@ import { TableItemComponent } from './table-content/table-item/table-item.compon import { ColumnHeaderComponent } from './workflow/column-header/column-header.component'; import { CircleButtonComponent, IconButtonComponent } from '../buttons'; import { MatIconModule } from '@angular/material/icon'; +import { EmptyStateComponent } from '../empty-state'; const matModules = [MatTooltipModule]; const components = [ @@ -42,7 +42,6 @@ const modules = [ IqserInputsModule, MatIconModule, IqserScrollbarModule, - IqserEmptyStatesModule, ScrollingModule, RouterModule, IqserHelpModeModule, @@ -52,6 +51,6 @@ const utils = [SyncWidthDirective]; @NgModule({ declarations: [...components, ...utils], exports: [...components, ...utils], - imports: [CommonModule, ...modules, ...matModules, CircleButtonComponent, IconButtonComponent], + imports: [CommonModule, ...modules, ...matModules, CircleButtonComponent, IconButtonComponent, EmptyStateComponent], }) export class IqserListingModule {}