Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(progress indicator): move app progress indicator into shared lib #1204

Merged
4 changes: 2 additions & 2 deletions apps/dsp-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { AppComponent } from './app.component';
import { ConfirmationDialogComponent } from './main/action/confirmation-dialog/confirmation-dialog.component';
import { ConfirmationMessageComponent } from './main/action/confirmation-dialog/confirmation-message/confirmation-message.component';
import { LoginFormComponent } from './main/action/login-form/login-form.component';
import { ProgressIndicatorComponent } from './main/action/progress-indicator/progress-indicator.component';
import { SelectedResourcesComponent } from './main/action/selected-resources/selected-resources.component';
import { SortButtonComponent } from './main/action/sort-button/sort-button.component';
import { StringLiteralInputComponent } from './main/action/string-literal-input/string-literal-input.component';
Expand Down Expand Up @@ -180,6 +179,7 @@ import {
} from '@dasch-swiss/vre/shared/app-config';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { AppDatePickerModule } from '@dasch-swiss/vre/shared/app-date-picker';
import { AppProgressIndicatorComponent } from "@dasch-swiss/vre/shared/app-progress-indicator";

// translate: AoT requires an exported function for factories
export function httpLoaderFactory(httpClient: HttpClient) {
Expand Down Expand Up @@ -256,7 +256,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
PermissionComponent,
PermissionInfoComponent,
ProfileComponent,
ProgressIndicatorComponent,
ProjectComponent,
ProjectFormComponent,
ProjectsComponent,
Expand Down Expand Up @@ -337,6 +336,7 @@ export function httpLoaderFactory(httpClient: HttpClient) {
imports: [
AngularSplitModule,
AppDatePickerModule,
AppProgressIndicatorComponent,
AppRoutingModule,
BrowserAnimationsModule,
BrowserModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[class.mat-warn]="isError"
>
<div class="progress-button-content">
<app-progress-indicator
<dasch-swiss-app-progress-indicator
*ngIf="loading"
[color]="'white'"
[status]="0"
Expand Down Expand Up @@ -73,7 +73,7 @@
class="full-width mat-warn logout-button"
>
<div class="progress-button-content">
<app-progress-indicator
<dasch-swiss-app-progress-indicator
[color]="'white'"
[status]="0"
*ngIf="loading"
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/main/status/status.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ <h2 class="mat-headline-6">
</div>
</div>
<ng-template #isLoading>
<app-progress-indicator></app-progress-indicator>
<dasch-swiss-app-progress-indicator></dasch-swiss-app-progress-indicator>
</ng-template>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ <h2 class="mat-headline-6">
</div>
</div>

<app-progress-indicator *ngIf="loading"></app-progress-indicator>
<dasch-swiss-app-progress-indicator *ngIf="loading"></dasch-swiss-app-progress-indicator>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<app-progress-indicator *ngIf="loading"></app-progress-indicator>
<dasch-swiss-app-progress-indicator *ngIf="loading"></dasch-swiss-app-progress-indicator>

<div *ngIf="!loading">
<div *ngIf="projectAdmin" class="content large middle">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<app-progress-indicator *ngIf="loading"></app-progress-indicator>
<dasch-swiss-app-progress-indicator *ngIf="loading"></dasch-swiss-app-progress-indicator>
<div *ngIf="!loading && project"
class="content large middle">
<div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<app-progress-indicator *ngIf="loading"></app-progress-indicator>
<dasch-swiss-app-progress-indicator *ngIf="loading"></dasch-swiss-app-progress-indicator>

<div *ngIf="!loading" class="form-content list-info">
<h3 *ngIf="mode ==='create'">Create new controlled vocabulary</h3>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<app-progress-indicator *ngIf="loading"></app-progress-indicator>
<dasch-swiss-app-progress-indicator *ngIf="loading"></dasch-swiss-app-progress-indicator>

<div *ngIf="!loading" class="form-content list-info">
<!-- list label -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { of } from 'rxjs';
import { AjaxResponse } from 'rxjs/ajax';
import { AppConfigService } from '@dasch-swiss/vre/shared/app-config';
import { ProgressIndicatorComponent } from '@dsp-app/src/app/main/action/progress-indicator/progress-indicator.component';
import { ApplicationStateService } from '@dasch-swiss/vre/shared/app-state-service';
import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
Expand Down Expand Up @@ -120,7 +119,6 @@ describe('EditListItemComponent', () => {
EditListItemComponent,
TestHostUpdateChildNodeComponent,
TestHostInsertChildNodeComponent,
ProgressIndicatorComponent,
MockStringLiteralInputComponent,
],
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
add
</mat-icon>
</button>
<app-progress-indicator [status]="0" *ngIf="loading" class="progress-indicator"></app-progress-indicator>
<dasch-swiss-app-progress-indicator [status]="0" *ngIf="loading" class="progress-indicator"></dasch-swiss-app-progress-indicator>
</div>

<!-- node item -->
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/app/project/list/list.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div *ngIf="!disableContent">
<app-progress-indicator *ngIf="loading"></app-progress-indicator>
<dasch-swiss-app-progress-indicator *ngIf="loading"></dasch-swiss-app-progress-indicator>

<!-- display only when loading is finished and project member has value -->
<div *ngIf="!loading">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h3 *ngIf="!iri">Create new ontology</h3>
[disabled]="!ontologyForm.valid"
>
<div class="progress-button-content">
<app-progress-indicator
<dasch-swiss-app-progress-indicator
*ngIf="loading"
[color]="'white'"
[status]="0"
Expand Down