-
diff --git a/src/app/modules/data/chips/add-event-popover.component.ts b/src/app/modules/data/chips/add-event-popover.component.ts
index 716e6928..3b4cb3f0 100644
--- a/src/app/modules/data/chips/add-event-popover.component.ts
+++ b/src/app/modules/data/chips/add-event-popover.component.ts
@@ -28,9 +28,8 @@ enum Selection {
*
* The generic is to preserve type safety of how deep the tree goes.
*/
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
class TreeNode
-
- {{label | translate}}
+
-
diff --git a/src/app/modules/data/chips/data/locate-action-chip.component.ts b/src/app/modules/data/chips/data/locate-action-chip.component.ts
index 41486a50..af4a260e 100644
--- a/src/app/modules/data/chips/data/locate-action-chip.component.ts
+++ b/src/app/modules/data/chips/data/locate-action-chip.component.ts
@@ -1,4 +1,4 @@
-/* tslint:disable:prefer-function-over-method */
+/* eslint-disable class-methods-use-this */
/*
* Copyright (C) 2021 StApps
* This program is free software: you can redistribute it and/or modify it
@@ -36,4 +36,3 @@ export class LocateActionChipComponent {
// TODO
}
}
-
diff --git a/src/app/modules/data/chips/data/locate-action-chip.html b/src/app/modules/data/chips/data/locate-action-chip.html
index f2abd377..db59071c 100644
--- a/src/app/modules/data/chips/data/locate-action-chip.html
+++ b/src/app/modules/data/chips/data/locate-action-chip.html
@@ -1,7 +1,7 @@
-
- {{'Locate' | translate}}
+
+ {{ 'Locate' | translate }}
-
diff --git a/src/app/modules/data/data-facets.provider.spec.ts b/src/app/modules/data/data-facets.provider.spec.ts
index 57af3a5d..ef18a258 100644
--- a/src/app/modules/data/data-facets.provider.spec.ts
+++ b/src/app/modules/data/data-facets.provider.spec.ts
@@ -25,15 +25,26 @@ describe('DataProvider', () => {
let dataFacetsProvider: DataFacetsProvider;
const sampleFacets: SCFacet[] = [
{
- buckets: [{key: 'education', count: 4}, {key: 'learn', count: 3}, {key: 'computer', count: 3}],
+ buckets: [
+ {key: 'education', count: 4},
+ {key: 'learn', count: 3},
+ {key: 'computer', count: 3},
+ ],
field: 'categories',
},
{
- buckets: [{key: 'Major One', count: 1}, {key: 'Major Two', count: 2}, {key: 'Major Three' , count: 1}],
+ buckets: [
+ {key: 'Major One', count: 1},
+ {key: 'Major Two', count: 2},
+ {key: 'Major Three', count: 1},
+ ],
field: 'majors',
},
{
- buckets: [{key: 'building', count: 3}, {key: 'room', count: 7}],
+ buckets: [
+ {key: 'building', count: 3},
+ {key: 'room', count: 7},
+ ],
field: 'type',
},
];
@@ -51,16 +62,21 @@ describe('DataProvider', () => {
...sampleThingsMap['academic event'],
];
- const sampleBuckets: SCFacetBucket[] = [{key: 'foo', count: 1}, {key: 'bar', count: 2}, {key: 'foo bar', count: 3}];
- const sampleBucketsMap: {[key: string]: number} = {foo: 1, bar: 2, 'foo bar': 3};
+ const sampleBuckets: SCFacetBucket[] = [
+ {key: 'foo', count: 1},
+ {key: 'bar', count: 2},
+ {key: 'foo bar', count: 3},
+ ];
+ const sampleBucketsMap: {[key: string]: number} = {
+ 'foo': 1,
+ 'bar': 2,
+ 'foo bar': 3,
+ };
beforeEach(() => {
TestBed.configureTestingModule({
imports: [DataModule],
- providers: [
- DataProvider,
- StAppsWebHttpClient,
- ],
+ providers: [DataProvider, StAppsWebHttpClient],
});
dataFacetsProvider = TestBed.get(DataFacetsProvider);
});
@@ -78,48 +94,76 @@ describe('DataProvider', () => {
});
it('should convert buckets to buckets map', () => {
- expect(dataFacetsProvider.bucketsToMap(sampleBuckets)).toEqual(sampleBucketsMap);
+ expect(dataFacetsProvider.bucketsToMap(sampleBuckets)).toEqual(
+ sampleBucketsMap,
+ );
});
it('should convert buckets map into buckets', () => {
- expect(dataFacetsProvider.mapToBuckets(sampleBucketsMap)).toEqual(sampleBuckets);
+ expect(dataFacetsProvider.mapToBuckets(sampleBucketsMap)).toEqual(
+ sampleBuckets,
+ );
});
it('should convert facets into a facets map', () => {
- expect(dataFacetsProvider.facetsToMap(sampleFacets)).toEqual(sampleFacetsMap);
+ expect(dataFacetsProvider.facetsToMap(sampleFacets)).toEqual(
+ sampleFacetsMap,
+ );
});
it('should convert facets map into facets', () => {
- expect(dataFacetsProvider.mapToFacets(sampleFacetsMap)).toEqual(sampleFacets);
+ expect(dataFacetsProvider.mapToFacets(sampleFacetsMap)).toEqual(
+ sampleFacets,
+ );
});
it('should extract facets (and append them if needed) from the data', () => {
const sampleCombinedFacets: SCFacet[] = [
{
buckets: [
- {key: 'computer', count: 3}, {key: 'course', count: 1}, {key: 'education', count: 5},
- {key: 'learn', count: 3}, {key: 'library', count: 1}, {key: 'practicum', count: 1},
- ],
+ {key: 'computer', count: 3},
+ {key: 'course', count: 1},
+ {key: 'education', count: 5},
+ {key: 'learn', count: 3},
+ {key: 'library', count: 1},
+ {key: 'practicum', count: 1},
+ ],
field: 'categories',
},
{
- buckets: [{key: 'Major One', count: 2}, {key: 'Major Two', count: 4}, {key: 'Major Three', count: 2}],
+ buckets: [
+ {key: 'Major One', count: 2},
+ {key: 'Major Two', count: 4},
+ {key: 'Major Three', count: 2},
+ ],
field: 'majors',
},
{
- buckets: [{key: 'building', count: 4}, {key: 'academic event', count: 2}, {key: 'person', count: 2}, {key: 'room', count: 8}],
+ buckets: [
+ {key: 'building', count: 4},
+ {key: 'academic event', count: 2},
+ {key: 'person', count: 2},
+ {key: 'room', count: 8},
+ ],
field: 'type',
},
];
const checkEqual = (expected: SCFacet[], actual: SCFacet[]) => {
const expectedMap = dataFacetsProvider.facetsToMap(expected);
const actualMap = dataFacetsProvider.facetsToMap(actual);
- Object.keys(actualMap).forEach((key) => {
- Object.keys(actualMap[key]).forEach((subKey) => {
+ for (const key of Object.keys(actualMap)) {
+ for (const subKey of Object.keys(actualMap[key])) {
expect(actualMap[key][subKey]).toBe(expectedMap[key][subKey]);
- });
- });
+ }
+ }
};
- checkEqual(dataFacetsProvider.extractFacets(sampleItems, sampleAggregations, sampleFacets), sampleCombinedFacets);
+ checkEqual(
+ dataFacetsProvider.extractFacets(
+ sampleItems,
+ sampleAggregations,
+ sampleFacets,
+ ),
+ sampleCombinedFacets,
+ );
});
});
diff --git a/src/app/modules/data/data-facets.provider.ts b/src/app/modules/data/data-facets.provider.ts
index cd31ffb5..0524a0dd 100644
--- a/src/app/modules/data/data-facets.provider.ts
+++ b/src/app/modules/data/data-facets.provider.ts
@@ -13,16 +13,20 @@
* this program. If not, see ;
- spyOn(storageProvider, 'put' as any).and.callFake((_id: any, thing: any) => {
- providedThing = thing;
- providedThing.origin.created = sampleSavable.origin.created;
- });
+ spyOn(storageProvider, 'put' as any).and.callFake(
+ (_id: any, thing: any) => {
+ providedThing = thing;
+ providedThing.origin.created = sampleSavable.origin.created;
+ },
+ );
expect(storageProvider.put).not.toHaveBeenCalled();
expect(providedThing!).not.toBeDefined();
await dataProvider.put(sampleThing);
@@ -170,9 +186,14 @@ describe('DataProvider', () => {
await dataProvider.put(sampleThing);
spyOn(storageProvider, 'get').and.callThrough();
expect(storageProvider.get).not.toHaveBeenCalled();
- const providedThing = await dataProvider.get(sampleThing.uid, DataScope.Local);
+ const providedThing = await dataProvider.get(
+ sampleThing.uid,
+ DataScope.Local,
+ );
providedThing.origin.created = sampleSavable.origin.created;
- expect(storageProvider.get).toHaveBeenCalledWith(dataProvider.getDataKey(sampleThing.uid));
+ expect(storageProvider.get).toHaveBeenCalledWith(
+ dataProvider.getDataKey(sampleThing.uid),
+ );
expect(providedThing).toEqual(sampleSavable);
});
@@ -180,11 +201,16 @@ describe('DataProvider', () => {
await dataProvider.put(sampleThing);
await dataProvider.put(otherSampleThing);
const result = await dataProvider.getAll();
- expect(Array.from(result.keys()).sort()).toEqual([
- dataProvider.getDataKey(sampleThing.uid), dataProvider.getDataKey(otherSampleThing.uid),
+ expect([...result.keys()].sort()).toEqual([
+ dataProvider.getDataKey(sampleThing.uid),
+ dataProvider.getDataKey(otherSampleThing.uid),
]);
- expect(result.get(dataProvider.getDataKey(sampleThing.uid))!.data).toEqual(sampleThing);
- expect(result.get(dataProvider.getDataKey(otherSampleThing.uid))!.data).toEqual(otherSampleThing);
+ expect(result.get(dataProvider.getDataKey(sampleThing.uid))!.data).toEqual(
+ sampleThing,
+ );
+ expect(
+ result.get(dataProvider.getDataKey(otherSampleThing.uid))!.data,
+ ).toEqual(otherSampleThing);
});
it('should provide single data from the backend', async () => {
@@ -196,7 +222,10 @@ describe('DataProvider', () => {
};
});
expect(Client.prototype.getThing).not.toHaveBeenCalled();
- const providedThing = await dataProvider.get(sampleThing.uid, DataScope.Remote);
+ const providedThing = await dataProvider.get(
+ sampleThing.uid,
+ DataScope.Remote,
+ );
expect(Client.prototype.getThing).toHaveBeenCalledWith(sampleThing.uid);
expect(providedThing).toBe(sampleThing);
});
@@ -226,7 +255,9 @@ describe('DataProvider', () => {
await dataProvider.put(sampleThing);
expect(await storageProvider.length()).toBe(1);
await dataProvider.delete(sampleThing.uid);
- expect(storageProvider.delete).toHaveBeenCalledWith(dataProvider.getDataKey(sampleThing.uid));
+ expect(storageProvider.delete).toHaveBeenCalledWith(
+ dataProvider.getDataKey(sampleThing.uid),
+ );
expect(await storageProvider.length()).toBe(0);
});
@@ -242,7 +273,7 @@ describe('DataProvider', () => {
dataProvider.getDataKey(otherSampleThing.uid),
);
const result = await storageProvider.getAll();
- expect(Array.from(result.keys())).toEqual(['some-uid']);
+ expect([...result.keys()]).toEqual(['some-uid']);
});
it('should properly check if a data item has already been saved', async () => {
diff --git a/src/app/modules/data/data.provider.ts b/src/app/modules/data/data.provider.ts
index bd7a8d18..96aa5c65 100644
--- a/src/app/modules/data/data.provider.ts
+++ b/src/app/modules/data/data.provider.ts
@@ -15,7 +15,8 @@
import {Injectable} from '@angular/core';
import {Client} from '@openstapps/api/lib/client';
import {
- SCMultiSearchRequest, SCMultiSearchResponse,
+ SCMultiSearchRequest,
+ SCMultiSearchResponse,
SCSearchRequest,
SCSearchResponse,
SCThingOriginType,
@@ -43,7 +44,6 @@ export enum DataScope {
providedIn: 'root',
})
export class DataProvider {
-
/**
* TODO
*/
@@ -57,26 +57,32 @@ export class DataProvider {
set storagePrefix(storagePrefix) {
this._storagePrefix = storagePrefix;
}
+
/**
* TODO
*/
private _storagePrefix = 'stapps.data';
+
/**
* Version of the app (used for the header in communication with the backend)
*/
appVersion = environment.backend_version;
+
/**
* Maximum number of sub-queries in a multi-query allowed by the backend
*/
backendQueriesLimit = 5;
+
/**
* TODO
*/
backendUrl = environment.backend_url;
+
/**
* TODO
*/
client: Client;
+
/**
* TODO
*/
@@ -88,8 +94,15 @@ export class DataProvider {
* @param stAppsWebHttpClient TODO
* @param storageProvider TODO
*/
- constructor(stAppsWebHttpClient: StAppsWebHttpClient, storageProvider: StorageProvider) {
- this.client = new Client(stAppsWebHttpClient, this.backendUrl, this.appVersion);
+ constructor(
+ stAppsWebHttpClient: StAppsWebHttpClient,
+ storageProvider: StorageProvider,
+ ) {
+ this.client = new Client(
+ stAppsWebHttpClient,
+ this.backendUrl,
+ this.appVersion,
+ );
this.storageProvider = storageProvider;
}
@@ -106,7 +119,7 @@ export class DataProvider {
* Delete all the previously saved data items
*/
async deleteAll(): Promise {
- const keys = Array.from((await this.getAll()).keys());
+ const keys = [...(await this.getAll()).keys()];
return this.storageProvider.delete(...keys);
}
@@ -114,15 +127,23 @@ export class DataProvider {
/**
* Provides a savable thing from the local database using the provided UID
*/
- async get(uid: string, scope: DataScope.Local): Promise>;
+ async get(
+ uid: string,
+ scope: DataScope.Local,
+ ): Promise>;
/**
* Provides a thing from the backend
*/
- async get(uid: string, scope: DataScope.Remote): Promise>;
+ async get(
+ uid: string,
+ scope: DataScope.Remote,
+ ): Promise>;
/**
* Provides a thing from both local database and backend
*/
- async get(uid: string): Promise>>;
+ async get(
+ uid: string,
+ ): Promise>>;
/**
* Provides a thing from the local database only, backend only or both, depending on the scope
@@ -130,26 +151,36 @@ export class DataProvider {
* @param uid Unique identifier of a thing
* @param scope From where data should be provided
*/
- async get(uid: string, scope?: DataScope):
- Promise | Map>> {
- if (scope === DataScope.Local) {
- return this.storageProvider.get>(this.getDataKey(uid));
- }
- if (scope === DataScope.Remote) {
- return this.client.getThing(uid);
- }
- const map: Map> = new Map();
- map.set(DataScope.Local, await this.get(uid, DataScope.Local));
- map.set(DataScope.Remote, await this.get(uid, DataScope.Remote));
-
- return map;
+ async get(
+ uid: string,
+ scope?: DataScope,
+ ): Promise<
+ | SCThings
+ | SCSaveableThing
+ | Map>
+ > {
+ if (scope === DataScope.Local) {
+ return this.storageProvider.get>(
+ this.getDataKey(uid),
+ );
}
+ if (scope === DataScope.Remote) {
+ return this.client.getThing(uid);
+ }
+ const map: Map> = new Map();
+ map.set(DataScope.Local, await this.get(uid, DataScope.Local));
+ map.set(DataScope.Remote, await this.get(uid, DataScope.Remote));
+
+ return map;
+ }
/**
* Provides all things saved in the local database
*/
async getAll(): Promise>> {
- return this.storageProvider.search>(this.storagePrefix);
+ return this.storageProvider.search>(
+ this.storagePrefix,
+ );
}
/**
@@ -175,11 +206,18 @@ export class DataProvider {
*
* @param query - query to send to the backend (auto-splits according to the backend limit)
*/
- async multiSearch(query: SCMultiSearchRequest): Promise {
+ async multiSearch(
+ query: SCMultiSearchRequest,
+ ): Promise {
// partition object into chunks, process those requests in parallel, then merge their responses again
- return Object.assign({}, ...(await Promise.all(chunk(toPairs(query), this.backendQueriesLimit)
- .map((request) => this.client.multiSearch(fromPairs(request))),
- )));
+ return Object.assign(
+ {},
+ ...(await Promise.all(
+ chunk(toPairs(query), this.backendQueriesLimit).map(request =>
+ this.client.multiSearch(fromPairs(request)),
+ ),
+ )),
+ );
}
/**
@@ -188,7 +226,10 @@ export class DataProvider {
* @param item Data item that needs to be saved
* @param [type] Savable type (e.g. 'favorite'); if nothing is provided then type of the thing is used
*/
- async put(item: SCThings, type?: SCThingType): Promise> {
+ async put(
+ item: SCThings,
+ type?: SCThingType,
+ ): Promise> {
const savableItem: SCSaveableThing = {
data: item,
name: item.name,
@@ -196,12 +237,15 @@ export class DataProvider {
created: new Date().toISOString(),
type: SCThingOriginType.User,
},
- type: (typeof type === 'undefined') ? item.type : type,
+ type: typeof type === 'undefined' ? item.type : type,
uid: item.uid,
};
// @TODO: Implementation for saving item into the backend (user's account)
- return ( this.storageProvider.put>(this.getDataKey(item.uid), savableItem));
+ return this.storageProvider.put>(
+ this.getDataKey(item.uid),
+ savableItem,
+ );
}
/**
@@ -210,6 +254,6 @@ export class DataProvider {
* @param query - query to send to the backend
*/
async search(query: SCSearchRequest): Promise {
- return (this.client.search(query));
+ return this.client.search(query);
}
}
diff --git a/src/app/modules/data/detail/data-detail-content.component.ts b/src/app/modules/data/detail/data-detail-content.component.ts
index 96e1c864..6dc7d06f 100644
--- a/src/app/modules/data/detail/data-detail-content.component.ts
+++ b/src/app/modules/data/detail/data-detail-content.component.ts
@@ -27,5 +27,4 @@ export class DataDetailContentComponent {
* TODO
*/
@Input() item: SCThings;
-
}
diff --git a/src/app/modules/data/detail/data-detail-content.html b/src/app/modules/data/detail/data-detail-content.html
index 8d2815bb..78e0ac98 100644
--- a/src/app/modules/data/detail/data-detail-content.html
+++ b/src/app/modules/data/detail/data-detail-content.html
@@ -1,19 +1,68 @@
-): thing is SCSaveableThing {
+ static isSCSavableThing(
+ thing: SCThings | SCSaveableThing,
+ ): thing is SCSaveableThing {
return typeof (thing as SCSaveableThing).data !== 'undefined';
}
@@ -55,10 +62,12 @@ export class DataDetailComponent implements OnInit {
* @param network the network provider
* @param translateService the translation service
*/
- constructor(private readonly route: ActivatedRoute,
- private readonly dataProvider: DataProvider,
- private readonly network: Network,
- translateService: TranslateService) {
+ constructor(
+ private readonly route: ActivatedRoute,
+ private readonly dataProvider: DataProvider,
+ private readonly network: Network,
+ translateService: TranslateService,
+ ) {
this.language = translateService.currentLang as SCLanguageCode;
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
this.language = event.lang as SCLanguageCode;
@@ -74,7 +83,8 @@ export class DataDetailComponent implements OnInit {
try {
const item = await this.dataProvider.get(uid, DataScope.Remote);
this.item = DataDetailComponent.isSCSavableThing(item) ? item.data : item;
- } catch (_) {
+ } catch {
+ // eslint-disable-next-line unicorn/no-null
this.item = null;
}
}
@@ -99,7 +109,9 @@ export class DataDetailComponent implements OnInit {
* @param refresher Refresher component that triggers the update
*/
async refresh(refresher: IonRefresher) {
- await this.getItem(this.item?.uid ?? this.route.snapshot.paramMap.get('uid') ?? '');
+ await this.getItem(
+ this.item?.uid ?? this.route.snapshot.paramMap.get('uid') ?? '',
+ );
await refresher.complete();
}
}
diff --git a/src/app/modules/data/detail/data-detail.html b/src/app/modules/data/detail/data-detail.html
index a07bf679..b680ae6a 100644
--- a/src/app/modules/data/detail/data-detail.html
+++ b/src/app/modules/data/detail/data-detail.html
@@ -1,23 +1,25 @@
-
-
- {{'data.detail.TITLE' | translate}}
+
+
+ {{ 'data.detail.TITLE' | translate }}
-
+
+
+ {{ label | translate }}
-
diff --git a/src/app/modules/data/detail/data-detail.component.spec.ts b/src/app/modules/data/detail/data-detail.component.spec.ts
index 182b062f..c9945323 100644
--- a/src/app/modules/data/detail/data-detail.component.spec.ts
+++ b/src/app/modules/data/detail/data-detail.component.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
/*
* Copyright (C) 2018, 2019 StApps
* This program is free software: you can redistribute it and/or modify it
@@ -16,7 +17,11 @@ import {CUSTOM_ELEMENTS_SCHEMA, DebugElement} from '@angular/core';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ActivatedRoute, RouterModule} from '@angular/router';
import {IonRefresher, IonTitle} from '@ionic/angular';
-import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
+import {
+ TranslateLoader,
+ TranslateModule,
+ TranslateService,
+} from '@ngx-translate/core';
import {sampleThingsMap} from '../../../_helpers/data/sample-things';
import {DataRoutingModule} from '../data-routing.module';
import {DataModule} from '../data.module';
@@ -59,21 +64,26 @@ describe('DataDetailComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- imports: [RouterModule.forRoot([]), DataRoutingModule, DataModule,
- TranslateModule.forRoot({
- loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
- })],
+ imports: [
+ RouterModule.forRoot([]),
+ DataRoutingModule,
+ DataModule,
+ TranslateModule.forRoot({
+ loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
+ }),
+ ],
providers: [{provide: ActivatedRoute, useValue: fakeActivatedRoute}],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
- })
- .compileComponents();
+ }).compileComponents();
}));
beforeEach(async () => {
dataProvider = TestBed.get(DataProvider);
translateService = TestBed.get(TranslateService);
refresher = jasmine.createSpyObj('refresher', ['complete']);
- spyOn(dataProvider, 'get' as any).and.returnValue(Promise.resolve(sampleThing));
+ spyOn(dataProvider, 'get' as any).and.returnValue(
+ Promise.resolve(sampleThing),
+ );
spyOn(DataDetailComponent.prototype, 'getItem').and.callThrough();
fixture = await TestBed.createComponent(DataDetailComponent);
comp = fixture.componentInstance;
@@ -83,28 +93,33 @@ describe('DataDetailComponent', () => {
await dataProvider.deleteAll();
});
- it('should create component', () =>
- expect(comp).toBeDefined(),
- );
+ it('should create component', () => expect(comp).toBeDefined());
it('should have appropriate title', async () => {
const title: DebugElement | null = detailPage.query(By.directive(IonTitle));
+ // eslint-disable-next-line unicorn/no-null
expect(title).not.toBe(null);
expect(title!.nativeElement.textContent).toBe('Foo');
});
it('should get a data item', () => {
comp.getItem(sampleThing.uid);
- expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid);
+ expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(
+ sampleThing.uid,
+ );
});
it('should get a data item when component is accessed', async () => {
- expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid);
+ expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(
+ sampleThing.uid,
+ );
});
it('should update the data item when refresh is called', async () => {
await comp.refresh(refresher);
- expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid);
+ expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(
+ sampleThing.uid,
+ );
expect(refresher.complete).toHaveBeenCalled();
});
});
diff --git a/src/app/modules/data/detail/data-detail.component.ts b/src/app/modules/data/detail/data-detail.component.ts
index 8772d571..bd527f6b 100644
--- a/src/app/modules/data/detail/data-detail.component.ts
+++ b/src/app/modules/data/detail/data-detail.component.ts
@@ -17,7 +17,12 @@ import {ActivatedRoute} from '@angular/router';
import {Network} from '@ionic-native/network/ngx';
import {IonRefresher} from '@ionic/angular';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
-import {SCLanguageCode, SCSaveableThing, SCThings, SCUuid} from '@openstapps/core';
+import {
+ SCLanguageCode,
+ SCSaveableThing,
+ SCThings,
+ SCUuid,
+} from '@openstapps/core';
import {DataProvider, DataScope} from '../data.provider';
/**
@@ -44,7 +49,9 @@ export class DataDetailComponent implements OnInit {
/**
* Type guard for SCSavableThing
*/
- static isSCSavableThing(thing: SCThings | SCSaveableThing
-
-
-
-
+
+
+
{{ 'data.detail.COULD_NOT_CONNECT' | translate }}
@@ -25,8 +27,7 @@
-
-
+
{{ 'data.detail.NOT_FOUND' | translate }}
@@ -39,14 +40,17 @@
-
diff --git a/src/app/modules/data/elements/address-detail.html b/src/app/modules/data/elements/address-detail.html
index 4345ae12..4c60ad3e 100644
--- a/src/app/modules/data/elements/address-detail.html
+++ b/src/app/modules/data/elements/address-detail.html
@@ -1,41 +1,57 @@
- {{'data.detail.address.TITLE' | translate | titlecase}}
+ {{
+ 'data.detail.address.TITLE' | translate | titlecase
+ }}
- {{'data.detail.address.STREET' | translate | titlecase}}:
+ {{ 'data.detail.address.STREET' | translate | titlecase }}:
- {{address.streetAddress}}
+ {{ address.streetAddress }}
- {{'data.detail.address.POSTCODE' | translate | titlecase}}:
+ {{
+ 'data.detail.address.POSTCODE' | translate | titlecase
+ }}:
- {{address.postalCode}}
+ {{ address.postalCode }}
- {{'data.detail.address.CITY' | translate | titlecase}}:
+ {{ 'data.detail.address.CITY' | translate | titlecase }}:
- {{address.addressLocality}}
+ {{ address.addressLocality }}
- {{'data.detail.address.REGION' | translate | titlecase}}:
+ {{ 'data.detail.address.REGION' | translate | titlecase }}:
- {{address.addressRegion}}
+ {{ address.addressRegion }}
- {{'data.detail.address.COUNTRY' | translate | titlecase}}:
+ {{ 'data.detail.address.COUNTRY' | translate | titlecase }}:
- {{address.addressCountry}}
+ {{ address.addressCountry }}
- {{'data.detail.address.POST_OFFICE_BOX' | translate | titlecase}}
+ {{
+ 'data.detail.address.POST_OFFICE_BOX' | translate | titlecase
+ }}
- {{address.postOfficeBoxNumber}}
+ {{ address.postOfficeBoxNumber }}
diff --git a/src/app/modules/data/elements/long-inline-text.component.ts b/src/app/modules/data/elements/long-inline-text.component.ts
index 9314b269..41ee3434 100644
--- a/src/app/modules/data/elements/long-inline-text.component.ts
+++ b/src/app/modules/data/elements/long-inline-text.component.ts
@@ -21,11 +21,12 @@ import {Component, Input} from '@angular/core';
selector: 'stapps-long-inline-text',
templateUrl: 'long-inline-text.html',
})
-export class LongInlineText {
+export class LongInlineTextComponent {
/**
* TODO
*/
@Input() size: number;
+
/**
* TODO
*/
diff --git a/src/app/modules/data/elements/long-inline-text.html b/src/app/modules/data/elements/long-inline-text.html
index e51f40eb..089f104c 100644
--- a/src/app/modules/data/elements/long-inline-text.html
+++ b/src/app/modules/data/elements/long-inline-text.html
@@ -1 +1,3 @@
-{{text | slice:0:size}}...
+{{ text | slice: 0:size }}...
diff --git a/src/app/modules/data/elements/offers-detail.component.ts b/src/app/modules/data/elements/offers-detail.component.ts
index 94fb390e..ecd8ef03 100644
--- a/src/app/modules/data/elements/offers-detail.component.ts
+++ b/src/app/modules/data/elements/offers-detail.component.ts
@@ -13,7 +13,10 @@
* this program. If not, see
- {{'data.detail.offers.TITLE' | translate | titlecase}}
+ {{
+ 'data.detail.offers.TITLE' | translate | titlecase
+ }}
- {{group | titlecase}}
+ {{ group | titlecase }}
-
diff --git a/src/app/modules/data/elements/offers-in-list.component.ts b/src/app/modules/data/elements/offers-in-list.component.ts
index 38dbe4eb..da2ac50e 100644
--- a/src/app/modules/data/elements/offers-in-list.component.ts
+++ b/src/app/modules/data/elements/offers-in-list.component.ts
@@ -13,7 +13,10 @@
* this program. If not, see
- {{'data.types.origin.TITLE' | translate | titlecase}}: {{'data.types.origin.USER' | translate | titlecase}}
+ {{ 'data.types.origin.TITLE' | translate | titlecase }}:
+ {{ 'data.types.origin.USER' | translate | titlecase }}
-
- {{'data.types.origin.TITLE' | translate | titlecase}}: {{'data.types.origin.REMOTE' | translate | titlecase}}
+ {{ 'data.types.origin.TITLE' | translate | titlecase }}:
+ {{ 'data.types.origin.REMOTE' | translate | titlecase }}
-
diff --git a/src/app/modules/data/elements/origin-in-list.html b/src/app/modules/data/elements/origin-in-list.html
index 4dd7fc10..6c406b4d 100644
--- a/src/app/modules/data/elements/origin-in-list.html
+++ b/src/app/modules/data/elements/origin-in-list.html
@@ -1,7 +1,7 @@
- {{title}}
+ {{ title }}
-
+
-
-
+
-
-
-
diff --git a/src/app/modules/data/elements/skeleton-list-item.component.ts b/src/app/modules/data/elements/skeleton-list-item.component.ts
index 8647283c..0fb5dbff 100644
--- a/src/app/modules/data/elements/skeleton-list-item.component.ts
+++ b/src/app/modules/data/elements/skeleton-list-item.component.ts
@@ -22,5 +22,4 @@ import {Component} from '@angular/core';
templateUrl: 'skeleton-list-item.html',
styleUrls: ['skeleton-list-item.scss'],
})
-export class SkeletonListItem {
-}
+export class SkeletonListItemComponent {}
diff --git a/src/app/modules/data/elements/skeleton-list-item.html b/src/app/modules/data/elements/skeleton-list-item.html
index 80593d77..a205b15d 100644
--- a/src/app/modules/data/elements/skeleton-list-item.html
+++ b/src/app/modules/data/elements/skeleton-list-item.html
@@ -1,18 +1,18 @@
-
+
-
-
-
diff --git a/src/app/modules/data/elements/skeleton-segment-button.component.ts b/src/app/modules/data/elements/skeleton-segment-button.component.ts
index dae4a0df..4d747806 100644
--- a/src/app/modules/data/elements/skeleton-segment-button.component.ts
+++ b/src/app/modules/data/elements/skeleton-segment-button.component.ts
@@ -21,5 +21,4 @@ import {Component} from '@angular/core';
selector: 'stapps-skeleton-segment-button',
templateUrl: 'skeleton-segment-button.html',
})
-export class SkeletonSegment {
-}
+export class SkeletonSegmentComponent {}
diff --git a/src/app/modules/data/elements/skeleton-segment-button.html b/src/app/modules/data/elements/skeleton-segment-button.html
index ad9cad92..edf95f6b 100644
--- a/src/app/modules/data/elements/skeleton-segment-button.html
+++ b/src/app/modules/data/elements/skeleton-segment-button.html
@@ -1,4 +1,3 @@
-
-
diff --git a/src/app/modules/data/elements/skeleton-simple-card.component.ts b/src/app/modules/data/elements/skeleton-simple-card.component.ts
index 71c0beb5..3c00da6a 100644
--- a/src/app/modules/data/elements/skeleton-simple-card.component.ts
+++ b/src/app/modules/data/elements/skeleton-simple-card.component.ts
@@ -21,5 +21,4 @@ import {Component} from '@angular/core';
selector: 'stapps-skeleton-simple-card',
templateUrl: 'skeleton-simple-card.html',
})
-export class SkeletonSimpleCard {
-}
+export class SkeletonSimpleCardComponent {}
diff --git a/src/app/modules/data/elements/skeleton-simple-card.html b/src/app/modules/data/elements/skeleton-simple-card.html
index a8f317c1..2e51180b 100644
--- a/src/app/modules/data/elements/skeleton-simple-card.html
+++ b/src/app/modules/data/elements/skeleton-simple-card.html
@@ -3,6 +3,6 @@
-
diff --git a/src/app/modules/data/list/data-list-item.component.ts b/src/app/modules/data/list/data-list-item.component.ts
index 9bcfa883..9966f69e 100644
--- a/src/app/modules/data/list/data-list-item.component.ts
+++ b/src/app/modules/data/list/data-list-item.component.ts
@@ -24,7 +24,7 @@ import {DataRoutingService} from '../data-routing.service';
styleUrls: ['data-list-item.scss'],
templateUrl: 'data-list-item.html',
})
-export class DataListItem {
+export class DataListItemComponent {
/**
* Whether or not the list item should show a thumbnail
*/
diff --git a/src/app/modules/data/list/data-list-item.html b/src/app/modules/data/list/data-list-item.html
index 19ad4088..1dae60a2 100644
--- a/src/app/modules/data/list/data-list-item.html
+++ b/src/app/modules/data/list/data-list-item.html
@@ -1,36 +1,90 @@
-
-
-
-
+
+
+
-
+
diff --git a/src/app/modules/data/list/data-list.component.spec.ts b/src/app/modules/data/list/data-list.component.spec.ts
index 9f4ec078..db9f8b74 100644
--- a/src/app/modules/data/list/data-list.component.spec.ts
+++ b/src/app/modules/data/list/data-list.component.spec.ts
@@ -9,12 +9,9 @@ describe('DataListComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ DataListComponent ],
- imports: [
- TranslateModule.forRoot(),
- ]
- })
- .compileComponents();
+ declarations: [DataListComponent],
+ imports: [TranslateModule.forRoot()],
+ }).compileComponents();
}));
beforeEach(() => {
diff --git a/src/app/modules/data/list/data-list.component.ts b/src/app/modules/data/list/data-list.component.ts
index fdf3242a..9b7de7c5 100644
--- a/src/app/modules/data/list/data-list.component.ts
+++ b/src/app/modules/data/list/data-list.component.ts
@@ -19,6 +19,7 @@ import {
HostListener,
Input,
OnChanges,
+ OnDestroy,
OnInit,
Output,
SimpleChanges,
@@ -36,41 +37,48 @@ import {BehaviorSubject, Observable, Subscription} from 'rxjs';
templateUrl: 'data-list.html',
styleUrls: ['data-list.scss'],
})
-
-export class DataListComponent implements OnChanges, OnInit {
+export class DataListComponent implements OnChanges, OnInit, OnDestroy {
/**
* Amount of list items left to show (in percent) that should trigger a data reload
*/
private readonly reloadThreshold = 0.2;
+
/**
* All SCThings to display
*/
@Input() items?: SCThings[];
+
/**
* Stream of SCThings for virtual scroll to consume
*/
itemStream = new BehaviorSubject([]);
+
/**
* Output binding to trigger pagination fetch
*/
+ // eslint-disable-next-line @angular-eslint/no-output-rename
@Output('loadmore') loadMore = new EventEmitter();
+
/**
* Emits when scroll view should reset to top
*/
@Input() resetToTop?: Observable;
+
/**
* Indicates whether or not the list is to display SCThings of a single type
*/
@Input() singleType = false;
+
/**
* Items that display the skeleton list
*/
skeletonItems: number[];
+
/**
* Array of all subscriptions to Observables
*/
subscriptions: Subscription[] = [];
- // tslint:disable-next-line: completed-docs
+
@ViewChild(CdkVirtualScrollViewport) viewPort: CdkVirtualScrollViewport;
/**
@@ -79,38 +87,39 @@ export class DataListComponent implements OnChanges, OnInit {
@HostListener('window.resize', ['$event'])
calcSkeletonItems() {
const itemHeight = 122;
- this.skeletonItems = new Array(ceil(window.innerHeight / itemHeight));
+ this.skeletonItems = Array.from({
+ length: ceil(window.innerHeight / itemHeight),
+ });
}
/**
* Uniquely identifies item at a certain list index
*/
- // tslint:disable-next-line:prefer-function-over-method
+ // eslint-disable-next-line class-methods-use-this
identifyItem(_index: number, item: SCThings) {
return item.uid;
}
- // tslint:disable-next-line: completed-docs
ngOnChanges(changes: SimpleChanges): void {
if (Array.isArray(this.items) && typeof changes.items !== 'undefined') {
this.itemStream.next(this.items);
}
}
- // tslint:disable-next-line: completed-docs
ngOnDestroy(): void {
for (const subscription of this.subscriptions) {
subscription.unsubscribe();
}
}
- // tslint:disable-next-line: completed-docs
ngOnInit(): void {
this.calcSkeletonItems();
if (typeof this.resetToTop !== 'undefined') {
- this.subscriptions.push(this.resetToTop.subscribe(() => {
- this.viewPort.scrollToIndex(0);
- }));
+ this.subscriptions.push(
+ this.resetToTop.subscribe(() => {
+ this.viewPort.scrollToIndex(0);
+ }),
+ );
}
}
@@ -125,7 +134,10 @@ export class DataListComponent implements OnChanges, OnInit {
* Function to call whenever scroll view visible range changed
*/
scrolled(_index: number) {
- if ((this.items?.length ?? 0) - this.viewPort.getRenderedRange().end <= (this.items?.length ?? 0) * this.reloadThreshold) {
+ if (
+ (this.items?.length ?? 0) - this.viewPort.getRenderedRange().end <=
+ (this.items?.length ?? 0) * this.reloadThreshold
+ ) {
this.notifyLoadMore();
}
}
diff --git a/src/app/modules/data/list/data-list.html b/src/app/modules/data/list/data-list.html
index c949bee9..55510277 100644
--- a/src/app/modules/data/list/data-list.html
+++ b/src/app/modules/data/list/data-list.html
@@ -1,17 +1,27 @@
-
+
-
-
- {{item.type}}
+ {{ item.type }}
{{item.name}}
-{{ item.name }}
+
{{offer.prices[group] | currency:'EUR':'symbol':undefined:'de'}}
++ {{ + offer.prices[group] | currency: 'EUR':'symbol':undefined:'de' + }} +
-
diff --git a/src/app/modules/data/elements/origin-detail.html b/src/app/modules/data/elements/origin-detail.html
index 09d01f89..4c73e1e4 100644
--- a/src/app/modules/data/elements/origin-detail.html
+++ b/src/app/modules/data/elements/origin-detail.html
@@ -1,27 +1,61 @@
{{offers[0].prices.default | currency:'EUR':'symbol':undefined:'de'}}
++ {{ offers[0].prices.default | currency: 'EUR':'symbol':undefined:'de' }} +
-
{{'data.types.origin.detail.CREATED' | translate | titlecase}}: {{origin.created | amDateFormat:'ll'}}
-{{'data.types.origin.detail.UPDATED' | translate | titlecase}}: {{origin.updated | amDateFormat:'ll'}}
-{{'data.types.origin.detail.MODIFIED' | translate | titlecase}}: {{origin.modified | amDateFormat:'ll'}}
-{{'data.types.origin.detail.MAINTAINER' | translate }}: {{origin.name}}
++ {{ 'data.types.origin.detail.CREATED' | translate | titlecase }}: + {{ origin.created | amDateFormat: 'll' }} +
++ {{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}: + {{ origin.updated | amDateFormat: 'll' }} +
++ {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: + {{ origin.modified | amDateFormat: 'll' }} +
++ {{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }} +
- {{'data.types.origin.detail.MAINTAINER' | translate }}: {{origin.maintainer.name}} + {{ 'data.types.origin.detail.MAINTAINER' | translate }}: + {{ + origin.maintainer.name + }}
{{'data.types.origin.detail.INDEXED' | translate | titlecase}}: {{origin.indexed | amDateFormat:'ll'}}
-{{'data.types.origin.detail.MODIFIED' | translate | titlecase}}: {{origin.modified | amDateFormat:'ll'}}
-{{'data.types.origin.detail.MAINTAINER' | translate }}: {{origin.name}}
++ {{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}: + {{ origin.indexed | amDateFormat: 'll' }} +
++ {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: + {{ origin.modified | amDateFormat: 'll' }} +
++ {{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }} +
- {{'data.types.origin.detail.MAINTAINER' | translate | titlecase}}: {{origin.maintainer.name}} + {{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}: + {{ + origin.maintainer.name + }}
- {{'data.types.origin.detail.RESPONSIBLE' | translate | titlecase}}: {{origin.responsibleEntity.name}} + {{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}: + {{ + origin.responsibleEntity.name + }}
-
{{origin.created | amDateFormat:'ll'}}
+{{ origin.created | amDateFormat: 'll' }}
-
diff --git a/src/app/modules/data/elements/simple-card.component.ts b/src/app/modules/data/elements/simple-card.component.ts
index 7cbd3056..57084006 100644
--- a/src/app/modules/data/elements/simple-card.component.ts
+++ b/src/app/modules/data/elements/simple-card.component.ts
@@ -27,29 +27,34 @@ export class SimpleCardComponent {
* TODO
*/
areThings = false;
+
/**
* TODO
*/
@Input() content: string | string[] | SCThing[];
+
/**
* TODO
*/
@Input() isMarkdown = false;
+
/**
* TODO
*/
@Input() title: string;
+
/**
* TODO
*/
- // tslint:disable-next-line:prefer-function-over-method
+ // eslint-disable-next-line class-methods-use-this
isString(data: unknown): data is string {
return typeof data === 'string';
}
+
/**
* TODO
*/
- // tslint:disable-next-line:prefer-function-over-method
+ // eslint-disable-next-line class-methods-use-this
isThing(something: unknown): something is SCThing {
return isThing(something);
}
diff --git a/src/app/modules/data/elements/simple-card.html b/src/app/modules/data/elements/simple-card.html
index 06e01fa8..49889ff6 100644
--- a/src/app/modules/data/elements/simple-card.html
+++ b/src/app/modules/data/elements/simple-card.html
@@ -1,26 +1,29 @@
{{origin.indexed | amDateFormat:'ll'}}
+{{ origin.indexed | amDateFormat: 'll' }}
{{content}}
+{{ content }}
{{'name' | thingTranslate: thing}}
+ +{{ 'name' | thingTranslate: thing }}
{{text}}
+{{ text }}
-
+
-
-
- {{'name' | thingTranslate: item}} + {{ 'name' | thingTranslate: item }}
-
-
+
-
- {{'search.nothing_found' | translate | titlecase}}
+
-
+
diff --git a/src/app/modules/data/list/food-data-list.component.ts b/src/app/modules/data/list/food-data-list.component.ts
index 27cc3139..7b07dd94 100644
--- a/src/app/modules/data/list/food-data-list.component.ts
+++ b/src/app/modules/data/list/food-data-list.component.ts
@@ -37,11 +37,11 @@ export class FoodDataListComponent extends SearchPageComponent {
type: 'value',
},
{
- arguments: {
- field: 'categories',
- value: 'student canteen',
- },
- type: 'value',
+ arguments: {
+ field: 'categories',
+ value: 'student canteen',
+ },
+ type: 'value',
},
{
arguments: {
diff --git a/src/app/modules/data/list/search-page.component.ts b/src/app/modules/data/list/search-page.component.ts
index a43d3ff6..100bf20b 100644
--- a/src/app/modules/data/list/search-page.component.ts
+++ b/src/app/modules/data/list/search-page.component.ts
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with
* this program. If not, see ;
+
/**
* Page size of queries
*/
pageSize = 30;
+
/**
* Search value from search bar
*/
queryText: string;
+
/**
* Emits when there is a change in the query (search, sort or filter changed)
*/
queryChanged = new Subject();
+
/**
* Subject to handle search text changes
*/
queryTextChanged = new Subject();
+
/**
* Time to wait for search query if search text is changing
*/
searchQueryDueTime = 1000;
+
/**
* Search response only ever contains a single SCThingType
*/
singleTypeResponse = false;
+
/**
* Api query sorting
*/
sortQuery: SCSearchSort | undefined;
+
/**
* Array of all subscriptions to Observables
*/
@@ -110,21 +121,23 @@ export class SearchPageComponent implements OnInit {
) {
this.initialize();
- combineLatest(
- [this.queryTextChanged.pipe(debounceTime(this.searchQueryDueTime),
+ combineLatest([
+ this.queryTextChanged.pipe(
+ debounceTime(this.searchQueryDueTime),
distinctUntilChanged(),
startWith(this.queryText),
),
- this.contextMenuService.filterQueryChanged$.pipe(startWith(this.filterQuery)),
+ this.contextMenuService.filterQueryChanged$.pipe(
+ startWith(this.filterQuery),
+ ),
this.contextMenuService.sortQueryChanged$.pipe(startWith(this.sortQuery)),
- ])
- .subscribe(async (query) => {
- this.queryText = query[0];
- this.filterQuery = query[1];
- this.sortQuery = query[2];
- this.from = 0;
- await this.fetchAndUpdateItems();
- this.queryChanged.next();
+ ]).subscribe(async query => {
+ this.queryText = query[0];
+ this.filterQuery = query[1];
+ this.sortQuery = query[2];
+ this.from = 0;
+ await this.fetchAndUpdateItems();
+ this.queryChanged.next();
});
this.fetchAndUpdateItems();
@@ -132,19 +145,21 @@ export class SearchPageComponent implements OnInit {
/**
* Subscribe to 'settings.changed' events
*/
- this.subscriptions.push(this.settingsProvider.settingsActionChanged$.subscribe(({type, payload}) => {
- if (type === 'stapps.settings.changed') {
- const {category, name, value} = payload!;
- this.logger.log(`received event "settings.changed" with category:
+ this.subscriptions.push(
+ this.settingsProvider.settingsActionChanged$.subscribe(
+ ({type, payload}) => {
+ if (type === 'stapps.settings.changed') {
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+ const {category, name, value} = payload!;
+ this.logger.log(`received event "settings.changed" with category:
${category}, name: ${name}, value: ${JSON.stringify(value)}`);
- }
- },
- ));
-
- this.subscriptions.push(this.dataRoutingService.itemSelectListener()
- .subscribe((item) => {
+ }
+ },
+ ),
+ this.dataRoutingService.itemSelectListener().subscribe(item => {
void this.router.navigate(['data-detail', item.uid]);
- }));
+ }),
+ );
}
/**
@@ -185,13 +200,15 @@ export class SearchPageComponent implements OnInit {
};
}
- return this.dataProvider.search(searchOptions)
- .then(async (result) => {
- this.singleTypeResponse = result.facets.find(facet => facet.field === 'type')?.buckets.length === 1;
+ return this.dataProvider.search(searchOptions).then(
+ async result => {
+ this.singleTypeResponse =
+ result.facets.find(facet => facet.field === 'type')?.buckets
+ .length === 1;
if (append) {
let items = await this.items;
// append results
- items = items.concat(result.data);
+ items = [...items, ...result.data];
this.items = (async () => items)();
} else {
// override items with results
@@ -201,21 +218,23 @@ export class SearchPageComponent implements OnInit {
return result.data;
})();
}
- }, async (err) => {
+ },
+ async error => {
const alert: HTMLIonAlertElement = await this.alertController.create({
buttons: ['Dismiss'],
header: 'Error',
- subHeader: err.message,
+ subHeader: error.message,
});
await alert.present();
- });
+ },
+ );
}
/**
* Set starting values (e.g. forced filter, which can be set in components inheriting this one)
*/
- // tslint:disable-next-line:prefer-function-over-method
+ // eslint-disable-next-line class-methods-use-this
initialize() {
// nothing to do here
}
@@ -223,7 +242,7 @@ export class SearchPageComponent implements OnInit {
/**
* Loads next page of things
*/
- // tslint:disable-next-line:no-any
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
async loadMore(): Promise {
this.from += this.pageSize;
await this.fetchAndUpdateItems(true);
diff --git a/src/app/modules/data/list/search-page.html b/src/app/modules/data/list/search-page.html
index e82978ea..d83c8653 100644
--- a/src/app/modules/data/list/search-page.html
+++ b/src/app/modules/data/list/search-page.html
@@ -10,10 +10,19 @@
-
diff --git a/src/app/modules/data/stapps-web-http-client.provider.ts b/src/app/modules/data/stapps-web-http-client.provider.ts
index 932f52b2..14907733 100644
--- a/src/app/modules/data/stapps-web-http-client.provider.ts
+++ b/src/app/modules/data/stapps-web-http-client.provider.ts
@@ -14,7 +14,10 @@
*/
import {HttpClient, HttpResponse} from '@angular/common/http';
import {Injectable} from '@angular/core';
-import {HttpClientInterface, HttpClientRequest} from '@openstapps/api/lib/http-client-interface';
+import {
+ HttpClientInterface,
+ HttpClientRequest,
+} from '@openstapps/api/lib/http-client-interface';
/**
* HttpClient that is based on the Angular HttpClient (@TODO: move it to provider or independent package)
@@ -25,11 +28,11 @@ export class StAppsWebHttpClient implements HttpClientInterface {
*
* @param http TODO
*/
- constructor(private readonly http: HttpClient) {
- }
+ constructor(private readonly http: HttpClient) {}
/**
* Make a request
+ *
* @param requestConfig Configuration of the request
*/
async request(
@@ -59,14 +62,21 @@ export class StAppsWebHttpClient implements HttpClientInterface {
}
try {
- const response: HttpResponse = await this.http.request(
- requestConfig.method || 'GET', requestConfig.url.toString(), options)
+ const response: HttpResponse = await this.http
+ .request(
+ requestConfig.method || 'GET',
+ requestConfig.url.toString(),
+ options,
+ )
.toPromise();
- // tslint:disable-next-line:prefer-object-spread
- return Object.assign(response, {statusCode: response.status, body: response.body || {}});
- } catch (err) {
- throw Error(err);
+ // eslint-disable-next-line prefer-object-spread
+ return Object.assign(response, {
+ statusCode: response.status,
+ body: response.body || {},
+ });
+ } catch (error) {
+ throw new Error(error);
}
}
}
diff --git a/src/app/modules/data/types/article/article-detail-content.html b/src/app/modules/data/types/article/article-detail-content.html
index a3a14308..a8284829 100644
--- a/src/app/modules/data/types/article/article-detail-content.html
+++ b/src/app/modules/data/types/article/article-detail-content.html
@@ -1,6 +1,16 @@
-
+
-
+
diff --git a/src/app/modules/data/types/article/article-list-item.component.ts b/src/app/modules/data/types/article/article-list-item.component.ts
index 20f2629a..96474731 100644
--- a/src/app/modules/data/types/article/article-list-item.component.ts
+++ b/src/app/modules/data/types/article/article-list-item.component.ts
@@ -14,7 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCArticle} from '@openstapps/core';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -23,18 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-article-list-item',
templateUrl: 'article-list-item.html',
})
-
-export class ArticleListItem extends DataListItem {
+export class ArticleListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCArticle;
-
- /**
- * TODO
- */
- // tslint:disable-next-line:prefer-function-over-method
- ngOnInit() {
- // TODO: translation
- }
}
diff --git a/src/app/modules/data/types/article/article-list-item.html b/src/app/modules/data/types/article/article-list-item.html
index 4b9ec7bb..180d8694 100644
--- a/src/app/modules/data/types/article/article-list-item.html
+++ b/src/app/modules/data/types/article/article-list-item.html
@@ -1,12 +1,15 @@
-
- {{'type' | thingTranslate: item}}
+ {{ 'type' | thingTranslate: item }}
diff --git a/src/app/modules/data/types/catalog/catalog-detail-content.html b/src/app/modules/data/types/catalog/catalog-detail-content.html
index ce0708a5..4d96e06b 100644
--- a/src/app/modules/data/types/catalog/catalog-detail-content.html
+++ b/src/app/modules/data/types/catalog/catalog-detail-content.html
@@ -1,2 +1,5 @@
-
+
diff --git a/src/app/modules/data/types/catalog/catalog-list-item.component.ts b/src/app/modules/data/types/catalog/catalog-list-item.component.ts
index 90dc552a..1c132666 100644
--- a/src/app/modules/data/types/catalog/catalog-list-item.component.ts
+++ b/src/app/modules/data/types/catalog/catalog-list-item.component.ts
@@ -14,7 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCCatalog} from '@openstapps/core';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -23,18 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-catalog-list-item',
templateUrl: 'catalog-list-item.html',
})
-
-export class CatalogListItem extends DataListItem {
+export class CatalogListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCCatalog;
-
- /**
- * TODO
- */
- // tslint:disable-next-line:prefer-function-over-method
- ngOnInit() {
- // TODO: translation
- }
}
diff --git a/src/app/modules/data/types/catalog/catalog-list-item.html b/src/app/modules/data/types/catalog/catalog-list-item.html
index 80bd340a..299ba58b 100644
--- a/src/app/modules/data/types/catalog/catalog-list-item.html
+++ b/src/app/modules/data/types/catalog/catalog-list-item.html
@@ -2,11 +2,14 @@
diff --git a/src/app/modules/data/types/date-series/date-series-detail-content.html b/src/app/modules/data/types/date-series/date-series-detail-content.html
index 9238af14..68025af5 100644
--- a/src/app/modules/data/types/date-series/date-series-detail-content.html
+++ b/src/app/modules/data/types/date-series/date-series-detail-content.html
@@ -1,12 +1,28 @@
- {{'inPlace' | propertyNameTranslate: item | titlecase}}
+ {{ 'inPlace' | propertyNameTranslate: item | titlecase }}
-
-
-
diff --git a/src/app/modules/data/types/dish/dish-detail-content.html b/src/app/modules/data/types/dish/dish-detail-content.html
index c7c5487d..ecf057fb 100644
--- a/src/app/modules/data/types/dish/dish-detail-content.html
+++ b/src/app/modules/data/types/dish/dish-detail-content.html
@@ -1,51 +1,79 @@
-
+
- {{ 'characteristics' | propertyNameTranslate: item | titlecase }}
-
+ {{
+ 'characteristics' | propertyNameTranslate: item | titlecase
+ }}
+
-
+
- {{'data.types.dish.detail.AVG_NUTRITION_INFO' | translate }}
+ {{
+ 'data.types.dish.detail.AVG_NUTRITION_INFO' | translate
+ }}
- {{'data.types.dish.detail.CALORIES' | translate }}:
+ {{ 'data.types.dish.detail.CALORIES' | translate }}:
- {{item.nutrition.calories | numberLocalized}} kcal
+ {{ item.nutrition.calories | numberLocalized }} kcal
- {{'data.types.dish.detail.FAT_TOTAL' | translate }}:
+ {{ 'data.types.dish.detail.FAT_TOTAL' | translate }}:
- {{item.nutrition.fatContent | numberLocalized}} g ({{'data.types.dish.detail.FAT_SATURATED' | translate }}:
- {{item.nutrition.saturatedFatContent | numberLocalized}} g)
+ {{ item.nutrition.fatContent | numberLocalized }} g
+ ({{ 'data.types.dish.detail.FAT_SATURATED' | translate }}:
+ {{ item.nutrition.saturatedFatContent | numberLocalized }} g)
- {{'data.types.dish.detail.CARBOHYDRATE' | translate }}:
+ {{ 'data.types.dish.detail.CARBOHYDRATE' | translate }}:
- {{item.nutrition.carbohydrateContent | numberLocalized}} g ({{'data.types.dish.detail.SUGAR' | translate }}:
- {{item.nutrition.sugarContent | numberLocalized}} g)
+ {{ item.nutrition.carbohydrateContent | numberLocalized }} g
+ ({{ 'data.types.dish.detail.SUGAR' | translate }}:
+ {{ item.nutrition.sugarContent | numberLocalized }} g)
- {{'data.types.dish.detail.SALT' | translate }}:
+ {{ 'data.types.dish.detail.SALT' | translate }}:
- {{item.nutrition.saltContent | numberLocalized}} g
+ {{ item.nutrition.saltContent | numberLocalized }} g
- {{'data.types.dish.detail.PROTEIN' | translate }}:
+ {{ 'data.types.dish.detail.PROTEIN' | translate }}:
- {{item.nutrition.proteinContent | numberLocalized}} g
+ {{ item.nutrition.proteinContent | numberLocalized }} g
diff --git a/src/app/modules/data/types/dish/dish-list-item.component.ts b/src/app/modules/data/types/dish/dish-list-item.component.ts
index 01933847..dd7650e4 100644
--- a/src/app/modules/data/types/dish/dish-list-item.component.ts
+++ b/src/app/modules/data/types/dish/dish-list-item.component.ts
@@ -14,8 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCDish} from '@openstapps/core';
-// import {SettingsProvider} from '../../../settings/settings.provider';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -24,15 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-dish-list-item',
templateUrl: 'dish-list-item.html',
})
-
-export class DishListItem extends DataListItem {
+export class DishListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCDish;
-
- // tslint:disable-next-line: completed-docs prefer-function-over-method
- ngOnInit() {
- // custom init
- }
}
diff --git a/src/app/modules/data/types/dish/dish-list-item.html b/src/app/modules/data/types/dish/dish-list-item.html
index e836f056..32512ed3 100644
--- a/src/app/modules/data/types/dish/dish-list-item.html
+++ b/src/app/modules/data/types/dish/dish-list-item.html
@@ -2,14 +2,17 @@
diff --git a/src/app/modules/data/types/event/event-detail-content.component.ts b/src/app/modules/data/types/event/event-detail-content.component.ts
index b6c3c012..ac6c1243 100644
--- a/src/app/modules/data/types/event/event-detail-content.component.ts
+++ b/src/app/modules/data/types/event/event-detail-content.component.ts
@@ -13,7 +13,12 @@
* this program. If not, see ;
+
/**
* TODO
*/
objectKeys = Object.keys;
+
/**
* TODO
*/
translator: SCThingTranslator;
+
/**
* TODO
*/
diff --git a/src/app/modules/data/types/event/event-detail-content.html b/src/app/modules/data/types/event/event-detail-content.html
index 99fe4972..a1234846 100644
--- a/src/app/modules/data/types/event/event-detail-content.html
+++ b/src/app/modules/data/types/event/event-detail-content.html
@@ -1,14 +1,46 @@
-
+
-
-
diff --git a/src/app/modules/data/types/event/event-list-item.component.ts b/src/app/modules/data/types/event/event-list-item.component.ts
index d301402b..77b7a8aa 100644
--- a/src/app/modules/data/types/event/event-list-item.component.ts
+++ b/src/app/modules/data/types/event/event-list-item.component.ts
@@ -14,7 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCAcademicEvent, SCSportCourse} from '@openstapps/core';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -23,17 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-event-list-item',
templateUrl: 'event-list-item.html',
})
-export class EventListItemComponent extends DataListItem {
+export class EventListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCAcademicEvent | SCSportCourse;
-
- /**
- * TODO
- */
- // tslint:disable-next-line:prefer-function-over-method
- ngOnInit() {
- // TODO: translation
- }
}
diff --git a/src/app/modules/data/types/event/event-list-item.html b/src/app/modules/data/types/event/event-list-item.html
index d2005f52..30b02e82 100644
--- a/src/app/modules/data/types/event/event-list-item.html
+++ b/src/app/modules/data/types/event/event-list-item.html
@@ -2,19 +2,19 @@
- {{item.type}}
+ {{ item.type }}
diff --git a/src/app/modules/data/types/favorite/favorite-list-item.component.ts b/src/app/modules/data/types/favorite/favorite-list-item.component.ts
index 923d047b..defae2bc 100644
--- a/src/app/modules/data/types/favorite/favorite-list-item.component.ts
+++ b/src/app/modules/data/types/favorite/favorite-list-item.component.ts
@@ -14,7 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCFavorite} from '@openstapps/core';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -23,18 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-favorite-list-item',
templateUrl: 'favorite-list-item.html',
})
-
-export class FavoriteListItem extends DataListItem {
+export class FavoriteListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCFavorite;
-
- /**
- * TODO
- */
- // tslint:disable-next-line:prefer-function-over-method
- ngOnInit() {
- // TODO: translation
- }
}
diff --git a/src/app/modules/data/types/favorite/favorite-list-item.html b/src/app/modules/data/types/favorite/favorite-list-item.html
index 389f0640..9e4f76bb 100644
--- a/src/app/modules/data/types/favorite/favorite-list-item.html
+++ b/src/app/modules/data/types/favorite/favorite-list-item.html
@@ -2,11 +2,21 @@
diff --git a/src/app/modules/data/types/message/message-detail-content.html b/src/app/modules/data/types/message/message-detail-content.html
index cc2cb40f..aff45627 100644
--- a/src/app/modules/data/types/message/message-detail-content.html
+++ b/src/app/modules/data/types/message/message-detail-content.html
@@ -1,5 +1,23 @@
-
diff --git a/src/app/modules/data/types/organization/organization-detail-content.html b/src/app/modules/data/types/organization/organization-detail-content.html
index 0ab5e40d..0f8609c9 100644
--- a/src/app/modules/data/types/organization/organization-detail-content.html
+++ b/src/app/modules/data/types/organization/organization-detail-content.html
@@ -1,9 +1,15 @@
- {{'inPlace' | propertyNameTranslate: item | titlecase}}
+ {{ 'inPlace' | propertyNameTranslate: item | titlecase }}
-
diff --git a/src/app/modules/data/types/organization/organization-list-item.component.ts b/src/app/modules/data/types/organization/organization-list-item.component.ts
index 7753c234..fdb35156 100644
--- a/src/app/modules/data/types/organization/organization-list-item.component.ts
+++ b/src/app/modules/data/types/organization/organization-list-item.component.ts
@@ -14,7 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCOrganization} from '@openstapps/core';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -23,18 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-organization-list-item',
templateUrl: 'organization-list-item.html',
})
-
-export class OrganizationListItem extends DataListItem {
+export class OrganizationListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCOrganization;
-
- /**
- * TODO
- */
- // tslint:disable-next-line:prefer-function-over-method
- ngOnInit() {
- // TODO: translation
- }
}
diff --git a/src/app/modules/data/types/organization/organization-list-item.html b/src/app/modules/data/types/organization/organization-list-item.html
index eb52e942..3d93f4be 100644
--- a/src/app/modules/data/types/organization/organization-list-item.html
+++ b/src/app/modules/data/types/organization/organization-list-item.html
@@ -2,14 +2,17 @@
-
diff --git a/src/app/modules/data/types/person/person-detail-content.html b/src/app/modules/data/types/person/person-detail-content.html
index 424a2710..ecf5cc16 100644
--- a/src/app/modules/data/types/person/person-detail-content.html
+++ b/src/app/modules/data/types/person/person-detail-content.html
@@ -1,33 +1,88 @@
- {{'type' | thingTranslate: item.workLocations[0] | titlecase}}
+ {{ 'type' | thingTranslate: item.workLocations[0] | titlecase }}
-
-
+
-
-
diff --git a/src/app/modules/data/types/place/place-detail-content.component.ts b/src/app/modules/data/types/place/place-detail-content.component.ts
index 78e58aac..9eb993d2 100644
--- a/src/app/modules/data/types/place/place-detail-content.component.ts
+++ b/src/app/modules/data/types/place/place-detail-content.component.ts
@@ -13,14 +13,20 @@
* this program. If not, see
-
-
+
- {{'inPlace' | propertyNameTranslate: item | titlecase}}
+ {{ 'inPlace' | propertyNameTranslate: item | titlecase }}
-
-
diff --git a/src/app/modules/data/types/place/place-list-item.component.ts b/src/app/modules/data/types/place/place-list-item.component.ts
index 813c0d1e..1ad87fca 100644
--- a/src/app/modules/data/types/place/place-list-item.component.ts
+++ b/src/app/modules/data/types/place/place-list-item.component.ts
@@ -14,7 +14,7 @@
*/
import {Component, Input} from '@angular/core';
import {SCBuilding, SCFloor, SCPointOfInterest, SCRoom} from '@openstapps/core';
-import {DataListItem} from '../../list/data-list-item.component';
+import {DataListItemComponent} from '../../list/data-list-item.component';
/**
* TODO
@@ -23,18 +23,9 @@ import {DataListItem} from '../../list/data-list-item.component';
selector: 'stapps-place-list-item',
templateUrl: 'place-list-item.html',
})
-
-export class PlaceListItem extends DataListItem {
+export class PlaceListItemComponent extends DataListItemComponent {
/**
* TODO
*/
@Input() item: SCBuilding | SCRoom | SCPointOfInterest | SCFloor;
-
- /**
- * TODO
- */
- // tslint:disable-next-line:prefer-function-over-method
- ngOnInit() {
- // TODO: translation
- }
}
diff --git a/src/app/modules/data/types/place/place-list-item.html b/src/app/modules/data/types/place/place-list-item.html
index f7d6730d..17c91308 100644
--- a/src/app/modules/data/types/place/place-list-item.html
+++ b/src/app/modules/data/types/place/place-list-item.html
@@ -2,14 +2,17 @@
-
diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts b/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts
index fe6f42ac..241dbf0f 100644
--- a/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts
+++ b/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts
@@ -29,10 +29,10 @@ import {PlaceMensaService} from './place-mensa-service';
templateUrl: 'place-mensa.html',
})
export class PlaceMensaDetailComponent implements AfterViewInit {
-
/**
* Map of dishes for each day
*/
+ // eslint-disable-next-line unicorn/no-null
dishes: Promise> | null = null;
/**
@@ -67,6 +67,6 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
*/
ngAfterViewInit() {
this.dishes = this.mensaService.getAllDishes(this.item, this.displayRange);
- this.dishes.then((result) => this.selectedDay = keys(result)[0]);
+ this.dishes.then(result => (this.selectedDay = keys(result)[0]));
}
}
diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts b/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts
index e12440b9..552d0272 100644
--- a/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts
+++ b/src/app/modules/data/types/place/special/mensa/place-mensa-service.ts
@@ -14,7 +14,13 @@
*/
import {Injectable} from '@angular/core';
-import {SCDish, SCISO8601Date, SCMultiSearchRequest, SCPlace, SCThingType} from '@openstapps/core';
+import {
+ SCDish,
+ SCISO8601Date,
+ SCMultiSearchRequest,
+ SCPlace,
+ SCThingType,
+} from '@openstapps/core';
import {keyBy, mapValues, range} from 'lodash-es';
import moment from 'moment';
import {DataProvider} from '../../../../data.provider';
@@ -26,21 +32,20 @@ import {DataProvider} from '../../../../data.provider';
providedIn: 'root',
})
export class PlaceMensaService {
- constructor(private dataProvider: DataProvider) {
- }
+ constructor(private dataProvider: DataProvider) {}
/**
* Fetches all dishes for this building
*
* Splits dishes as such that each list contains all dishes that are available at that day.
*/
- async getAllDishes(place: SCPlace, days: number): Promise> {
+ async getAllDishes(
+ place: SCPlace,
+ days: number,
+ ): Promise> {
const request: SCMultiSearchRequest = mapValues(
- keyBy(range(days)
- .map((i) => moment()
- .add(i, 'days')
- .toISOString()),
- ), (date: SCISO8601Date) => ({
+ keyBy(range(days).map(i => moment().add(i, 'days').toISOString())),
+ (date: SCISO8601Date) => ({
filter: {
arguments: {
filters: [
@@ -72,8 +77,12 @@ export class PlaceMensaService {
type: 'boolean',
},
size: 1000,
- }));
+ }),
+ );
- return mapValues(await this.dataProvider.multiSearch(request), 'data') as Record;
+ return mapValues(
+ await this.dataProvider.multiSearch(request),
+ 'data',
+ ) as Record;
}
}
diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa.html b/src/app/modules/data/types/place/special/mensa/place-mensa.html
index e2eec16d..01f3e9c1 100644
--- a/src/app/modules/data/types/place/special/mensa/place-mensa.html
+++ b/src/app/modules/data/types/place/special/mensa/place-mensa.html
@@ -1,24 +1,34 @@
-
- {{date.key | amDateFormat:'dddd, L'}}
+
+ {{ date.key | amDateFormat: 'dddd, L' }}
-
-
-
diff --git a/src/app/modules/data/types/semester/semester-detail-content.html b/src/app/modules/data/types/semester/semester-detail-content.html
index 4fdc5ed8..9b7af549 100644
--- a/src/app/modules/data/types/semester/semester-detail-content.html
+++ b/src/app/modules/data/types/semester/semester-detail-content.html
@@ -1,3 +1,13 @@
-
diff --git a/src/app/modules/data/types/video/video-detail-content.html b/src/app/modules/data/types/video/video-detail-content.html
index 1e19edc4..1255dab8 100644
--- a/src/app/modules/data/types/video/video-detail-content.html
+++ b/src/app/modules/data/types/video/video-detail-content.html
@@ -1,6 +1,20 @@
-
+
-
diff --git a/src/app/modules/menu/context/context-menu.component.spec.ts b/src/app/modules/menu/context/context-menu.component.spec.ts
index b4a102ff..5b2ee714 100644
--- a/src/app/modules/menu/context/context-menu.component.spec.ts
+++ b/src/app/modules/menu/context/context-menu.component.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/ban-ts-comment */
/*
* Copyright (C) 2020 StApps
* This program is free software: you can redistribute it and/or modify it
@@ -12,16 +13,26 @@
* You should have received a copy of the GNU General Public License along with
* this program. If not, see ;
+ constructor(
+ private translateService: TranslateService,
+ private readonly contextMenuService: ContextMenuService,
+ ) {
+ this.language = this.translateService
+ .currentLang as keyof SCTranslations;
this.translator = new SCThingTranslator(this.language);
- this.subscriptions.push(this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
- this.language = event.lang as keyof SCTranslations;
- this.translator = new SCThingTranslator(this.language);
- }));
-
- this.subscriptions.push(this.contextMenuService.filterContextChanged$.subscribe((filterContext) => {
- this.filterOption = filterContext;
- }));
-
- this.subscriptions.push(this.contextMenuService.sortOptions.subscribe((sortContext) => {
- this.sortOption = sortContext;
- }));
+ this.subscriptions.push(
+ this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
+ this.language = event.lang as keyof SCTranslations;
+ this.translator = new SCThingTranslator(this.language);
+ }),
+ this.contextMenuService.filterContextChanged$.subscribe(filterContext => {
+ this.filterOption = filterContext;
+ }),
+ this.contextMenuService.sortOptions.subscribe(sortContext => {
+ this.sortOption = sortContext;
+ }),
+ );
}
/**
@@ -99,21 +100,31 @@ export class ContextMenuComponent {
*/
filterChanged = () => {
this.contextMenuService.contextFilterChanged(this.filterOption);
- }
+ };
/**
* Returns translated property name
*/
- getTranslatedPropertyName(property: string, onlyForType?: SCThingType): string {
- return (this.translator
- // tslint:disable-next-line:no-any
- .translatedPropertyNames(onlyForType ?? SCThingType.AcademicEvent) as any)[property];
+ getTranslatedPropertyName(
+ property: string,
+ onlyForType?: SCThingType,
+ ): string {
+ return (
+ this.translator.translatedPropertyNames(
+ onlyForType ?? SCThingType.AcademicEvent,
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ ) as any
+ )[property];
}
/**
* Returns translated property value
*/
- getTranslatedPropertyValue(onlyForType: SCThingType, field: string, key?: string): string | undefined {
+ getTranslatedPropertyValue(
+ onlyForType: SCThingType,
+ field: string,
+ key?: string,
+ ): string | undefined {
return this.translator.translatedPropertyValue(onlyForType, field, key);
}
@@ -130,11 +141,13 @@ export class ContextMenuComponent {
* Resets filter options
*/
resetFilter = (option: FilterContext) => {
- option.options.forEach((filterFacet) => filterFacet.buckets.forEach((filterBucket) => {
- filterBucket.checked = false;
- }));
+ for (const filterFacet of option.options)
+ for (const filterBucket of filterFacet.buckets) {
+ filterBucket.checked = false;
+ }
+
this.contextMenuService.contextFilterChanged(this.filterOption);
- }
+ };
/**
* Updates selected sort option and updates listener
@@ -151,5 +164,5 @@ export class ContextMenuComponent {
}
}
this.contextMenuService.contextSortChanged(option);
- }
+ };
}
diff --git a/src/app/modules/menu/context/context-menu.html b/src/app/modules/menu/context/context-menu.html
index 99cc52a2..c01545bf 100644
--- a/src/app/modules/menu/context/context-menu.html
+++ b/src/app/modules/menu/context/context-menu.html
@@ -1,28 +1,38 @@
-
-
+
{{'menu.context.sort.title' | translate | titlecase}}
+ {{
+ 'menu.context.sort.title' | translate | titlecase
+ }}
-
- {{'menu.context.sort.' + value.value | translate | titlecase}}
+
+ {{ 'menu.context.sort.' + value.value | translate | titlecase }}
-
-
-
+
@@ -30,48 +40,99 @@
{{'menu.context.filter.title' | translate | titlecase}}
-
+ {{
+ 'menu.context.filter.title' | translate | titlecase
+ }}
+
-
- ();
/**
* Observable filterContext streams
*/
- // tslint:disable-next-line:member-ordering
+ // eslint-disable-next-line @typescript-eslint/member-ordering
filterContextChanged$ = this.filterOptions.asObservable();
/**
@@ -48,19 +52,19 @@ export class ContextMenuService {
/**
* Observable filterContext streams
*/
- // tslint:disable-next-line:member-ordering
+ // eslint-disable-next-line @typescript-eslint/member-ordering
filterQueryChanged$ = this.filterQuery.asObservable();
/**
* Container for the sort context
*/
- // tslint:disable-next-line:member-ordering
+ // eslint-disable-next-line @typescript-eslint/member-ordering
sortOptions = new Subject();
/**
* Observable SortContext streams
*/
- // tslint:disable-next-line:member-ordering
+ // eslint-disable-next-line @typescript-eslint/member-ordering
sortContextChanged$ = this.sortOptions.asObservable();
/**
@@ -71,30 +75,32 @@ export class ContextMenuService {
/**
* Observable SortContext streams
*/
- // tslint:disable-next-line:member-ordering
+ // eslint-disable-next-line @typescript-eslint/member-ordering
sortQueryChanged$ = this.sortQuery.asObservable();
/**
* Returns SCSearchFilter if filterContext value is set, undefined otherwise
+ *
* @param filterContext FilterContext to build SCSearchFilter from
*/
- buildFilterQuery = (filterContext: FilterContext): SCSearchFilter | undefined => {
+ buildFilterQuery = (
+ filterContext: FilterContext,
+ ): SCSearchFilter | undefined => {
const filters: SCSearchFilter[] = [];
- filterContext.options.forEach((filterFacet) => {
+ for (const filterFacet of filterContext.options) {
const optionFilters: SCSearchFilter[] = [];
- filterFacet.buckets.forEach((filterBucket) => {
+ for (const filterBucket of filterFacet.buckets) {
if (filterBucket.checked) {
- optionFilters.push(
- {
- arguments: {
- field: filterFacet.field,
- value: filterBucket.key,
- },
- type: 'value',
- });
+ optionFilters.push({
+ arguments: {
+ field: filterFacet.field,
+ value: filterBucket.key,
+ },
+ type: 'value',
+ });
}
- });
+ }
if (optionFilters.length > 0) {
filters.push({
arguments: {
@@ -104,7 +110,7 @@ export class ContextMenuService {
type: 'boolean',
});
}
- });
+ }
if (filters.length > 0) {
return {
@@ -117,28 +123,31 @@ export class ContextMenuService {
}
return;
- }
+ };
/**
* Returns SCSearchSort if sorting value is set, undefined otherwise
+ *
* @param sortContext SortContext to build SCSearchSort from
*/
buildSortQuery = (sortContext: SortContext): SCSearchSort | undefined => {
- if (sortContext.value && sortContext.value.length > 0) {
- if (sortContext.value === 'name' || sortContext.value === 'type') {
- return {
- arguments: {
- field: sortContext.value,
- position: 0,
- },
- order: sortContext.reversed ? 'desc' : 'asc',
- type: 'ducet',
- };
- }
+ if (
+ sortContext.value &&
+ sortContext.value.length > 0 &&
+ (sortContext.value === 'name' || sortContext.value === 'type')
+ ) {
+ return {
+ arguments: {
+ field: sortContext.value,
+ position: 0,
+ },
+ order: sortContext.reversed ? 'desc' : 'asc',
+ type: 'ducet',
+ };
}
return;
- }
+ };
/**
* Updates filter query from filterContext
@@ -192,7 +201,10 @@ export class ContextMenuService {
* Updates context filter with new facets.
* It preserves the checked status of existing filter options
*/
- updateContextFilterOptions = (contextFilter: FilterContext, facets: SCFacet[]) => {
+ updateContextFilterOptions = (
+ contextFilter: FilterContext,
+ facets: SCFacet[],
+ ) => {
const newFilterOptions: FilterFacet[] = [];
// iterate new facets
@@ -206,19 +218,28 @@ export class ContextMenuService {
newFilterOptions.push(newFilterFacet);
// search existing filterOption
- const filterOption = contextFilter.options.find((contextFacet: FilterFacet) =>
- contextFacet.field === facet.field && contextFacet.onlyOnType === facet.onlyOnType);
- facet.buckets.forEach((bucket: SCFacetBucket) => {
+ const filterOption = contextFilter.options.find(
+ (contextFacet: FilterFacet) =>
+ contextFacet.field === facet.field &&
+ contextFacet.onlyOnType === facet.onlyOnType,
+ );
+ for (const bucket of facet.buckets) {
// search existing bucket to preserve checked status
- const existingFilterBucket = filterOption ? filterOption.buckets
- .find((contextBucket: FilterBucket) => contextBucket.key === bucket.key) : undefined;
+ const existingFilterBucket = filterOption
+ ? filterOption.buckets.find(
+ (contextBucket: FilterBucket) =>
+ contextBucket.key === bucket.key,
+ )
+ : undefined;
const filterBucket: FilterBucket = {
- checked: existingFilterBucket ? existingFilterBucket.checked : false,
+ checked: existingFilterBucket
+ ? existingFilterBucket.checked
+ : false,
count: bucket.count,
key: bucket.key,
};
newFilterFacet.buckets.push(filterBucket);
- });
+ }
}
}
@@ -227,5 +248,5 @@ export class ContextMenuService {
this.contextFilter = contextFilter;
this.filterOptions.next(contextFilter);
- }
+ };
}
diff --git a/src/app/modules/menu/context/context-type.ts b/src/app/modules/menu/context/context-type.ts
index 2abe8021..9acfbcf2 100644
--- a/src/app/modules/menu/context/context-type.ts
+++ b/src/app/modules/menu/context/context-type.ts
@@ -14,8 +14,6 @@
*/
import {SCFacet, SCFacetBucket} from '@openstapps/core';
-export type ContextType = FilterContext | SortContext;
-
/**
* A sort context
*/
diff --git a/src/app/modules/menu/menu.module.ts b/src/app/modules/menu/menu.module.ts
index 1d7ebbea..1118c4f9 100644
--- a/src/app/modules/menu/menu.module.ts
+++ b/src/app/modules/menu/menu.module.ts
@@ -27,24 +27,16 @@ import {NavigationComponent} from './navigation/navigation.component';
* Menu module
*/
@NgModule({
- declarations: [
- NavigationComponent,
- ContextMenuComponent,
- ],
- exports: [
- NavigationComponent,
- ContextMenuComponent,
- ],
+ declarations: [NavigationComponent, ContextMenuComponent],
+ exports: [NavigationComponent, ContextMenuComponent],
imports: [
+ CommonModule,
FormsModule,
IonicModule.forRoot(),
- TranslateModule.forChild(),
- CommonModule,
RouterModule,
SettingsModule,
+ TranslateModule.forChild(),
],
- providers: [
- ContextMenuService,
- ],
+ providers: [ContextMenuService],
})
export class MenuModule {}
diff --git a/src/app/modules/menu/navigation/navigation.component.ts b/src/app/modules/menu/navigation/navigation.component.ts
index 0a84fc82..f68df701 100644
--- a/src/app/modules/menu/navigation/navigation.component.ts
+++ b/src/app/modules/menu/navigation/navigation.component.ts
@@ -14,7 +14,12 @@
*/
import {Component} from '@angular/core';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
-import {SCAppConfigurationMenuCategory, SCLanguage, SCThingTranslator, SCTranslations} from '@openstapps/core';
+import {
+ SCAppConfigurationMenuCategory,
+ SCLanguage,
+ SCThingTranslator,
+ SCTranslations,
+} from '@openstapps/core';
import {NGXLogger} from 'ngx-logger';
import {ConfigProvider} from '../../config/config.provider';
@@ -30,7 +35,6 @@ import {ConfigProvider} from '../../config/config.provider';
templateUrl: 'navigation.html',
})
export class NavigationComponent {
-
/**
* Possible languages to be used for translation
*/
@@ -46,10 +50,12 @@ export class NavigationComponent {
*/
translator: SCThingTranslator;
- constructor(private readonly configProvider: ConfigProvider,
- public translateService: TranslateService,
- private readonly logger: NGXLogger) {
- this.loadMenuEntries();
+ constructor(
+ private readonly configProvider: ConfigProvider,
+ public translateService: TranslateService,
+ private readonly logger: NGXLogger,
+ ) {
+ void this.loadMenuEntries();
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
this.language = event.lang as keyof SCTranslations;
this.translator = new SCThingTranslator(this.language);
@@ -62,11 +68,12 @@ export class NavigationComponent {
*/
async loadMenuEntries() {
try {
- this.menu = await this.configProvider.getValue('menus') as SCAppConfigurationMenuCategory[];
+ this.menu = (await this.configProvider.getValue(
+ 'menus',
+ )) as SCAppConfigurationMenuCategory[];
} catch (error) {
this.logger.error(`error from loading menu entries: ${error}`);
}
-
}
// openPage(page) {
diff --git a/src/app/modules/menu/navigation/navigation.html b/src/app/modules/menu/navigation/navigation.html
index 0aa10636..01a2986d 100644
--- a/src/app/modules/menu/navigation/navigation.html
+++ b/src/app/modules/menu/navigation/navigation.html
@@ -6,24 +6,23 @@
- 
+
StApps
-
+
- {{category.translations[language].name | titlecase}}
+ {{ category.translations[language].name | titlecase }}
- {{item.translations[language].title | titlecase}}
+ {{ item.translations[language].title | titlecase }}
diff --git a/src/app/modules/news/news.module.ts b/src/app/modules/news/news.module.ts
index 62066ee3..ecfed80f 100644
--- a/src/app/modules/news/news.module.ts
+++ b/src/app/modules/news/news.module.ts
@@ -22,31 +22,27 @@ import {DataModule} from '../data/data.module';
import {SettingsProvider} from '../settings/settings.provider';
import {NewsItemComponent} from './page/news-item.component';
import {NewsPageComponent} from './page/news-page.component';
-import {SkeletonNewsItem} from './page/skeleton-news-item.component';
+import {SkeletonNewsItemComponent} from './page/skeleton-news-item.component';
-const newsRoutes: Routes = [
- {path: 'news', component: NewsPageComponent},
-];
+const newsRoutes: Routes = [{path: 'news', component: NewsPageComponent}];
/**
* News Module
*/
@NgModule({
declarations: [
- NewsPageComponent,
- SkeletonNewsItem,
NewsItemComponent,
+ NewsPageComponent,
+ SkeletonNewsItemComponent,
],
imports: [
- IonicModule.forRoot(),
- TranslateModule.forChild(),
- RouterModule.forChild(newsRoutes),
CommonModule,
- MomentModule,
DataModule,
+ IonicModule.forRoot(),
+ MomentModule,
+ RouterModule.forChild(newsRoutes),
+ TranslateModule.forChild(),
],
- providers: [
- SettingsProvider,
- ],
+ providers: [SettingsProvider],
})
export class NewsModule {}
diff --git a/src/app/modules/news/news.provider.ts b/src/app/modules/news/news.provider.ts
index 1c4caa35..5f3fa0d1 100644
--- a/src/app/modules/news/news.provider.ts
+++ b/src/app/modules/news/news.provider.ts
@@ -15,6 +15,7 @@
import {Injectable} from '@angular/core';
import {SCMessage} from '@openstapps/core';
import {DataProvider} from '../data/data.provider';
+
/**
* Service for providing news messages
*/
@@ -22,12 +23,12 @@ import {DataProvider} from '../data/data.provider';
providedIn: 'root',
})
export class NewsProvider {
- constructor(private dataProvider: DataProvider) {
- }
+ constructor(private dataProvider: DataProvider) {}
/**
* Get news messages
* TODO: make dates sortable on the backend side and then adjust this method
+ *
* @param size How many messages/news to fetch
* @param sort If sort by date needs to be performed
*/
@@ -47,8 +48,15 @@ export class NewsProvider {
if (sort) {
news.sort((a, b) => {
- if (typeof a.datePublished !== 'undefined' && typeof b.datePublished !== 'undefined') {
- return (a.datePublished > b.datePublished) ? -1 : ((a.datePublished < b.datePublished) ? 1 : 0);
+ if (
+ typeof a.datePublished !== 'undefined' &&
+ typeof b.datePublished !== 'undefined'
+ ) {
+ return a.datePublished > b.datePublished
+ ? -1
+ : a.datePublished < b.datePublished
+ ? 1
+ : 0;
}
return 0;
diff --git a/src/app/modules/news/page/news-item.component.ts b/src/app/modules/news/page/news-item.component.ts
index 432a6e09..90010b75 100644
--- a/src/app/modules/news/page/news-item.component.ts
+++ b/src/app/modules/news/page/news-item.component.ts
@@ -27,5 +27,4 @@ export class NewsItemComponent {
* News (message) to show
*/
@Input() item: SCMessage;
-
}
diff --git a/src/app/modules/news/page/news-item.html b/src/app/modules/news/page/news-item.html
index 078abcbc..dcb2de4d 100644
--- a/src/app/modules/news/page/news-item.html
+++ b/src/app/modules/news/page/news-item.html
@@ -1,25 +1,41 @@
-
-
-
-
- {{item.datePublished | amDateFormat:'LLL'}}
+ {{
+ item.datePublished | amDateFormat: 'LLL'
+ }}
- {{item.name}}{{item.name}}
+ {{ item.name }}{{ item.name }}
- {{item.messageBody}}
+ {{ item.messageBody }}
diff --git a/src/app/modules/news/page/news-page.component.ts b/src/app/modules/news/page/news-page.component.ts
index 6edcb9c7..cad46950 100644
--- a/src/app/modules/news/page/news-page.component.ts
+++ b/src/app/modules/news/page/news-page.component.ts
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with
* this program. If not, see {{'news.title' | translate}}
+ {{ 'news.title' | translate }}
-
+
diff --git a/src/app/modules/news/page/skeleton-news-item.component.ts b/src/app/modules/news/page/skeleton-news-item.component.ts
index 9e325cbb..3f168138 100644
--- a/src/app/modules/news/page/skeleton-news-item.component.ts
+++ b/src/app/modules/news/page/skeleton-news-item.component.ts
@@ -21,5 +21,4 @@ import {Component} from '@angular/core';
selector: 'stapps-skeleton-news-item',
templateUrl: 'skeleton-news-item.html',
})
-export class SkeletonNewsItem {
-}
+export class SkeletonNewsItemComponent {}
diff --git a/src/app/modules/news/page/skeleton-news-item.html b/src/app/modules/news/page/skeleton-news-item.html
index fa2ad103..d3413067 100644
--- a/src/app/modules/news/page/skeleton-news-item.html
+++ b/src/app/modules/news/page/skeleton-news-item.html
@@ -1,12 +1,18 @@
-
-
diff --git a/src/app/modules/settings/item/settings-item.component.ts b/src/app/modules/settings/item/settings-item.component.ts
index 00863f12..4fc14d3b 100644
--- a/src/app/modules/settings/item/settings-item.component.ts
+++ b/src/app/modules/settings/item/settings-item.component.ts
@@ -31,7 +31,6 @@ import {SettingsProvider} from '../settings.provider';
templateUrl: 'settings-item.html',
})
export class SettingsItemComponent {
-
/**
* If set the setting will be shown as compact view
*/
@@ -41,6 +40,7 @@ export class SettingsItemComponent {
* Flag for workaround for selected 'select option' not updating translation
*/
isVisible = true;
+
/**
* The setting to handle
*/
@@ -52,13 +52,15 @@ export class SettingsItemComponent {
* @param translateService TranslateService
* @param settingsProvider SettingProvider
*/
- constructor(private readonly alertCtrl: AlertController,
- private readonly translateService: TranslateService,
- private readonly settingsProvider: SettingsProvider) {
+ constructor(
+ private readonly alertCtrl: AlertController,
+ private readonly translateService: TranslateService,
+ private readonly settingsProvider: SettingsProvider,
+ ) {
translateService.onLangChange.subscribe((_event: LangChangeEvent) => {
this.isVisible = false;
// TODO: Issue #53 check workaround for selected 'select option' not updating translation
- setTimeout(() => this.isVisible = true);
+ setTimeout(() => (this.isVisible = true));
});
}
@@ -81,8 +83,10 @@ export class SettingsItemComponent {
* Handles value changes of the setting
*/
async settingChanged(): Promise {
- if (typeof this.setting.value !== 'undefined'
- && SettingsProvider.validateValue(this.setting, this.setting.value)) {
+ if (
+ typeof this.setting.value !== 'undefined' &&
+ SettingsProvider.validateValue(this.setting, this.setting.value)
+ ) {
// handle general settings, with special actions
switch (this.setting.name) {
case 'language':
@@ -90,23 +94,25 @@ export class SettingsItemComponent {
break;
default:
}
- await this.settingsProvider
- .setSettingValue(this.setting.categories[0],
- this.setting.name,
- this.setting.value);
+ await this.settingsProvider.setSettingValue(
+ this.setting.categories[0],
+ this.setting.name,
+ this.setting.value,
+ );
} else {
// reset setting
- this.setting.value =
- await this.settingsProvider
- .getValue(this.setting.categories[0], this.setting.name) as (SCSettingValue | SCSettingValues);
+ this.setting.value = (await this.settingsProvider.getValue(
+ this.setting.categories[0],
+ this.setting.name,
+ )) as SCSettingValue | SCSettingValues;
}
}
/**
* Mapping of typeOf for Html usage
*/
- // tslint:disable-next-line:prefer-function-over-method
- typeOf(val: unknown) {
- return typeof (val);
+ // eslint-disable-next-line class-methods-use-this
+ typeOf(value: unknown) {
+ return typeof value;
}
}
diff --git a/src/app/modules/settings/item/settings-item.html b/src/app/modules/settings/item/settings-item.html
index afba4e7d..1bb980b3 100644
--- a/src/app/modules/settings/item/settings-item.html
+++ b/src/app/modules/settings/item/settings-item.html
@@ -1,37 +1,80 @@
-
+
{{ vals.name }}
-
- {{ 'description' | thingTranslate: setting | titlecase }}
+ {{
+ 'description' | thingTranslate: setting | titlecase
+ }}
-
+
+ {{ 'search.nothing_found' | translate | titlecase }}
-{{'name' | thingTranslate: item}}
+{{ 'name' | thingTranslate: item }}
-
-
{{'name' | thingTranslate: item}}
+{{ 'name' | thingTranslate: item }}
-
{{item.academicTerm.name}}
+{{ item.academicTerm.name }}
- {{'categories' | thingTranslate: item.event | join: ', '}}
+ {{
+ 'categories' | thingTranslate: item.event | join: ', '
+ }}
{{'name' | thingTranslate: item}}
+{{ 'name' | thingTranslate: item }}
- {{characteristic.name}}
+
{{ characteristic.name }}
-
{{'name' | thingTranslate: item}}
-{{'description' | thingTranslate: item}}
-{{'categories' | thingTranslate: item | join: ', '}}
+{{ 'name' | thingTranslate: item }}
+{{ 'description' | thingTranslate: item }}
+{{ 'categories' | thingTranslate: item | join: ', ' }}
-
- {{item.type}} ({{item.categories.join(', ')}})
+ {{ item.type }} ({{ item.categories.join(', ') }})
{{item.name}}
-{{item.description}}
-{{item.academicTerms[0].name}}
-{{ item.name }}
+{{ item.description }}
+{{ item.academicTerms[0].name }}
+{{item.name}}
-{{item.description}}
-{{item.academicTerms[0].name}}
-{{ item.name }}
+{{ item.description }}
+{{ item.academicTerms[0].name }}
+
- {{'type' | thingTranslate: item}} ({{'type' | thingTranslate: item.data}})
+ {{ 'type' | thingTranslate: item }} ({{
+ 'type' | thingTranslate: item.data
+ }})
{{'name' | thingTranslate: item}}: {{'name' | thingTranslate: item.data}}
++ {{ 'name' | thingTranslate: item }}: + {{ 'name' | thingTranslate: item.data }} +
-
- {{'type' | thingTranslate: item}}
+ {{ 'type' | thingTranslate: item }}
{{'name' | thingTranslate: item}}
+{{ 'name' | thingTranslate: item }}
-
- {{'type' | thingTranslate: item}}
+ {{ 'type' | thingTranslate: item }}
{{'name' | thingTranslate: item}}
-{{'description' | thingTranslate: item}}
-{{ 'name' | thingTranslate: item }}
++ {{ 'description' | thingTranslate: item }} +
+{{'telephone' | propertyNameTranslate: item.workLocations[0] | titlecase}}: {{item.workLocations[0].telephone}} +
+ {{ + 'telephone' + | propertyNameTranslate: item.workLocations[0] + | titlecase + }}: + {{ + item.workLocations[0].telephone + }}
-{{'email' | propertyNameTranslate: item.workLocations[0] | titlecase}}: {{item.workLocations[0].email}}
-{{'faxNumber' | propertyNameTranslate: item.workLocations[0] | titlecase}}: {{item.workLocations[0].faxNumber}}
-{{'url' | propertyNameTranslate: item.workLocations[0] | titlecase}}: {{item.workLocations[0].url}} +
+ {{ + 'email' | propertyNameTranslate: item.workLocations[0] | titlecase + }}: + {{ + item.workLocations[0].email + }}
-{{'areaServed' | propertyNameTranslate: item.workLocations[0] | titlecase}}: {{item.workLocations[0].areaServed.name}} +
+ {{ + 'faxNumber' + | propertyNameTranslate: item.workLocations[0] + | titlecase + }}: {{ item.workLocations[0].faxNumber }} +
++ {{ 'url' | propertyNameTranslate: item.workLocations[0] | titlecase }}: + {{ + item.workLocations[0].url + }} +
++ {{ + 'areaServed' + | propertyNameTranslate: item.workLocations[0] + | titlecase + }}: + {{ item.workLocations[0].areaServed.name }}
{{'telephone' | propertyNameTranslate: item.workLocation | titlecase}}: {{workLocation.telephone}} +
+ {{ + 'telephone' | propertyNameTranslate: item.workLocation | titlecase + }}: + {{ + workLocation.telephone + }}
-{{'email' | propertyNameTranslate: item.workLocation | titlecase}}: {{workLocation.email}} +
+ {{ 'email' | propertyNameTranslate: item.workLocation | titlecase }}: + {{ + workLocation.email + }}
-{{'faxNumber' | propertyNameTranslate: item.workLocation | titlecase}}: {{workLocation.faxNumber}}
-{{'url' | propertyNameTranslate: item.workLocation | titlecase}}: {{workLocation.url}}
-{{'areaServed' | propertyNameTranslate: item.workLocation | titlecase}}: {{workLocation.areaServed.name}} +
+ {{ + 'faxNumber' | propertyNameTranslate: item.workLocation | titlecase + }}: {{ workLocation.faxNumber }} +
++ {{ 'url' | propertyNameTranslate: item.workLocation | titlecase }}: + {{ workLocation.url }} +
++ {{ + 'areaServed' | propertyNameTranslate: item.workLocation | titlecase + }}: + {{ + workLocation.areaServed.name + }}
@@ -35,4 +90,8 @@
-
{{'name' | thingTranslate: item}} , {{item.honorificPrefix}}
-
-
{{item.jobTitles.join(', ') | slice:0:50}}...
++ {{ 'name' | thingTranslate: item }} + , {{ item.honorificPrefix }} +
+
+
+
+ {{ item.jobTitles.join(', ') | slice: 0:50 + }}... +
- {{'type' | thingTranslate: item}}
+ {{ 'type' | thingTranslate: item }}
{{'name' | thingTranslate: item}}
-{{'description' | thingTranslate: item}}
-{{ 'name' | thingTranslate: item }}
++ {{ 'description' | thingTranslate: item }} +
+
- {{'type' | thingTranslate: item}}
+ {{ 'type' | thingTranslate: item }}
{{'name' | thingTranslate: item}}
+{{ 'name' | thingTranslate: item }}
- {{'type' | thingTranslate: item}}
+ {{ 'type' | thingTranslate: item }}
{{'name' | thingTranslate: item}}
-{{'duration' | propertyNameTranslate: item | titlecase}}: {{item.duration | amDuration:'seconds'}}
-{{ 'name' | thingTranslate: item }}
+
+
+ {{ 'duration' | propertyNameTranslate: item | titlecase }}: + {{ item.duration | amDuration: 'seconds' }} +
+{{'menu.context.title' | translate | titlecase}}
+{{ 'menu.context.title' | translate | titlecase }}
+
+
- {{(facet.onlyOnType ? getTranslatedPropertyName(facet.field, facet.onlyOnType) : (getTranslatedPropertyName(facet.field))) | titlecase}}
- {{facet.onlyOnType ? ' | ' + (getTranslatedPropertyValue(facet.onlyOnType, 'type') | titlecase) : ''}}
+ {{
+ (facet.onlyOnType
+ ? getTranslatedPropertyName(facet.field, facet.onlyOnType)
+ : getTranslatedPropertyName(facet.field)
+ ) | titlecase
+ }}
+ {{
+ facet.onlyOnType
+ ? ' | ' +
+ (getTranslatedPropertyValue(facet.onlyOnType, 'type')
+ | titlecase)
+ : ''
+ }}
+ *ngFor="
+ let bucket of !facet.compact
+ ? facet.buckets.slice(0, compactFilterOptionCount)
+ : facet.buckets
+ "
+ >
- ({{bucket.count}}) {{facet.field === 'type' ? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase) :
- getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key) | titlecase}}
+ ({{ bucket.count }})
+ {{
+ facet.field === 'type'
+ ? (getTranslatedPropertyValue($any(bucket.key), 'type')
+ | titlecase)
+ : (getTranslatedPropertyValue(
+ facet.onlyOnType,
+ facet.field,
+ bucket.key
+ ) | titlecase)
+ }}
+ [(ngModel)]="bucket.checked"
+ (ngModelChange)="filterChanged()"
+ [value]="{
+ field: facet.field,
+ value: bucket.key,
+ onlyOnType: facet.onlyOnType
+ }"
+ >
-
- {{'menu.context.filter.showAll' | translate}}
+
+ {{ 'menu.context.filter.showAll' | translate }}
-
- {{'menu.context.filter.showAll' | translate}}
+
+ {{ 'menu.context.filter.showAll' | translate }}
diff --git a/src/app/modules/menu/context/context-menu.service.spec.ts b/src/app/modules/menu/context/context-menu.service.spec.ts
index d8a3c067..a1f50124 100644
--- a/src/app/modules/menu/context/context-menu.service.spec.ts
+++ b/src/app/modules/menu/context/context-menu.service.spec.ts
@@ -9,7 +9,7 @@ describe('ContextMenuService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [ContextMenuService]
+ providers: [ContextMenuService],
});
service = TestBed.get(ContextMenuService);
});
@@ -18,38 +18,38 @@ describe('ContextMenuService', () => {
expect(service).toBeTruthy();
});
- it('should update filterOptions', (done) => {
- service.filterContextChanged$.subscribe((result) => {
+ it('should update filterOptions', done => {
+ service.filterContextChanged$.subscribe(result => {
expect(result).toBeDefined();
done();
});
service.updateContextFilter(facetsMock);
});
- it('should update filterQuery', (done) => {
+ it('should update filterQuery', done => {
service.filterContextChanged$.subscribe(() => {
service.contextFilterChanged(filterContext);
});
- service.filterQueryChanged$.subscribe((result) => {
+ service.filterQueryChanged$.subscribe(result => {
expect(result).toBeDefined();
done();
});
service.updateContextFilter(facetsMock);
});
- it('should update sortOptions', (done) => {
- service.sortContextChanged$.subscribe((result) => {
+ it('should update sortOptions', done => {
+ service.sortContextChanged$.subscribe(result => {
expect(result).toBeDefined();
done();
});
service.setContextSort(sortContext);
});
- it('should update sortQuery', (done) => {
+ it('should update sortQuery', done => {
service.sortContextChanged$.subscribe(() => {
service.contextSortChanged(sortContext);
});
- service.sortQueryChanged$.subscribe((result) => {
+ service.sortQueryChanged$.subscribe(result => {
expect(result).toBeDefined();
done();
});
@@ -57,37 +57,37 @@ describe('ContextMenuService', () => {
});
});
-
-const facetsMock: SCFacet[] =
- [{
- 'buckets': [
+const facetsMock: SCFacet[] = [
+ {
+ buckets: [
{
- 'count': 60,
- 'key': 'academic event',
+ count: 60,
+ key: 'academic event',
},
{
- 'count': 160,
- 'key': 'message',
+ count: 160,
+ key: 'message',
},
{
- 'count': 151,
- 'key': 'date series',
+ count: 151,
+ key: 'date series',
},
{
- 'count': 106,
- 'key': 'dish',
+ count: 106,
+ key: 'dish',
},
{
- 'count': 20,
- 'key': 'building',
+ count: 20,
+ key: 'building',
},
{
- 'count': 20,
- 'key': 'semester',
+ count: 20,
+ key: 'semester',
},
],
- 'field': 'type',
- }];
+ field: 'type',
+ },
+];
const filterContext: FilterContext = {
name: 'filter',
@@ -97,8 +97,9 @@ const filterContext: FilterContext = {
{
checked: true,
count: 60,
- key: 'academic event'
- }, {
+ key: 'academic event',
+ },
+ {
checked: false,
count: 160,
key: 'message',
@@ -106,26 +107,28 @@ const filterContext: FilterContext = {
{
checked: false,
count: 151,
- key: 'date series'
- }, {
+ key: 'date series',
+ },
+ {
checked: false,
count: 106,
- key: 'dish'
+ key: 'dish',
},
{
checked: false,
count: 20,
- key: 'building'
+ key: 'building',
},
{
checked: false,
count: 20,
- key: 'semester'
- }
+ key: 'semester',
+ },
],
- field: 'type'
- }]
-}
+ field: 'type',
+ },
+ ],
+};
const sortContext: SortContext = {
name: 'sort',
@@ -145,4 +148,4 @@ const sortContext: SortContext = {
value: 'type',
},
],
-}
+};
diff --git a/src/app/modules/menu/context/context-menu.service.ts b/src/app/modules/menu/context/context-menu.service.ts
index cb2add3b..08f00a82 100644
--- a/src/app/modules/menu/context/context-menu.service.ts
+++ b/src/app/modules/menu/context/context-menu.service.ts
@@ -13,16 +13,20 @@
* this program. If not, see
+
StApps
+
-
-
+
+
@@ -39,9 +82,18 @@
-
-
+
+
diff --git a/src/app/modules/settings/page/settings-page.component.ts b/src/app/modules/settings/page/settings-page.component.ts
index e66128df..754c69c6 100644
--- a/src/app/modules/settings/page/settings-page.component.ts
+++ b/src/app/modules/settings/page/settings-page.component.ts
@@ -12,31 +12,35 @@
* You should have received a copy of the GNU General Public License along with
* this program. If not, see {{'settings.title' | translate | titlecase}}
+ {{ 'settings.title' | translate | titlecase }}
-
+
-
-
-
- {{'settings.resetSettings' | translate}}
+
+ {{ 'settings.resetSettings' | translate }}
diff --git a/src/app/modules/settings/settings.module.ts b/src/app/modules/settings/settings.module.ts
index e4397af2..3f955911 100644
--- a/src/app/modules/settings/settings.module.ts
+++ b/src/app/modules/settings/settings.module.ts
@@ -33,24 +33,16 @@ const settingsRoutes: Routes = [
* Settings Module
*/
@NgModule({
- declarations: [
- SettingsPageComponent,
- SettingsItemComponent,
- ],
- exports: [
- SettingsItemComponent,
- ],
+ declarations: [SettingsPageComponent, SettingsItemComponent],
+ exports: [SettingsItemComponent],
imports: [
CommonModule,
FormsModule,
IonicModule.forRoot(),
- TranslateModule.forChild(),
- ThingTranslateModule.forChild(),
RouterModule.forChild(settingsRoutes),
+ ThingTranslateModule.forChild(),
+ TranslateModule.forChild(),
],
- providers: [
- ConfigProvider,
- SettingsProvider,
- ],
+ providers: [ConfigProvider, SettingsProvider],
})
export class SettingsModule {}
diff --git a/src/app/modules/settings/settings.provider.spec.ts b/src/app/modules/settings/settings.provider.spec.ts
index 3fe1af8e..d7b391a1 100644
--- a/src/app/modules/settings/settings.provider.spec.ts
+++ b/src/app/modules/settings/settings.provider.spec.ts
@@ -13,10 +13,19 @@
* this program. If not, see ;
@@ -24,50 +33,73 @@ describe('SettingsProvider', () => {
let storageProviderSpy: jasmine.SpyObj;
beforeEach(async () => {
- const storageProviderMethodSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
- const configProviderMethodSpy = jasmine.createSpyObj('ConfigProvider', ['getValue']);
+ const storageProviderMethodSpy = jasmine.createSpyObj('StorageProvider', [
+ 'init',
+ 'get',
+ 'has',
+ 'put',
+ ]);
+ const configProviderMethodSpy = jasmine.createSpyObj('ConfigProvider', [
+ 'getValue',
+ ]);
TestBed.configureTestingModule({
imports: [],
providers: [
SettingsProvider,
{
- provide: StorageProvider, useValue: storageProviderMethodSpy,
+ provide: StorageProvider,
+ useValue: storageProviderMethodSpy,
},
{
- provide: ConfigProvider, useValue: configProviderMethodSpy,
+ provide: ConfigProvider,
+ useValue: configProviderMethodSpy,
},
],
});
configProviderSpy = TestBed.get(ConfigProvider);
// set settings returned from config
- configProviderSpy.getValue.and.returnValue(Promise.resolve(CONFIG_SETTINGS_MOCK));
+ configProviderSpy.getValue.and.returnValue(
+ Promise.resolve(CONFIG_SETTINGS_MOCK),
+ );
settingsProvider = TestBed.get(SettingsProvider);
storageProviderSpy = TestBed.get(StorageProvider);
storageProviderMethodSpy.has.and.returnValue(false);
});
it('should provide and get setting', async () => {
- await settingsProvider.provideSetting(JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])));
- const setting: SCSetting = await settingsProvider
- .getSetting(CONFIG_SETTINGS_MOCK[0].categories[0], CONFIG_SETTINGS_MOCK[0].name);
+ await settingsProvider.provideSetting(
+ JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])),
+ );
+ const setting: SCSetting = await settingsProvider.getSetting(
+ CONFIG_SETTINGS_MOCK[0].categories[0],
+ CONFIG_SETTINGS_MOCK[0].name,
+ );
await expect(setting.value).toBeDefined();
});
it('should provide and get settings value', async () => {
- await settingsProvider.provideSetting(JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])));
- const value = await settingsProvider
- .getValue(CONFIG_SETTINGS_MOCK[0].categories[0], CONFIG_SETTINGS_MOCK[0].name);
+ await settingsProvider.provideSetting(
+ JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])),
+ );
+ const value = await settingsProvider.getValue(
+ CONFIG_SETTINGS_MOCK[0].categories[0],
+ CONFIG_SETTINGS_MOCK[0].name,
+ );
await expect(value).toEqual(CONFIG_SETTINGS_MOCK[0].defaultValue);
});
it('should get persisted setting value', async () => {
// set return values of storage
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
- storageProviderSpy.get.and.returnValue(Promise.resolve(SETTING_VALUES_MOCK));
+ storageProviderSpy.get.and.returnValue(
+ Promise.resolve(SETTING_VALUES_MOCK),
+ );
- const value = await settingsProvider
- .getValue(CONFIG_SETTINGS_MOCK[3].categories[0], CONFIG_SETTINGS_MOCK[3].name);
+ const value = await settingsProvider.getValue(
+ CONFIG_SETTINGS_MOCK[3].categories[0],
+ CONFIG_SETTINGS_MOCK[3].name,
+ );
await expect(value).toEqual(SETTING_VALUES_MOCK.profile.group);
});
@@ -75,74 +107,100 @@ describe('SettingsProvider', () => {
// set return values of spy objects
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
storageProviderSpy.get.and.returnValue(Promise.resolve([]));
- const value = await settingsProvider
- .getValue(CONFIG_SETTINGS_MOCK[3].categories[0], CONFIG_SETTINGS_MOCK[3].name);
+ const value = await settingsProvider.getValue(
+ CONFIG_SETTINGS_MOCK[3].categories[0],
+ CONFIG_SETTINGS_MOCK[3].name,
+ );
await expect(value).toEqual(CONFIG_SETTINGS_MOCK[3].defaultValue);
});
it('should keep persisted setting values from settings that are not contained in loaded config', async () => {
- const settings = [
- CONFIG_SETTINGS_MOCK[4],
- CONFIG_SETTINGS_MOCK[5],
- ];
+ const settings = [CONFIG_SETTINGS_MOCK[4], CONFIG_SETTINGS_MOCK[5]];
configProviderSpy.getValue.and.returnValue(Promise.resolve(settings));
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
- storageProviderSpy.get.and.returnValue(Promise.resolve(SETTING_VALUES_MOCK));
+ storageProviderSpy.get.and.returnValue(
+ Promise.resolve(SETTING_VALUES_MOCK),
+ );
await settingsProvider.init();
- await expect(storageProviderSpy.put).toHaveBeenCalledWith(STORAGE_KEY_SETTING_VALUES, SETTING_VALUES_MOCK);
+ await expect(storageProviderSpy.put).toHaveBeenCalledWith(
+ STORAGE_KEY_SETTING_VALUES,
+ SETTING_VALUES_MOCK,
+ );
});
it('should set value of a provided setting', async () => {
- await settingsProvider.provideSetting(JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[1])));
- await settingsProvider
- .setSettingValue(CONFIG_SETTINGS_MOCK[1].categories[0], CONFIG_SETTINGS_MOCK[1].name, 'updated');
- const value = await settingsProvider
- .getValue(CONFIG_SETTINGS_MOCK[1].categories[0], CONFIG_SETTINGS_MOCK[1].name);
+ await settingsProvider.provideSetting(
+ JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[1])),
+ );
+ await settingsProvider.setSettingValue(
+ CONFIG_SETTINGS_MOCK[1].categories[0],
+ CONFIG_SETTINGS_MOCK[1].name,
+ 'updated',
+ );
+ const value = await settingsProvider.getValue(
+ CONFIG_SETTINGS_MOCK[1].categories[0],
+ CONFIG_SETTINGS_MOCK[1].name,
+ );
await expect(value).toEqual('updated');
});
it('should return copy of settingsCache', async () => {
const category = CONFIG_SETTINGS_MOCK[0].categories[0];
const name = CONFIG_SETTINGS_MOCK[0].name;
- await settingsProvider.provideSetting(JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])));
+ await settingsProvider.provideSetting(
+ JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])),
+ );
const settings = await settingsProvider.getCache();
settings[category].settings[name].value = 'testValue';
// cached setting value should still be defaultValue
- await expect((await settingsProvider.getValue(category, name)))
- .toEqual(CONFIG_SETTINGS_MOCK[0].defaultValue);
+ await expect(await settingsProvider.getValue(category, name)).toEqual(
+ CONFIG_SETTINGS_MOCK[0].defaultValue,
+ );
});
it('should call storage put on setSettingValue', async () => {
- await settingsProvider.provideSetting(JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])));
- await settingsProvider
- .setSettingValue(CONFIG_SETTINGS_MOCK[0].categories[0], CONFIG_SETTINGS_MOCK[0].name, '');
+ await settingsProvider.provideSetting(
+ JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])),
+ );
+ await settingsProvider.setSettingValue(
+ CONFIG_SETTINGS_MOCK[0].categories[0],
+ CONFIG_SETTINGS_MOCK[0].name,
+ '',
+ );
await expect(storageProviderSpy.put).toHaveBeenCalled();
});
it('should clear settings', async () => {
await settingsProvider.reset();
- await expect(storageProviderSpy.put).toHaveBeenCalledWith(STORAGE_KEY_SETTING_VALUES, {});
+ await expect(storageProviderSpy.put).toHaveBeenCalledWith(
+ STORAGE_KEY_SETTING_VALUES,
+ {},
+ );
});
it('should reset settings', async () => {
const category = CONFIG_SETTINGS_MOCK[0].categories[0];
const name = CONFIG_SETTINGS_MOCK[0].name;
- await settingsProvider.provideSetting(JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])));
+ await settingsProvider.provideSetting(
+ JSON.parse(JSON.stringify(CONFIG_SETTINGS_MOCK[0])),
+ );
await settingsProvider.setSettingValue(category, name, 'guest');
await settingsProvider.resetDefault();
- const value = await settingsProvider
- .getValue(CONFIG_SETTINGS_MOCK[0].categories[0], CONFIG_SETTINGS_MOCK[0].name);
+ const value = await settingsProvider.getValue(
+ CONFIG_SETTINGS_MOCK[0].categories[0],
+ CONFIG_SETTINGS_MOCK[0].name,
+ );
await expect(value).toEqual(CONFIG_SETTINGS_MOCK[0].defaultValue);
});
it('should validate wrong values for inputType text', async () => {
- await testValue(CONFIG_SETTINGS_MOCK[0], 123456789);
+ await testValue(CONFIG_SETTINGS_MOCK[0], 123_456_789);
await testValue(CONFIG_SETTINGS_MOCK[0], false);
await testValue(CONFIG_SETTINGS_MOCK[0], []);
});
it('should validate wrong values for inputType password', async () => {
- await testValue(CONFIG_SETTINGS_MOCK[0], 123456789);
+ await testValue(CONFIG_SETTINGS_MOCK[0], 123_456_789);
await testValue(CONFIG_SETTINGS_MOCK[0], false);
await testValue(CONFIG_SETTINGS_MOCK[0], []);
});
@@ -155,34 +213,43 @@ describe('SettingsProvider', () => {
it('should validate wrong values for inputType singleChoice text', async () => {
await testValue(CONFIG_SETTINGS_MOCK[3], '');
- await testValue(CONFIG_SETTINGS_MOCK[3], 123456);
+ await testValue(CONFIG_SETTINGS_MOCK[3], 123_456);
await testValue(CONFIG_SETTINGS_MOCK[3], false);
await testValue(CONFIG_SETTINGS_MOCK[3], []);
});
it('should validate wrong values for inputType singleChoice boolean', async () => {
await testValue(CONFIG_SETTINGS_MOCK[5], '');
- await testValue(CONFIG_SETTINGS_MOCK[5], 123456);
+ await testValue(CONFIG_SETTINGS_MOCK[5], 123_456);
await testValue(CONFIG_SETTINGS_MOCK[5], []);
});
it('should validate wrong values for inputType multipleChoice', async () => {
await testValue(CONFIG_SETTINGS_MOCK[6], '');
- await testValue(CONFIG_SETTINGS_MOCK[6], 123456);
+ await testValue(CONFIG_SETTINGS_MOCK[6], 123_456);
await testValue(CONFIG_SETTINGS_MOCK[6], false);
await testValue(CONFIG_SETTINGS_MOCK[6], [1, 9]);
});
- async function testValue(setting: SCSetting, value: any) {
+ /**
+ * TODO
+ */
+ async function testValue(setting: SCSetting, value: unknown) {
let error: Error;
await settingsProvider.provideSetting(JSON.parse(JSON.stringify(setting)));
try {
- await settingsProvider.setSettingValue(setting.categories[0], setting.name, value);
- } catch (err) {
- error = err;
+ await settingsProvider.setSettingValue(
+ setting.categories[0],
+ setting.name,
+ value as never,
+ );
+ } catch (error_) {
+ error = error_;
}
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await expect(error).toBeDefined();
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await expect(error.message).toMatch(/is not valid/);
}
@@ -270,13 +337,15 @@ describe('SettingsProvider', () => {
},
translations: {
de: {
- description: 'Mit welcher Benutzergruppe soll die App verwendet werden?'
- + ' Die Einstellung wird beispielsweise für die Vorauswahl der Preiskategorie der Mensa verwendet.',
+ description:
+ 'Mit welcher Benutzergruppe soll die App verwendet werden?' +
+ ' Die Einstellung wird beispielsweise für die Vorauswahl der Preiskategorie der Mensa verwendet.',
name: 'Gruppe',
},
en: {
- description: 'The user group the app is going to be used.'
- + 'This settings for example is getting used for the predefined price category of mensa meals.',
+ description:
+ 'The user group the app is going to be used.' +
+ 'This settings for example is getting used for the predefined price category of mensa meals.',
name: 'Group',
},
},
diff --git a/src/app/modules/settings/settings.provider.ts b/src/app/modules/settings/settings.provider.ts
index 21960759..7696bac1 100644
--- a/src/app/modules/settings/settings.provider.ts
+++ b/src/app/modules/settings/settings.provider.ts
@@ -13,11 +13,7 @@
* this program. If not, see ();
+
/**
* Order of the setting categories
*/
categoriesOrder: string[];
+
/**
* Settings actions observable
*/
settingsActionChanged$ = this.settingsActionSource.asObservable();
+
/**
* Cache for the imported settings
*/
@@ -114,6 +113,7 @@ export class SettingsProvider {
/**
* Return true if all given values are valid to possible values in given settingInput
+ *
* @param possibleValues Possible values
* @param enteredValues Entered value
*/
@@ -121,7 +121,7 @@ export class SettingsProvider {
possibleValues: SCSettingValues | undefined,
enteredValues: SCSettingValues,
): boolean {
- if ( typeof possibleValues === 'undefined' ) {
+ if (typeof possibleValues === 'undefined') {
return false;
}
@@ -136,6 +136,7 @@ export class SettingsProvider {
/**
* Returns true if given value is valid to possible values in given settingInput
+ *
* @param possibleValues Possible values
* @param enteredValue Entered value
*/
@@ -143,21 +144,27 @@ export class SettingsProvider {
possibleValues: SCSettingValues | undefined,
enteredValue: SCSettingValue,
): boolean {
- if ( typeof possibleValues === 'undefined' ) {
+ if (typeof possibleValues === 'undefined') {
return false;
}
- return possibleValues !== undefined
- && (Array.isArray(possibleValues)
- && possibleValues.includes(enteredValue));
+ return (
+ possibleValues !== undefined &&
+ Array.isArray(possibleValues) &&
+ possibleValues.includes(enteredValue)
+ );
}
/**
* Validates value for given settings inputType. Returns true if value is valid.
+ *
* @param setting setting to check value against
* @param value value to validate
*/
- public static validateValue(setting: SCSetting, value: SCSettingValue | SCSettingValues): boolean {
+ public static validateValue(
+ setting: SCSetting,
+ value: SCSettingValue | SCSettingValues,
+ ): boolean {
let isValueValid = false;
switch (setting.inputType) {
case 'number':
@@ -166,11 +173,9 @@ export class SettingsProvider {
}
break;
case 'multiple choice':
- if (!Array.isArray(value)) {
- isValueValid = false;
- } else {
- isValueValid = SettingsProvider.checkMultipleChoiceValue(setting.values, value);
- }
+ isValueValid = !Array.isArray(value)
+ ? false
+ : SettingsProvider.checkMultipleChoiceValue(setting.values, value);
break;
case 'password':
case 'text':
@@ -179,11 +184,9 @@ export class SettingsProvider {
}
break;
case 'single choice':
- if (Array.isArray(value)) {
- isValueValid = false;
- } else {
- isValueValid = SettingsProvider.checkSingleChoiceValue(setting.values, value);
- }
+ isValueValid = Array.isArray(value)
+ ? false
+ : SettingsProvider.checkSingleChoiceValue(setting.values, value);
break;
default:
}
@@ -196,14 +199,17 @@ export class SettingsProvider {
* @param storage TODO
* @param configProvider TODO
*/
- constructor(private readonly storage: StorageProvider,
- private readonly configProvider: ConfigProvider) {
+ constructor(
+ private readonly storage: StorageProvider,
+ private readonly configProvider: ConfigProvider,
+ ) {
this.categoriesOrder = [];
this.settingsCache = {};
}
/**
* Add an Setting to the Cache if not exist and set undefined value to defaultValue
+ *
* @param setting Setting with categories, defaultValue, name, input type and valid values
*/
private addSetting(setting: SCSetting): void {
@@ -214,7 +220,8 @@ export class SettingsProvider {
if (setting.value === undefined) {
setting.value = setting.defaultValue;
}
- this.settingsCache[setting.categories[0]].settings[setting.name] = setting;
+ this.settingsCache[setting.categories[0]].settings[setting.name] =
+ setting;
}
}
@@ -226,7 +233,9 @@ export class SettingsProvider {
// iterate through keys of categories
for (const categoryKey of Object.keys(this.settingsCache)) {
// iterate through keys of settingValueContainer
- for (const settingKey of Object.keys(this.settingsCache[categoryKey].settings)) {
+ for (const settingKey of Object.keys(
+ this.settingsCache[categoryKey].settings,
+ )) {
if (typeof settingValuesContainer[categoryKey] === 'undefined') {
settingValuesContainer[categoryKey] = {};
}
@@ -240,6 +249,7 @@ export class SettingsProvider {
/**
* Add category if not exists
+ *
* @param category the category to provide
*/
private provideCategory(category: string): void {
@@ -256,6 +266,7 @@ export class SettingsProvider {
/**
* Returns true if category exists
+ *
* @param category Category key name
*/
public categoryExists(category: string): boolean {
@@ -280,32 +291,39 @@ export class SettingsProvider {
/**
* Returns copy of a setting if exist
+ *
* @param category the category of requested setting
* @param name the name of requested setting
- *
* @throws Exception if setting is not provided
*/
public async getSetting(category: string, name: string): Promise {
await this.init();
if (this.settingExists(category, name)) {
// return a copy of the settings
- return JSON.parse(JSON.stringify(this.settingsCache[category].settings[name]));
+ return JSON.parse(
+ JSON.stringify(this.settingsCache[category].settings[name]),
+ );
}
throw new Error(`Setting "${name}" not provided`);
}
/**
* Returns copy of a settings value if exist
+ *
* @param category the category of requested setting
* @param name the name of requested setting
- *
* @throws Exception if setting is not provided
*/
- public async getValue(category: string, name: string): Promise {
+ public async getValue(
+ category: string,
+ name: string,
+ ): Promise {
await this.init();
if (this.settingExists(category, name)) {
// return a copy of the settings value
- return JSON.parse(JSON.stringify(this.settingsCache[category].settings[name].value));
+ return JSON.parse(
+ JSON.stringify(this.settingsCache[category].settings[name].value),
+ );
}
throw new Error(`Setting "${name}" not provided`);
}
@@ -313,31 +331,39 @@ export class SettingsProvider {
/**
* Initializes settings from config and stored values if exist
*/
- public async init(): Promise {
+ public async init(): Promise {
try {
- const settings: SCSetting[] = (await this.configProvider.getValue('settings')) as SCSetting[];
- settings.forEach((setting) => this.addSetting(setting));
+ const settings: SCSetting[] = (await this.configProvider.getValue(
+ 'settings',
+ )) as SCSetting[];
+ for (const setting of settings) this.addSetting(setting);
for (const category of Object.keys(this.settingsCache)) {
if (!this.categoriesOrder.includes(category)) {
this.categoriesOrder.push(category);
}
}
- } catch (error) {
+ } catch {
this.settingsCache = {};
}
if (await this.storage.has(STORAGE_KEY_SETTING_VALUES)) {
// get setting values from StorageProvider into settingsCache
const valuesContainer: SettingValuesContainer =
- await this.storage.get(STORAGE_KEY_SETTING_VALUES);
+ await this.storage.get(
+ STORAGE_KEY_SETTING_VALUES,
+ );
// iterate through keys of categories
for (const categoryKey of Object.keys(this.settingsCache)) {
// iterate through setting keys of category
- for (const settingKey of Object.keys(this.settingsCache[categoryKey].settings)) {
+ for (const settingKey of Object.keys(
+ this.settingsCache[categoryKey].settings,
+ )) {
// if saved setting value exists set it, otherwise set to default value
- if (typeof valuesContainer[categoryKey] !== 'undefined'
- && typeof valuesContainer[categoryKey][settingKey] !== 'undefined') {
+ if (
+ typeof valuesContainer[categoryKey] !== 'undefined' &&
+ typeof valuesContainer[categoryKey][settingKey] !== 'undefined'
+ ) {
this.settingsCache[categoryKey].settings[settingKey].value =
valuesContainer[categoryKey][settingKey];
} else {
@@ -352,6 +378,7 @@ export class SettingsProvider {
/**
* Adds given setting and its category if not exist
+ *
* @param setting the setting to add
*/
public provideSetting(setting: SCSetting): void {
@@ -371,7 +398,9 @@ export class SettingsProvider {
*/
async resetDefault(): Promise {
for (const catKey of Object.keys(this.settingsCache)) {
- for (const settingKey of Object.keys(this.settingsCache[catKey].settings)) {
+ for (const settingKey of Object.keys(
+ this.settingsCache[catKey].settings,
+ )) {
const settingInput = this.settingsCache[catKey].settings[settingKey];
settingInput.value = settingInput.defaultValue;
}
@@ -385,18 +414,29 @@ export class SettingsProvider {
public async saveSettingValues(): Promise {
if (await this.storage.has(STORAGE_KEY_SETTING_VALUES)) {
const savedSettingsValues: SettingValuesContainer =
- await this.storage.get(STORAGE_KEY_SETTING_VALUES);
+ await this.storage.get(
+ STORAGE_KEY_SETTING_VALUES,
+ );
const cacheSettingsValues = this.getSettingValuesFromCache();
- const mergedSettingValues = deepMerge(savedSettingsValues, cacheSettingsValues);
- await this.storage
- .put(STORAGE_KEY_SETTING_VALUES, mergedSettingValues);
+ const mergedSettingValues = deepMerge(
+ savedSettingsValues,
+ cacheSettingsValues,
+ );
+ await this.storage.put(
+ STORAGE_KEY_SETTING_VALUES,
+ mergedSettingValues,
+ );
} else {
- await this.storage.put(STORAGE_KEY_SETTING_VALUES, this.getSettingValuesFromCache());
+ await this.storage.put(
+ STORAGE_KEY_SETTING_VALUES,
+ this.getSettingValuesFromCache(),
+ );
}
}
/**
* Sets the order the given categories show up in the settings page
+ *
* @param categoryNames the order of the categories
*/
public setCategoriesOrder(categoryNames: string[]) {
@@ -409,11 +449,13 @@ export class SettingsProvider {
* @param category Category key name
* @param name Setting key name
* @param value Value to be set
- *
* @throws Exception if setting is not provided or value not valid to the settings inputType
*/
- public async setSettingValue(category: string, name: string,
- value: SCSettingValue | SCSettingValues): Promise {
+ public async setSettingValue(
+ category: string,
+ name: string,
+ value: SCSettingValue | SCSettingValues,
+ ): Promise {
await this.init();
if (this.settingExists(category, name)) {
const setting: SCSetting = this.settingsCache[category].settings[name];
@@ -423,7 +465,10 @@ export class SettingsProvider {
this.settingsCache[category].settings[name].value = value;
await this.saveSettingValues();
// publish setting changes
- this.settingsActionSource.next({type: 'stapps.settings.changed', payload: {category, name, value}});
+ this.settingsActionSource.next({
+ type: 'stapps.settings.changed',
+ payload: {category, name, value},
+ });
} else {
throw new Error(`Value "${value}" of type
${typeof value} is not valid for ${setting.inputType}`);
@@ -435,10 +480,14 @@ export class SettingsProvider {
/**
* Returns true if setting in category exists
+ *
* @param category Category key name
* @param setting Setting key name
*/
public settingExists(category: string, setting: string): boolean {
- return this.categoryExists(category) && this.settingsCache[category].settings[setting] !== undefined;
+ return (
+ this.categoryExists(category) &&
+ this.settingsCache[category].settings[setting] !== undefined
+ );
}
}
diff --git a/src/app/modules/storage/storage.module.ts b/src/app/modules/storage/storage.module.ts
index ccf6ce40..732b1fb3 100644
--- a/src/app/modules/storage/storage.module.ts
+++ b/src/app/modules/storage/storage.module.ts
@@ -20,11 +20,7 @@ import {StorageProvider} from './storage.provider';
* Angular storage provider module
*/
@NgModule({
- imports: [
- IonicStorageModule.forRoot(),
- ],
- providers: [
- StorageProvider,
- ],
+ imports: [IonicStorageModule.forRoot()],
+ providers: [StorageProvider],
})
export class StorageModule {}
diff --git a/src/app/modules/storage/storage.provider.spec.ts b/src/app/modules/storage/storage.provider.spec.ts
index 1c888c4d..98d1fa15 100644
--- a/src/app/modules/storage/storage.provider.spec.ts
+++ b/src/app/modules/storage/storage.provider.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
/*
* Copyright (C) 2018, 2019 StApps
* This program is free software: you can redistribute it and/or modify it
@@ -61,17 +62,23 @@ describe('StorageProvider', () => {
it('should properly put and get a value', async () => {
await storageProvider.init();
await storageProvider.put('some-uid', {some: 'thing'});
- const result: Map = await storageProvider.get>('some-uid');
- expect(result).toEqual({some: 'thing'});
+ // eslint-disable-next-line @typescript-eslint/ban-types
+ const result: Map = await storageProvider.get<
+ // eslint-disable-next-line @typescript-eslint/ban-types
+ Map
+ >('some-uid');
+ await expect(result).toEqual({some: 'thing'});
});
it('should throw an error when value is null', async () => {
+ // eslint-disable-next-line unicorn/error-message
let error: Error = new Error();
+ // eslint-disable-next-line unicorn/no-null
spyOn(storage, 'get').and.returnValue(Promise.resolve(null));
try {
await storageProvider.get('something-else');
- } catch (err) {
- error = err;
+ } catch (error_) {
+ error = error_;
}
expect(error).toEqual(new Error('Value not found.'));
});
@@ -91,29 +98,34 @@ describe('StorageProvider', () => {
expect((storageProvider.get as jasmine.Spy).calls.count()).toEqual(2);
expect(storageProvider.get).toHaveBeenCalledWith('foo');
expect(storageProvider.get).toHaveBeenCalledWith('bar');
- expect(Array.from(entries.values())).toEqual(['Bar', {foo: 'BarFoo'}]);
- expect(Array.from(entries.keys())).toEqual(['foo', 'bar']);
+ expect([...entries.values()]).toEqual(['Bar', {foo: 'BarFoo'}]);
+ expect([...entries.keys()]).toEqual(['foo', 'bar']);
});
it('should get all values from the storage', async () => {
spyOn(storageProvider, 'get').and.callThrough();
await storageProvider.putMultiple(sampleEntries);
const entries = await storageProvider.getAll();
- expect(Array.from(entries.values()).map((item) => (item.foo) ? item.foo : item).sort())
- .toEqual(Array.from(sampleEntries.values()).map((item) => (item.foo) ? item.foo : item).sort());
- expect(Array.from(entries.keys()).sort()).toEqual(['bar', 'foo', 'foo.bar']);
+ expect(
+ [...entries.values()].map(item => (item.foo ? item.foo : item)).sort(),
+ ).toEqual(
+ [...sampleEntries.values()]
+ .map(item => (item.foo ? item.foo : item))
+ .sort(),
+ );
+ expect([...entries.keys()].sort()).toEqual(['bar', 'foo', 'foo.bar']);
});
it('should delete one or more entries from the storage', async () => {
spyOn(storage, 'remove').and.callThrough();
await storageProvider.putMultiple(sampleEntries);
let entries = await storageProvider.getAll();
- expect(Array.from(entries.values()).length).toBe(3);
+ expect([...entries.values()].length).toBe(3);
await storageProvider.delete('bar');
expect(storage.remove).toHaveBeenCalled();
entries = await storageProvider.getAll();
- expect(Array.from(entries.values())).toEqual(['Bar', 123]);
+ expect([...entries.values()]).toEqual(['Bar', 123]);
await storageProvider.delete('foo', 'foo.bar');
expect(await storageProvider.length()).toBe(0);
@@ -123,12 +135,12 @@ describe('StorageProvider', () => {
spyOn(storage, 'clear').and.callThrough();
await storageProvider.putMultiple(sampleEntries);
let entries = await storageProvider.getAll();
- expect(Array.from(entries.values()).length).toBe(3);
+ expect([...entries.values()].length).toBe(3);
await storageProvider.deleteAll();
entries = await storageProvider.getAll();
expect(storage.clear).toHaveBeenCalled();
- expect(Array.from(entries.values()).length).toBe(0);
+ expect([...entries.values()].length).toBe(0);
});
it('should provide number of entries', async () => {
@@ -152,7 +164,9 @@ describe('StorageProvider', () => {
});
it('should provide information if storage contains a specific entry (key)', async () => {
- spyOn(storage, 'keys').and.returnValue(Promise.resolve(Array.from(sampleEntries.keys())));
+ spyOn(storage, 'keys').and.returnValue(
+ Promise.resolve([...sampleEntries.keys()]),
+ );
expect(await storageProvider.has('foo')).toBeTruthy();
expect(await storageProvider.has('something-else')).toBeFalsy();
});
@@ -160,14 +174,14 @@ describe('StorageProvider', () => {
it('should allow search by regex', async () => {
await storageProvider.putMultiple(sampleEntries);
const found: Map = await storageProvider.search(/bar/);
- expect(Array.from(found.keys()).sort()).toEqual(['bar', 'foo.bar']);
- expect(Array.from(found.values())).toEqual([{foo: 'BarFoo'}, 123]);
+ expect([...found.keys()].sort()).toEqual(['bar', 'foo.bar']);
+ expect([...found.values()]).toEqual([{foo: 'BarFoo'}, 123]);
});
it('should allow search by string', async () => {
await storageProvider.putMultiple(sampleEntries);
const found: Map = await storageProvider.search('foo.ba');
- expect(Array.from(found.keys())).toEqual(['foo.bar']);
- expect(Array.from(found.values())).toEqual([123]);
+ expect([...found.keys()]).toEqual(['foo.bar']);
+ expect([...found.values()]).toEqual([123]);
});
});
diff --git a/src/app/modules/storage/storage.provider.ts b/src/app/modules/storage/storage.provider.ts
index 37a2fb44..9c820eb7 100644
--- a/src/app/modules/storage/storage.provider.ts
+++ b/src/app/modules/storage/storage.provider.ts
@@ -23,8 +23,7 @@ export class StorageProvider {
/**
* @param storage TODO
*/
- constructor(private readonly storage: Storage) {
- }
+ constructor(private readonly storage: Storage) {}
/**
* Deletes storage entries using keys used to save them
@@ -32,7 +31,7 @@ export class StorageProvider {
* @param keys Unique identifiers of the resources for deletion
*/
async delete(...keys: string[]): Promise {
- keys.forEach(async (key) => {
+ keys.map(async key => {
await this.storage.remove(key);
});
}
@@ -58,12 +57,13 @@ export class StorageProvider {
return entry;
}
- // tslint:disable:no-any
+ /* eslint-disable @typescript-eslint/no-explicit-any */
/**
* Retrieves all the storage entries
*/
async getAll(): Promise> {
const map: Map = new Map();
+ // eslint-disable-next-line unicorn/no-array-for-each
await this.storage.forEach((value, key) => {
map.set(key, value);
});
@@ -82,7 +82,7 @@ export class StorageProvider {
const getToMap = async (key: string) => {
map.set(key, await this.get(key));
};
- keys.forEach((key) => {
+ keys.map(key => {
gets.push(getToMap(key));
});
await Promise.all(gets);
@@ -137,9 +137,9 @@ export class StorageProvider {
*/
async putMultiple(entries: Map): Promise> {
const puts: Array> = [];
- entries.forEach(async (value, key) => {
+ for (const [key, value] of entries.entries()) {
puts.push(this.put(key, value));
- });
+ }
await Promise.all(puts);
return entries;
@@ -164,6 +164,7 @@ export class StorageProvider {
};
};
const checkIt = check(pattern);
+ // eslint-disable-next-line unicorn/no-array-for-each
await this.storage.forEach((value, key) => {
if (checkIt(pattern, key)) {
map.set(key, value);
diff --git a/src/app/translation/common-string-pipes.ts b/src/app/translation/common-string-pipes.ts
index 6ba97fe8..e1177ee0 100644
--- a/src/app/translation/common-string-pipes.ts
+++ b/src/app/translation/common-string-pipes.ts
@@ -13,14 +13,11 @@
* this program. If not, see ();
+ value = new Array();
- transform(aString: string, splitter: string): unknown {
+ transform(aString: string | T, splitter: string | T): T {
if (typeof splitter !== 'string' || splitter.length <= 0) {
- return this.value;
+ return this.value as never;
}
- if (typeof aString !== 'string'){
- throw new SyntaxError(`Wrong parameter in StringSplitPipe. Expected a valid String, received: ${aString}`);
+ if (typeof aString !== 'string') {
+ throw new SyntaxError(
+ `Wrong parameter in StringSplitPipe. Expected a valid String, received: ${aString}`,
+ );
}
this.value = aString.split(splitter);
- return this.value;
+ return this.value as never;
}
-
}
-
@Injectable()
@Pipe({
name: 'numberLocalized',
@@ -78,8 +75,11 @@ export class StringSplitPipe implements PipeTransform {
})
export class NumberLocalizedPipe implements PipeTransform, OnDestroy {
decimalPipe: DecimalPipe;
+
locale: string;
+
onLangChange: Subscription;
+
value: unknown;
constructor(private readonly translate: TranslateService) {
@@ -109,21 +109,22 @@ export class NumberLocalizedPipe implements PipeTransform, OnDestroy {
* Default is `3`.
*/
transform(value: unknown, digitsInfo?: string | undefined): unknown {
-
this.updateValue(value, digitsInfo);
this._dispose();
- if (typeof this.onLangChange === 'undefined' || this.onLangChange.closed ) {
- this.onLangChange = this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
+ if (typeof this.onLangChange === 'undefined' || this.onLangChange.closed) {
+ this.onLangChange = this.translate.onLangChange.subscribe(
+ (event: LangChangeEvent) => {
this.locale = event.lang;
this.updateValue(value, digitsInfo);
- });
- }
+ },
+ );
+ }
return this.value;
}
updateValue(value: unknown, digitsInfo?: string | undefined): void {
// this.value = this.locale;
- this.value = this.decimalPipe.transform(value, digitsInfo,this.locale);
+ this.value = this.decimalPipe.transform(value, digitsInfo, this.locale);
}
}
diff --git a/src/app/translation/thing-translate.module.ts b/src/app/translation/thing-translate.module.ts
index 4a4addc0..e411c771 100644
--- a/src/app/translation/thing-translate.module.ts
+++ b/src/app/translation/thing-translate.module.ts
@@ -14,45 +14,55 @@
*/
import {ModuleWithProviders, NgModule, Provider} from '@angular/core';
-import {ArrayJoinPipe, NumberLocalizedPipe, StringSplitPipe} from './common-string-pipes';
-import {ThingTranslateDefaultParser, ThingTranslateParser} from './thing-translate.parser';
-import {ThingPropertyNameTranslatePipe, ThingTranslatePipe} from './thing-translate.pipe';
+import {
+ ArrayJoinPipe,
+ NumberLocalizedPipe,
+ StringSplitPipe,
+} from './common-string-pipes';
+import {
+ ThingTranslateDefaultParser,
+ ThingTranslateParser,
+} from './thing-translate.parser';
+import {
+ ThingPropertyNameTranslatePipe,
+ ThingTranslatePipe,
+} from './thing-translate.pipe';
import {ThingTranslateService} from './thing-translate.service';
-
-// tslint:disable: completed-docs
export interface ThingTranslateModuleConfig {
parser?: Provider;
}
@NgModule({
declarations: [
- ThingTranslatePipe,
- ThingPropertyNameTranslatePipe,
ArrayJoinPipe,
- StringSplitPipe,
NumberLocalizedPipe,
- // ThingTranslatorDirective
+ StringSplitPipe,
+ ThingPropertyNameTranslatePipe,
+ ThingTranslatePipe,
],
exports: [
- ThingTranslatePipe,
- ThingPropertyNameTranslatePipe,
ArrayJoinPipe,
- StringSplitPipe,
NumberLocalizedPipe,
- // ThingTranslatorDirective
+ StringSplitPipe,
+ ThingPropertyNameTranslatePipe,
+ ThingTranslatePipe,
],
})
export class ThingTranslateModule {
-
/**
* Use this method in your other (non root) modules to import the directive/pipe
*/
- static forChild(config: ThingTranslateModuleConfig = {}): ModuleWithProviders {
+ static forChild(
+ config: ThingTranslateModuleConfig = {},
+ ): ModuleWithProviders {
return {
ngModule: ThingTranslateModule,
providers: [
- config.parser ?? {provide: ThingTranslateParser, useClass: ThingTranslateDefaultParser},
+ config.parser ?? {
+ provide: ThingTranslateParser,
+ useClass: ThingTranslateDefaultParser,
+ },
ThingTranslateService,
],
};
@@ -61,11 +71,16 @@ export class ThingTranslateModule {
/**
* Use this method in your root module to provide the TranslatorService
*/
- static forRoot(config: ThingTranslateModuleConfig = {}): ModuleWithProviders {
+ static forRoot(
+ config: ThingTranslateModuleConfig = {},
+ ): ModuleWithProviders {
return {
ngModule: ThingTranslateModule,
providers: [
- config.parser ?? {provide: ThingTranslateParser, useClass: ThingTranslateDefaultParser},
+ config.parser ?? {
+ provide: ThingTranslateParser,
+ useClass: ThingTranslateDefaultParser,
+ },
ThingTranslateService,
],
};
diff --git a/src/app/translation/thing-translate.parser.ts b/src/app/translation/thing-translate.parser.ts
index 84d224b0..6c4d4842 100644
--- a/src/app/translation/thing-translate.parser.ts
+++ b/src/app/translation/thing-translate.parser.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-types */
/*
* Copyright (C) 2020-2021 StApps
* This program is free software: you can redistribute it and/or modify it
@@ -15,7 +16,7 @@
import {Injectable} from '@angular/core';
-// tslint:disable: member-ordering prefer-function-over-method completed-docs
+/* eslint-disable @typescript-eslint/member-ordering, class-methods-use-this */
export abstract class ThingTranslateParser {
/**
@@ -27,22 +28,23 @@ export abstract class ThingTranslateParser {
@Injectable()
export class ThingTranslateDefaultParser extends ThingTranslateParser {
-
getValueFromKeyPath(instance: object, keyPath: string): unknown {
// keyPath = aproperty[0].anotherproperty["arrayproperty"][42].finalproperty
- let path = keyPath.replace(/(?:\"|\')'"/gmi, '.');
+ let path = keyPath.replace(/["']'"/gim, '.');
// path = aproperty[0].anotherproperty[.arrayproperty.][42].finalproperty
- path = path.replace(/(?:\[|\])/gmi, '.');
+ path = path.replace(/[\[\]]/gim, '.');
// path = aproperty.0..anotherproperty..arrayproperty...42..finalproperty
- path = path.replace(/\.{2,}/gmi, '.');
+ // TODO
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ path = path.replace(/\.{2,}/gim, '.');
// path = aproperty.0.anotherproperty.arrayproperty.42.finalproperty
const keyPathChain = keyPath.split('.');
- // tslint:disable-next-line: no-any
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
let property = instance as any;
- for(const key of keyPathChain) {
+ for (const key of keyPathChain) {
property = property[key] ?? undefined;
}
@@ -50,6 +52,9 @@ export class ThingTranslateDefaultParser extends ThingTranslateParser {
}
}
+/**
+ * TODO
+ */
export function isDefined(value?: T | null): value is T {
return typeof value !== 'undefined' && value !== null;
}
diff --git a/src/app/translation/thing-translate.pipe.ts b/src/app/translation/thing-translate.pipe.ts
index d7004f34..33f00ce4 100644
--- a/src/app/translation/thing-translate.pipe.ts
+++ b/src/app/translation/thing-translate.pipe.ts
@@ -14,14 +14,13 @@
*/
import {Injectable, OnDestroy, Pipe, PipeTransform} from '@angular/core';
-import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
+import {TranslateService} from '@ngx-translate/core';
import {isThing, SCThings, SCThingType} from '@openstapps/core';
import {Subscription} from 'rxjs';
import {ThingTranslateService} from './thing-translate.service';
// tslint:disable: member-ordering prefer-function-over-method completed-docs
-
@Injectable()
@Pipe({
name: 'thingTranslate',
@@ -29,28 +28,35 @@ import {ThingTranslateService} from './thing-translate.service';
})
export class ThingTranslatePipe implements PipeTransform, OnDestroy {
value: unknown;
+
lastKey?: string;
+
lastThing: SCThings;
+
onLangChange: Subscription;
- constructor(private readonly translate: TranslateService,
- // private readonly _ref: ChangeDetectorRef,
- private readonly thingTranslate: ThingTranslateService) {
- }
+ constructor(
+ private readonly translate: TranslateService,
+ // private readonly _ref: ChangeDetectorRef,
+ private readonly thingTranslate: ThingTranslateService,
+ ) {}
updateValue(key: string, thing: SCThings): void {
this.value = this.thingTranslate.get(thing, key);
}
- transform(query: P, thing: T):
- P extends keyof T ? T[P] : P | unknown {
+ transform(
+ query: P,
+ thing: T,
+ ): P extends keyof T ? T[P] : P | unknown {
if (typeof query !== 'string' || query.length <= 0) {
- // tslint:disable-next-line:no-any
- return query as any;
+ return query as never;
}
if (!isThing(thing)) {
- throw new SyntaxError(`Wrong parameter in ThingTranslatePipe. Expected a valid SCThing, received: ${thing}`);
+ throw new SyntaxError(
+ `Wrong parameter in ThingTranslatePipe. Expected a valid SCThing, received: ${thing}`,
+ );
}
// store the params, in case they change
@@ -63,7 +69,7 @@ export class ThingTranslatePipe implements PipeTransform, OnDestroy {
this._dispose();
if (this.onLangChange?.closed ?? true) {
- this.onLangChange = this.translate.onLangChange.subscribe((_event: LangChangeEvent) => {
+ this.onLangChange = this.translate.onLangChange.subscribe(() => {
if (typeof this.lastKey === 'string') {
this.lastKey = undefined; // we want to make sure it doesn't return the same value until it's been updated
this.updateValue(query, thing);
@@ -71,8 +77,7 @@ export class ThingTranslatePipe implements PipeTransform, OnDestroy {
});
}
- // tslint:disable-next-line:no-any
- return this.value as any;
+ return this.value as never;
}
/**
@@ -89,21 +94,26 @@ export class ThingTranslatePipe implements PipeTransform, OnDestroy {
}
}
-
@Injectable()
@Pipe({
name: 'propertyNameTranslate',
pure: false, // required to update the value when the promise is resolved
})
-export class ThingPropertyNameTranslatePipe implements PipeTransform, OnDestroy {
+export class ThingPropertyNameTranslatePipe
+ implements PipeTransform, OnDestroy
+{
value: unknown;
+
lastKey?: string;
+
lastType: string;
+
onLangChange: Subscription;
- constructor(private readonly translate: TranslateService,
- private readonly thingTranslate: ThingTranslateService) {
- }
+ constructor(
+ private readonly translate: TranslateService,
+ private readonly thingTranslate: ThingTranslateService,
+ ) {}
updateValue(key: string, type: string): void {
this.value = this.thingTranslate.getPropertyName(type as SCThingType, key);
@@ -115,12 +125,15 @@ export class ThingPropertyNameTranslatePipe implements PipeTransform, OnDestroy
}
if (!isThing(thingOrType) && typeof thingOrType !== 'string') {
- throw new SyntaxError(`Wrong parameter in ThingTranslatePipe. Expected a valid SCThing or String, received: ${thingOrType}`);
+ throw new SyntaxError(
+ `Wrong parameter in ThingTranslatePipe. Expected a valid SCThing or String, received: ${thingOrType}`,
+ );
}
// store the params, in case they change
this.lastKey = query;
- this.lastType = typeof thingOrType === 'string' ? thingOrType : thingOrType.type;
+ this.lastType =
+ typeof thingOrType === 'string' ? thingOrType : thingOrType.type;
this.updateValue(query, this.lastType);
@@ -128,7 +141,7 @@ export class ThingPropertyNameTranslatePipe implements PipeTransform, OnDestroy
this._dispose();
if (this.onLangChange?.closed ?? true) {
- this.onLangChange = this.translate.onLangChange.subscribe((_event: LangChangeEvent) => {
+ this.onLangChange = this.translate.onLangChange.subscribe(() => {
if (typeof this.lastKey === 'string') {
this.lastKey = undefined; // we want to make sure it doesn't return the same value until it's been updated
this.updateValue(query, this.lastType);
diff --git a/src/app/translation/thing-translate.service.ts b/src/app/translation/thing-translate.service.ts
index b87da8e0..d3ee9e6d 100644
--- a/src/app/translation/thing-translate.service.ts
+++ b/src/app/translation/thing-translate.service.ts
@@ -15,58 +15,81 @@
import {Injectable, OnDestroy} from '@angular/core';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
-import {SCLanguage, SCLanguageCode, SCThings, SCThingTranslator, SCThingType, SCTranslations} from '@openstapps/core';
+import {
+ SCLanguage,
+ SCLanguageCode,
+ SCThings,
+ SCThingTranslator,
+ SCThingType,
+ SCTranslations,
+} from '@openstapps/core';
import moment from 'moment';
import {Subscription} from 'rxjs';
import {isDefined, ThingTranslateParser} from './thing-translate.parser';
// export const DEFAULT_LANGUAGE = new InjectionToken('DEFAULT_LANGUAGE');
-// tslint:disable: member-ordering prefer-function-over-method newline-per-chained-call completed-docs
+/* eslint-disable @typescript-eslint/member-ordering, class-methods-use-this, newline-per-chained-call, */
@Injectable({
providedIn: 'root',
})
export class ThingTranslateService implements OnDestroy {
-
onLangChange: Subscription;
+
translator: SCThingTranslator;
/**
*
* @param translateService Instance of Angular TranslateService
* @param parser An instance of the parser currently used
- * @param language TODO
*/
- constructor(private readonly translateService: TranslateService,
- public parser: ThingTranslateParser){
- this.translator = new SCThingTranslator((translateService.currentLang ?? translateService.defaultLang) as SCLanguageCode);
+ constructor(
+ private readonly translateService: TranslateService,
+ public parser: ThingTranslateParser,
+ ) {
+ this.translator = new SCThingTranslator(
+ (translateService.currentLang ??
+ translateService.defaultLang) as SCLanguageCode,
+ );
/** set the default language from configuration */
- this.onLangChange = this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
- this.translator.language = event.lang as keyof SCTranslations;
- moment.locale(event.lang);
- });
-
+ this.onLangChange = this.translateService.onLangChange.subscribe(
+ (event: LangChangeEvent) => {
+ this.translator.language =
+ event.lang as keyof SCTranslations;
+ moment.locale(event.lang);
+ },
+ );
}
/**
* Returns the parsed result of the translations
*/
- // tslint:disable-next-line: no-any
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/ban-types
getParsedResult(target: object, key: string): any {
return this.parser.getValueFromKeyPath(target, key);
}
/**
* Gets the translated value of a key (or an array of keys)
+ *
+ * @param thing SCThing to get
+ * @param keyPath Path to the key
* @returns the translated key, or an object of translated keys
*/
- public get(thing: SCThings, keyPath: string | string[]): string | number | boolean | object {
+ public get(
+ thing: SCThings,
+ keyPath: string | string[],
+ // eslint-disable-next-line @typescript-eslint/ban-types
+ ): string | number | boolean | object {
if (!isDefined(keyPath) || keyPath.length === 0) {
throw new Error(`Parameter "keyPath" required`);
}
- if (keyPath instanceof Array) {
- return this.getParsedResult(this.translator.translate(thing), keyPath.join('.'));
+ if (Array.isArray(keyPath)) {
+ return this.getParsedResult(
+ this.translator.translate(thing),
+ keyPath.join('.'),
+ );
}
return this.getParsedResult(this.translator.translate(thing), keyPath);
@@ -74,24 +97,30 @@ export class ThingTranslateService implements OnDestroy {
/**
* Gets the translated value of a key (or an array of keys)
+ *
+ * @param type Type of the property
+ * @param keyPath Path to the key
* @returns the translated key, or an object of translated keys
*/
- public getPropertyName(type: SCThingType, keyPath: string | string[]): string {
- const translatedPropertyNames = this.translator.translatedPropertyNames(type);
+ public getPropertyName(
+ type: SCThingType,
+ keyPath: string | string[],
+ ): string {
+ const translatedPropertyNames =
+ this.translator.translatedPropertyNames(type);
if (!isDefined(translatedPropertyNames)) {
throw new Error(`Parameter "type" is an invalid SCThingType`);
}
if (!isDefined(keyPath) || keyPath.length === 0) {
throw new Error(`Parameter "keyPath" required`);
}
- if (keyPath instanceof Array) {
- return this.getParsedResult(translatedPropertyNames!, keyPath.join('.'));
+ if (Array.isArray(keyPath)) {
+ return this.getParsedResult(translatedPropertyNames, keyPath.join('.'));
}
- return this.getParsedResult(translatedPropertyNames!, keyPath);
+ return this.getParsedResult(translatedPropertyNames, keyPath);
}
- // tslint:disable-next-line: completed-docs
ngOnDestroy() {
if (!this.onLangChange.closed) {
this.onLangChange.unsubscribe();
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 9bf79286..1749f661 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -12,6 +12,7 @@
* You should have received a copy of the GNU General Public License along with
* this program. If not, see StApps
+
+
+ StApps
-
{{ ('values' | thingTranslate: setting)[i] | titlecase }}
+
+ {{ ('values' | thingTranslate: setting)[i] | titlecase }}
+
{{ val }}
{{ ('values' | thingTranslate: setting)[i] | titlecase }}
+
+ {{ ('values' | thingTranslate: setting)[i] | titlecase }}
+
{{ val }}