Skip to content

Commit

Permalink
refactor: import cleanup
Browse files Browse the repository at this point in the history
* add/update index.ts files to cleanup/simplify imports
  • Loading branch information
jrassa committed Jun 19, 2024
1 parent 4e6f416 commit 5fca18f
Show file tree
Hide file tree
Showing 83 changed files with 216 additions and 190 deletions.
2 changes: 1 addition & 1 deletion src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { signal } from '@angular/core';
import { TestBed, waitForAsync } from '@angular/core/testing';

import { AppComponent } from './app.component';
import { provideCdkDialog } from './common/dialog/provider';
import { provideCdkDialog } from './common/dialog';
import { APP_CONFIG } from './core';
import { provideSession } from './core/provider';

Expand Down
2 changes: 1 addition & 1 deletion src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
import { TooltipModule } from 'ngx-bootstrap/tooltip';

import { provideCdkDialog } from './common/dialog/provider';
import { provideCdkDialog } from './common/dialog';
import { provideAdminFeature } from './core/admin';
import { provideAuditFeature } from './core/audit';
import { authInterceptor } from './core/auth/auth.interceptor';
Expand Down
1 change: 1 addition & 0 deletions src/app/common/dialog/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './provider';
export * from './dialog.model';
export * from './dialog.service';
export * from './bs-dialog-container/bs-dialog-container.component';
Expand Down
1 change: 1 addition & 0 deletions src/app/common/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './public-api';
File renamed without changes.
1 change: 1 addition & 0 deletions src/app/common/pipes/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './public-api';
5 changes: 5 additions & 0 deletions src/app/common/pipes/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * from './utc-date-pipe/utc-date.pipe';
export * from './ago-date.pipe';
export * from './join.pipe';
export * from './keys.pipe';
export * from './sort-object-keys.pipe';
17 changes: 17 additions & 0 deletions src/app/common/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export * from './abstract-entity.service';
export * from './cdk-menu-item-href.directive';
export * from './cdk-menu-item-router-link.directive';
export * from './flyout/flyout.component';
export * from './link-accessibility.directive';
export * from './loading-overlay/loading-overlay.component';
export * from './loading-spinner/loading-spinner.component';
export * from './multi-select.directive';
export * from './modal/modal/modal.component';
export * from './not-whitespace.directive';
export * from './paging.model';
export * from './rxjs-utils';
export * from './search-input/search-input.component';
export * from './skip-to.directive';
export * from './sorting.model';
export * from './string-utils.service';
export * from './topic.model';
File renamed without changes.
1 change: 1 addition & 0 deletions src/app/common/system-alert/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './public-api';
3 changes: 3 additions & 0 deletions src/app/common/system-alert/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from './system-alert.component';
export * from './system-alert.model';
export * from './system-alert.service';
1 change: 1 addition & 0 deletions src/app/common/table/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from './asy-table-data-source';
export * from './actions-menu-column/actions-menu-column.component';
export * from './column-chooser/column-chooser.component';
export * from './paginator/paginator.component';
export * from './sidebar/sidebar.component';
Expand Down
13 changes: 2 additions & 11 deletions src/app/core/admin/admin-topic.model.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import { InjectionToken, inject } from '@angular/core';
import { InjectionToken } from '@angular/core';

import sortBy from 'lodash/sortBy';

import { Topic } from '../../common/topic.model';
import { Topic } from '../../common';

export const ADMIN_TOPICS = new InjectionToken<Topic[][]>('ADMIN_TOPIC');

export const injectAdminTopics: () => Topic[] = () =>
sortBy((inject(ADMIN_TOPICS, { optional: true }) ?? []).flat(), [
(t) => t.ordinal ?? 1,
'title',
'path'
]);
2 changes: 1 addition & 1 deletion src/app/core/admin/admin.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';

import { injectAdminTopics } from './admin-topic.model';
import { injectAdminTopics } from './provider';

