Skip to content

Commit

Permalink
Merge branch 'master' into NAS-129911
Browse files Browse the repository at this point in the history
  • Loading branch information
RehanY147 committed Jul 15, 2024
2 parents c6f9b60 + 27d7fdd commit 025aa92
Show file tree
Hide file tree
Showing 218 changed files with 564 additions and 368 deletions.
2 changes: 1 addition & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { NgxWebstorageModule } from 'ngx-webstorage';
import { IcuMissingTranslationHandler } from 'app/core/classes/icu-missing-translation-handler';
import { createTranslateLoader } from 'app/core/classes/icu-translations-loader';
import { MockEnclosureWebsocketService } from 'app/core/testing/mock-enclosure/mock-enclosure-websocket.service';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { getWindow, WINDOW } from 'app/helpers/window.helper';
import { DialogModule } from 'app/modules/dialog/dialog.module';
import { FeedbackModule } from 'app/modules/feedback/feedback.module';
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createDirectiveFactory } from '@ngneat/spectator/jest';
import { AutofocusDirective } from 'app/directives/common/autofocus/autofocus.directive';
import { AutofocusDirective } from 'app/directives/autofocus/autofocus.directive';

describe('AutofocusDirective', () => {
const createDirective = createDirectiveFactory({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { TranslateModule } from '@ngx-translate/core';
import { Ng2FittextModule } from 'ng2-fittext';
import { NgxPopperjsModule } from 'ngx-popperjs';
import { AutofocusDirective } from 'app/directives/common/autofocus/autofocus.directive';
import { IxDetailsHeightDirective } from 'app/directives/common/details-height/details-height.directive';
import { DisableFocusableElementsDirective } from 'app/directives/common/disable-focusable-elements/disable-focusable-elements.directive';
import { HasAccessDirective } from 'app/directives/common/has-access/has-access.directive';
import { MissingAccessWrapperComponent } from 'app/directives/common/has-access/missing-access-wrapper.component';
import { HasRoleDirective } from 'app/directives/common/has-role/has-role.directive';
import { IfNightlyDirective } from 'app/directives/common/if-nightly/if-nightly.directive';
import { NavigateAndInteractDirective } from 'app/directives/common/navigate-and-interact/navigate-and-interact.directive';
import { NewFeatureIndicatorWrapperComponent } from 'app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component';
import { NewFeatureIndicatorDirective } from 'app/directives/common/new-feature-indicator/new-feature-indicator.directive';
import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
import { RequiresRolesDirective } from 'app/directives/common/requires-roles/requires-roles.directive';
import { StepActivationDirective } from 'app/directives/common/step-activation.directive';
import { AutofocusDirective } from 'app/directives/autofocus/autofocus.directive';
import { IxDetailsHeightDirective } from 'app/directives/details-height/details-height.directive';
import { DisableFocusableElementsDirective } from 'app/directives/disable-focusable-elements/disable-focusable-elements.directive';
import { HasAccessDirective } from 'app/directives/has-access/has-access.directive';
import { MissingAccessWrapperComponent } from 'app/directives/has-access/missing-access-wrapper.component';
import { HasRoleDirective } from 'app/directives/has-role/has-role.directive';
import { IfNightlyDirective } from 'app/directives/if-nightly/if-nightly.directive';
import { NavigateAndInteractDirective } from 'app/directives/navigate-and-interact/navigate-and-interact.directive';
import { NewFeatureIndicatorWrapperComponent } from 'app/directives/new-feature-indicator/new-feature-indicator-wrapper.component';
import { NewFeatureIndicatorDirective } from 'app/directives/new-feature-indicator/new-feature-indicator.directive';
import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive';
import { StepActivationDirective } from 'app/directives/step-activation.directive';
import {
TextLimiterTooltipComponent,
} from 'app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
import { TextLimiterDirective } from 'app/directives/common/text-limiter/text-limiter.directive';
import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
} from 'app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
import { TextLimiterDirective } from 'app/directives/text-limiter/text-limiter.directive';
import { UiSearchDirective } from 'app/directives/ui-search.directive';
import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
import { CastPipe } from 'app/modules/pipes/cast/cast.pipe';
import { LetDirective } from './app-let.directive';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createHostFactory } from '@ngneat/spectator/jest';
import { HasAccessDirective } from 'app/directives/common/has-access/has-access.directive';
import { HasAccessDirective } from 'app/directives/has-access/has-access.directive';

describe('HasAccessDirective', () => {
const createDirective = createHostFactory({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
ComponentRef, Directive, HostBinding, Input, TemplateRef, ViewContainerRef,
} from '@angular/core';
import { UntilDestroy } from '@ngneat/until-destroy';
import { MissingAccessWrapperComponent } from 'app/directives/common/has-access/missing-access-wrapper.component';
import { MissingAccessWrapperComponent } from 'app/directives/has-access/missing-access-wrapper.component';

@UntilDestroy()
@Directive({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
createHostFactory, mockProvider, SpectatorHost,
} from '@ngneat/spectator/jest';
import { BehaviorSubject } from 'rxjs';
import { HasRoleDirective } from 'app/directives/common/has-role/has-role.directive';
import { HasRoleDirective } from 'app/directives/has-role/has-role.directive';
import { Role } from 'app/enums/role.enum';
import { AuthService } from 'app/services/auth/auth.service';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
ChangeDetectionStrategy, Component, Input, TemplateRef,
} from '@angular/core';
import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';

@Component({
selector: 'ix-new-feature-indicator-wrapper',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createHostFactory, mockProvider } from '@ngneat/spectator/jest';
import { of } from 'rxjs';
import { NewFeatureIndicatorDirective } from 'app/directives/common/new-feature-indicator/new-feature-indicator.directive';
import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
import { NewFeatureIndicatorDirective } from 'app/directives/new-feature-indicator/new-feature-indicator.directive';
import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';

describe('NewFeatureIndicatorDirective', () => {
const createDirective = createHostFactory({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {
ComponentRef, Directive, Input, TemplateRef, ViewContainerRef,
} from '@angular/core';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { NewFeatureIndicatorWrapperComponent } from 'app/directives/common/new-feature-indicator/new-feature-indicator-wrapper.component';
import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
import { NewFeatureIndicatorWrapperComponent } from 'app/directives/new-feature-indicator/new-feature-indicator-wrapper.component';
import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';

/**
* Usage: adding an indicator with a hint about a new feature.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest';
import { provideMockStore } from '@ngrx/store/testing';
import { NewFeatureIndicatorService } from 'app/directives/common/new-feature-indicator/new-feature-indicator.service';
import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service';
import { Preferences } from 'app/interfaces/preferences.interface';
import { selectPreferencesState } from 'app/store/preferences/preferences.selectors';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { EventEmitter, Injectable } from '@angular/core';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { Store, select } from '@ngrx/store';
import { NewFeatureIndicator } from 'app/directives/common/new-feature-indicator/new-feature-indicator.interface';
import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface';
import { AppState } from 'app/store';
import { shownNewIndicatorKeysUpdated } from 'app/store/preferences/preferences.actions';
import { selectPreferencesState } from 'app/store/preferences/preferences.selectors';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { isEqual } from 'lodash';
import { take } from 'rxjs';
import { HasAccessDirective } from 'app/directives/common/has-access/has-access.directive';
import { HasAccessDirective } from 'app/directives/has-access/has-access.directive';
import { Role } from 'app/enums/role.enum';
import { AuthService } from 'app/services/auth/auth.service';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import { ComponentPortal } from '@angular/cdk/portal';
import {
Directive, AfterViewInit, ElementRef, HostListener, ComponentRef, OnChanges, OnDestroy, input,
} from '@angular/core';
import { TextLimiterTooltipComponent } from 'app/directives/common/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';
import {
TextLimiterTooltipComponent,
} from 'app/directives/text-limiter/text-limiter-tooltip/text-limiter-tooltip.component';

@Directive({
selector: '[textLimiter]',
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/modules/alerts/alerts.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { RouterModule } from '@angular/router';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { AlertComponent } from 'app/modules/alerts/components/alert/alert.component';
import { AlertsPanelComponent } from 'app/modules/alerts/components/alerts-panel/alerts-panel.component';
import { AlertEffects } from 'app/modules/alerts/store/alert.effects';
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/dialog/dialog.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { FlexModule } from '@ngbracket/ngx-layout';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component';
import { ConfirmDialogComponent } from 'app/modules/dialog/components/confirm-dialog/confirm-dialog.component';
import { ErrorDialogComponent } from 'app/modules/dialog/components/error-dialog/error-dialog.component';
Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/disk-icon/disk-icon.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import { DiskType } from 'app/enums/disk-type.enum';
import {
DiskIconComponent,
} from 'app/modules/disk-icon/disk-icon.component';
import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';

describe('DiskIconComponent', () => {
let spectator: Spectator<DiskIconComponent>;
const createComponent = createComponentFactory({
component: DiskIconComponent,
imports: [
IxFileSizePipe,
FileSizePipe,
],
});

Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/disk-icon/disk-icon.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ChangeDetectionStrategy, Component, input,
} from '@angular/core';
import { DiskType } from 'app/enums/disk-type.enum';
import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';

@Component({
selector: 'ix-disk-icon',
Expand All @@ -12,7 +12,7 @@ import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe
standalone: true,
imports: [
NgIf,
IxFileSizePipe,
FileSizePipe,
],
changeDetection: ChangeDetectionStrategy.OnPush,
})
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/empty/empty.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { EmptyType } from 'app/enums/empty-type.enum';
import { Role } from 'app/enums/role.enum';
import { EmptyConfig } from 'app/interfaces/empty-config.interface';
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/forms/ix-forms/ix-forms.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { RouterLink } from '@angular/router';
import { TreeModule } from '@bugsplat/angular-tree-component';
import { FlexLayoutModule } from '@ngbracket/ngx-layout';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { OauthButtonModule } from 'app/modules/buttons/oauth-button/oauth-button.module';
import { IxButtonGroupComponent } from 'app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.component';
import { IxCheckboxComponent } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Renderer2, ElementRef } from '@angular/core';
import { SpectatorService, createServiceFactory } from '@ngneat/spectator';
import { mockProvider } from '@ngneat/spectator/jest';
import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
import { UiSearchDirective } from 'app/directives/ui-search.directive';
import { UiSearchDirectivesService } from './ui-search-directives.service';

describe('UiSearchDirectivesService', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
import { UiSearchDirective } from 'app/directives/ui-search.directive';
import { getSearchableElementId } from 'app/modules/global-search/helpers/get-searchable-element-id';
import { UiSearchableElement } from 'app/modules/global-search/interfaces/ui-searchable-element.interface';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createServiceFactory, SpectatorService, mockProvider } from '@ngneat/spectator/jest';
import { MockDirective } from 'ng-mocks';
import { of, lastValueFrom } from 'rxjs';
import { UiSearchDirective } from 'app/directives/common/ui-search.directive';
import { UiSearchDirective } from 'app/directives/ui-search.directive';
import { UiSearchDirectivesService } from 'app/modules/global-search/services/ui-search-directives.service';
import { UiSearchProvider } from 'app/modules/global-search/services/ui-search.service';
import { AuthService } from 'app/services/auth/auth.service';
Expand Down
10 changes: 5 additions & 5 deletions src/app/modules/ix-table/ix-table.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatTooltipModule } from '@angular/material/tooltip';
import { FlexModule } from '@ngbracket/ngx-layout';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
import { IxTableEmptyRowComponent } from 'app/modules/ix-table/components/ix-empty-row/ix-empty-row.component';
import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component';
Expand All @@ -38,9 +38,9 @@ import { IxTableHeaderCellDirective } from 'app/modules/ix-table/directives/ix-h
import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive';
import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive';
import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive';
import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe';
import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe';
import { IxDateModule } from 'app/modules/pipes/ix-date/ix-date.module';
import { IxFileSizePipe } from 'app/modules/pipes/ix-file-size/ix-file-size.pipe';
import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component';
import { ScheduleToCrontabPipe } from 'app/modules/pipes/schedule-to-crontab/schedule-to-crontab.pipe';
import { YesNoPipe } from 'app/modules/pipes/yes-no/yes-no.pipe';
import { TestIdModule } from 'app/modules/test-id/test-id.module';
Expand All @@ -59,11 +59,11 @@ import { IxTableColumnsSelectorComponent } from './components/ix-table-columns-s
TranslateModule,
CommonDirectivesModule,
TestIdModule,
IxDateModule,
IxDateComponent,
MatMenuModule,
MatDividerModule,
MatTooltipModule,
IxFileSizePipe,
FileSizePipe,
YesNoPipe,
ScheduleToCrontabPipe,
CdkPortalOutlet,
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/jobs/jobs.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { RouterModule } from '@angular/router';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module';
import { JobItemComponent } from 'app/modules/jobs/components/job-item/job-item.component';
import { JobsPanelComponent } from 'app/modules/jobs/components/jobs-panel/jobs-panel.component';
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/layout/layout.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { RouterModule } from '@angular/router';
import { FlexModule } from '@ngbracket/ngx-layout';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { AlertsModule } from 'app/modules/alerts/alerts.module';
import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module';
import { GlobalSearchModule } from 'app/modules/global-search/global-search.module';
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/page-header/page-header.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
import { MatButton } from '@angular/material/button';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
import { CommonDirectivesModule } from 'app/directives/common-directives.module';
import { AppLoaderModule } from 'app/modules/loader/app-loader.module';
import { BreadcrumbComponent } from 'app/modules/page-header/breadcrumb/breadcrumb.component';
import {
Expand Down
Loading

0 comments on commit 025aa92

Please sign in to comment.