mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-20 08:33:11 +00:00
refactor: remove refresher from data detail view
This commit is contained in:
committed by
Jovan Krunić
parent
d2a23e581e
commit
fd7f664792
@@ -17,7 +17,7 @@
|
||||
import {CUSTOM_ELEMENTS_SCHEMA, DebugElement} from '@angular/core';
|
||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
||||
import {ActivatedRoute, RouterModule} from '@angular/router';
|
||||
import {IonRefresher, IonTitle} from '@ionic/angular';
|
||||
import {IonTitle} from '@ionic/angular';
|
||||
import {
|
||||
TranslateLoader,
|
||||
TranslateModule,
|
||||
@@ -45,7 +45,6 @@ describe('DataDetailComponent', () => {
|
||||
let fixture: ComponentFixture<DataDetailComponent>;
|
||||
let detailPage: DebugElement;
|
||||
let dataProvider: DataProvider;
|
||||
let refresher: IonRefresher;
|
||||
const sampleThing = sampleThingsMap.message[0];
|
||||
let translateService: TranslateService;
|
||||
|
||||
@@ -99,7 +98,6 @@ describe('DataDetailComponent', () => {
|
||||
beforeEach(() => {
|
||||
dataProvider = TestBed.inject(DataProvider);
|
||||
translateService = TestBed.inject(TranslateService);
|
||||
refresher = jasmine.createSpyObj('refresher', ['complete']);
|
||||
spyOn(dataProvider, 'get' as any).and.returnValue(
|
||||
Promise.resolve(sampleThing),
|
||||
);
|
||||
@@ -133,13 +131,4 @@ describe('DataDetailComponent', () => {
|
||||
false,
|
||||
);
|
||||
});
|
||||
|
||||
it('should update the data item when refresh is called', async () => {
|
||||
await comp.refresh(refresher);
|
||||
expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(
|
||||
sampleThing.uid,
|
||||
true,
|
||||
);
|
||||
expect(refresher.complete).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
TemplateRef,
|
||||
} from '@angular/core';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
import {IonRefresher, ViewWillEnter, ModalController} from '@ionic/angular';
|
||||
import {ViewWillEnter, ModalController} from '@ionic/angular';
|
||||
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
||||
import {
|
||||
SCLanguageCode,
|
||||
@@ -171,16 +171,4 @@ export class DataDetailComponent implements ViewWillEnter {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the shown thing
|
||||
*
|
||||
* @param refresher Refresher component that triggers the update
|
||||
*/
|
||||
async refresh(refresher: IonRefresher) {
|
||||
if (!this.inputItem) {
|
||||
await this.getItem(this.route.snapshot.paramMap.get('uid') ?? '', true);
|
||||
}
|
||||
await refresher.complete();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,14 +20,6 @@
|
||||
</ion-header>
|
||||
<ng-content select="[header]"></ng-content>
|
||||
<ion-content class="ion-no-padding">
|
||||
<ion-refresher slot="fixed" (ionRefresh)="refresh($event.target)">
|
||||
<ion-refresher-content
|
||||
pullingIcon="chevron-down-outline"
|
||||
pullingText="{{ 'data.REFRESH_ACTION' | translate }}"
|
||||
refreshingText="{{ 'data.REFRESHING' | translate }}"
|
||||
>
|
||||
</ion-refresher-content>
|
||||
</ion-refresher>
|
||||
<div [ngSwitch]="true">
|
||||
<ng-container *ngSwitchCase="!item && (isDisconnected | async)">
|
||||
<div class="centeredMessageContainer">
|
||||
|
||||
Reference in New Issue
Block a user