@Component({
templateUrl: 'admin.component.html',
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/admin/cache-entries/cache-entries.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Injectable, inject } from '@angular/core';
import { Observable, of } from 'rxjs';
import { catchError } from 'rxjs/operators';

import { NULL_PAGING_RESULTS, PagingOptions, PagingResults } from '../../../common/paging.model';
import { SystemAlertService } from '../../../common/system-alert/system-alert.service';
import { NULL_PAGING_RESULTS, PagingOptions, PagingResults } from '../../../common';
import { SystemAlertService } from '../../../common/system-alert';
import { CacheEntry } from './cache-entry.model';

@Injectable({ providedIn: 'root' })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
import { JsonPipe } from '@angular/common';
import { ChangeDetectionStrategy, Component, OnInit, inject } from '@angular/core';

import { ModalComponent } from '../../../../common';
import { DialogAction } from '../../../../common/dialog';
import { ModalComponent } from '../../../../common/modal/modal/modal.component';
import { AgoDatePipe } from '../../../../common/pipes/ago-date.pipe';
import { UtcDatePipe } from '../../../../common/pipes/utc-date-pipe/utc-date.pipe';
import { AgoDatePipe, UtcDatePipe } from '../../../../common/pipes';
import { CacheEntry } from '../cache-entry.model';

export class CacheEntryModalData {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@ import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { Observable } from 'rxjs';
import { filter, first, switchMap } from 'rxjs/operators';

import {
PagingOptions,
PagingResults,
SearchInputComponent,
SkipToDirective,
SortDirection
} from '../../../../common';
import { DialogAction, DialogService } from '../../../../common/dialog';
import { SkipToDirective } from '../../../../common/directives/skip-to.directive';
import { PagingOptions, PagingResults } from '../../../../common/paging.model';
import { AgoDatePipe } from '../../../../common/pipes/ago-date.pipe';
import { UtcDatePipe } from '../../../../common/pipes/utc-date-pipe/utc-date.pipe';
import { SearchInputComponent } from '../../../../common/search-input/search-input.component';
import { SortDirection } from '../../../../common/sorting.model';
import { SystemAlertComponent } from '../../../../common/system-alert/system-alert.component';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { AgoDatePipe, UtcDatePipe } from '../../../../common/pipes';
import { SystemAlertComponent, SystemAlertService } from '../../../../common/system-alert';
import {
ActionsMenuColumnComponent,
ActionsMenuTemplateDirective,
AgoDateColumnComponent,
AsyFilterDirective,
AsySortDirective,
Expand All @@ -28,10 +31,6 @@ import {
PaginatorComponent,
TextColumnComponent
} from '../../../../common/table';
import {
ActionsMenuColumnComponent,
ActionsMenuTemplateDirective
} from '../../../../common/table/actions-menu-column/actions-menu-column.component';
import { CacheEntriesService } from '../cache-entries.service';
import {
CacheEntryModalComponent,
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/admin/end-user-agreement/eua.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot } from '
import { Observable } from 'rxjs';
import { catchError } from 'rxjs/operators';

import { AbstractEntityService, ServiceMethod } from '../../../common/abstract-entity.service';
import { EndUserAgreement } from './eua.model';
import { AbstractEntityService, ServiceMethod } from '../../../common';
import { EndUserAgreement } from '../../auth';

export const euaResolver: ResolveFn<EndUserAgreement | null> = (
route: ActivatedRouteSnapshot,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router';
import { of } from 'rxjs';

import { DialogService } from '../../../../common/dialog';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { SystemAlertService } from '../../../../common/system-alert';
import { EuaService } from '../eua.service';
import { AdminListEuasComponent } from './admin-list-euas.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,18 @@ import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { Observable } from 'rxjs';
import { filter, first, switchMap } from 'rxjs/operators';

import {
PagingOptions,
PagingResults,
SearchInputComponent,
SkipToDirective,
SortDirection
} from '../../../../common';
import { DialogAction, DialogService } from '../../../../common/dialog';
import { SkipToDirective } from '../../../../common/directives/skip-to.directive';
import { PagingOptions, PagingResults } from '../../../../common/paging.model';
import { SearchInputComponent } from '../../../../common/search-input/search-input.component';
import { SortDirection } from '../../../../common/sorting.model';
import { SystemAlertComponent } from '../../../../common/system-alert/system-alert.component';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { SystemAlertComponent, SystemAlertService } from '../../../../common/system-alert';
import {
ActionsMenuColumnComponent,
ActionsMenuTemplateDirective,
AsyFilterDirective,
AsySortDirective,
AsySortHeaderComponent,
Expand All @@ -27,11 +31,7 @@ import {
SidebarComponent,
TextColumnComponent
} from '../../../../common/table';
import {
ActionsMenuColumnComponent,
ActionsMenuTemplateDirective
} from '../../../../common/table/actions-menu-column/actions-menu-column.component';
import { EndUserAgreement } from '../eua.model';
import { EndUserAgreement } from '../../../auth';
import { EuaService } from '../eua.service';

@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { FormsModule } from '@angular/forms';
import { Router, RouterLink } from '@angular/router';

import { SkipToDirective } from '../../../../common';
import { DialogService } from '../../../../common/dialog';
import { SkipToDirective } from '../../../../common/directives/skip-to.directive';
import { SystemAlertComponent } from '../../../../common/system-alert/system-alert.component';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { EndUserAgreement } from '../eua.model';
import { SystemAlertComponent, SystemAlertService } from '../../../../common/system-alert';
import { EndUserAgreement } from '../../../auth';
import { EuaService } from '../eua.service';

@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { of } from 'rxjs';

import { PagingResults } from '../../../../common/paging.model';
import { PagingResults } from '../../../../common';
import { User } from '../../../auth';
import { ExportConfigService } from '../../../export-config.service';
import { FeedbackService } from '../../../feedback/feedback.service';
import { FeedbackService } from '../../../feedback';
import { AdminUsersService } from '../../user/admin-users.service';
import { AdminListFeedbackComponent } from './admin-list-feedback.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { Observable } from 'rxjs';

import { SkipToDirective } from '../../../../common/directives/skip-to.directive';
import { PagingOptions, PagingResults } from '../../../../common/paging.model';
import { SearchInputComponent } from '../../../../common/search-input/search-input.component';
import { SortDirection } from '../../../../common/sorting.model';
import { SystemAlertComponent } from '../../../../common/system-alert/system-alert.component';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import {
PagingOptions,
PagingResults,
SearchInputComponent,
SkipToDirective,
SortDirection
} from '../../../../common';
import { SystemAlertComponent, SystemAlertService } from '../../../../common/system-alert';
import {
AgoDateColumnComponent,
AsyFilterDirective,
Expand All @@ -30,8 +32,7 @@ import {
TextColumnComponent
} from '../../../../common/table';
import { ExportConfigService } from '../../../export-config.service';
import { Feedback, FeedbackStatusOption } from '../../../feedback/feedback.model';
import { FeedbackService } from '../../../feedback/feedback.service';
import { Feedback, FeedbackService, FeedbackStatusOption } from '../../../feedback';
import { AdminUsersService } from '../../user/admin-users.service';

@Component({
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/admin/messages/admin-messages-routes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Routes } from '@angular/router';

import { messageResolver } from '../../messages/message.service';
import { messageResolver } from '../../messages';
import { ListMessagesComponent } from './list-messages/list-messages.component';
import { ManageMessageComponent } from './manage-message/manage-message.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@ import { RouterLink } from '@angular/router';
import { Observable } from 'rxjs';
import { filter, first, switchMap } from 'rxjs/operators';

import { CdkMenuItemRouterLinkDirective } from '../../../../common/cdk-menu-item-router-link.directive';
import {
CdkMenuItemRouterLinkDirective,
PagingOptions,
PagingResults,
SearchInputComponent,
SkipToDirective,
SortDirection
} from '../../../../common';
import { DialogAction, DialogService } from '../../../../common/dialog';
import { SkipToDirective } from '../../../../common/directives/skip-to.directive';
import { PagingOptions, PagingResults } from '../../../../common/paging.model';
import { SearchInputComponent } from '../../../../common/search-input/search-input.component';
import { SortDirection } from '../../../../common/sorting.model';
import { SystemAlertComponent } from '../../../../common/system-alert/system-alert.component';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { SystemAlertComponent, SystemAlertService } from '../../../../common/system-alert';
import {
ActionsMenuColumnComponent,
ActionsMenuTemplateDirective,
AsyFilterDirective,
AsySortDirective,
AsySortHeaderComponent,
Expand All @@ -25,12 +29,7 @@ import {
PaginatorComponent,
TextColumnComponent
} from '../../../../common/table';
import {
ActionsMenuColumnComponent,
ActionsMenuTemplateDirective
} from '../../../../common/table/actions-menu-column/actions-menu-column.component';
import { Message } from '../../../messages/message.model';
import { MessageService } from '../../../messages/message.service';
import { Message, MessageService } from '../../../messages';

@Component({
templateUrl: './list-messages.component.html',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import { RouterModule } from '@angular/router';
import { of } from 'rxjs';

import { DialogService } from '../../../../common/dialog';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { Message, MessageType } from '../../../messages/message.model';
import { MessageService } from '../../../messages/message.service';
import { SystemAlertService } from '../../../../common/system-alert';
import { Message, MessageService, MessageType } from '../../../messages';
import { ManageMessageComponent } from './manage-message.component';

describe('ManageMessageComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import { Router, RouterLink } from '@angular/router';

import { NgSelectModule } from '@ng-select/ng-select';

import { SkipToDirective } from '../../../../common';
import { DialogService } from '../../../../common/dialog';
import { SkipToDirective } from '../../../../common/directives/skip-to.directive';
import { SystemAlertComponent } from '../../../../common/system-alert/system-alert.component';
import { SystemAlertService } from '../../../../common/system-alert/system-alert.service';
import { Message, MessageType } from '../../../messages/message.model';
import { MessageService } from '../../../messages/message.service';
import { SystemAlertComponent, SystemAlertService } from '../../../../common/system-alert';
import { Message, MessageService, MessageType } from '../../../messages';

@Component({
standalone: true,
Expand Down
10 changes: 10 additions & 0 deletions src/app/core/admin/provider.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
import { InjectionToken, inject, makeEnvironmentProviders } from '@angular/core';
import { ROUTES } from '@angular/router';

import sortBy from 'lodash/sortBy';

import { ADMIN_TOPICS } from './admin-topic.model';

export const APP_FEATURE_ADMIN = new InjectionToken<boolean>('APP_FEATURE_ADMIN');

export function injectAdminTopics() {
return sortBy((inject(ADMIN_TOPICS, { optional: true }) ?? []).flat(), [
(t) => t.ordinal ?? 1,
'title',
'path'
]);
}

export function injectAdminEnabled() {
return inject(APP_FEATURE_ADMIN, { optional: true }) ?? false;
}
Expand Down
1 change: 1 addition & 0 deletions src/app/core/admin/public-api.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './provider';
export * from './admin-topic.model';
4 changes: 2 additions & 2 deletions src/app/core/admin/user/admin-users.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot } from '
import { Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';

import { NULL_PAGING_RESULTS, PagingOptions, PagingResults } from '../../../common/paging.model';
import { SystemAlertService } from '../../../common/system-alert/system-alert.service';
import { NULL_PAGING_RESULTS, PagingOptions, PagingResults } from '../../../common';
import { SystemAlertService } from '../../../common/system-alert';
import { User } from '../../auth';
import { ErrorState } from '../../errors/error-state.model';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { RouterModule } from '@angular/router';

import { of } from 'rxjs';

import { PagingResults } from '../../../../common/paging.model';
import { PagingResults } from '../../../../common';
import { User } from '../../../auth';
import { ExportConfigService } from '../../../export-config.service';
import { APP_CONFIG } from '../../../tokens';
Expand Down
Loading

0 comments on commit 5fca18f

Please sign in to comment.