Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-20 16:42:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: adjust code after upgrade of ionic from v4 to v5

Browse Source 
Note: used observables instead of events service which
doesn't exist in ionic 5 anymore.
This commit is contained in:
Jovan Krunić
2020-10-28 16:48:24 +01:00
committed by Rainer Killinger
parent cc357f36b6
commit 2e8d717607
7 changed files with 3129 additions and 7378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/modules/data/data.module.ts
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018, 2019 StApps
* Copyright (C) 2018, 2019, 2020 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
@@ -16,7 +16,7 @@ import {CommonModule} from '@angular/common';
import {HttpClientModule} from '@angular/common/http';
import {NgModule} from '@angular/core';
import {FormsModule} from '@angular/forms';
import {Events, IonicModule} from '@ionic/angular';
import {IonicModule} from '@ionic/angular';
import {TranslateModule} from '@ngx-translate/core';
import {MarkdownModule} from 'ngx-markdown';
import {MomentModule} from 'ngx-moment';
@@ -129,7 +129,6 @@ import {VideoListItem} from './types/video/video-list-item.component';
providers: [
DataProvider,
DataFacetsProvider,
Events,
StAppsWebHttpClient,
],
})

20
src/app/modules/data/list/data-list.component.ts
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018, 2019 StApps
* Copyright (C) 2018, 2019, 2020 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
@@ -13,20 +13,19 @@
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Component, OnInit} from '@angular/core';
import {AlertController, Events} from '@ionic/angular';
import {AlertController} from '@ionic/angular';
import {
SCFacet,
SCSearchFilter,
SCSearchQuery,
SCSearchSort,
SCSettingValue,
SCSettingValues,
SCThing,
} from '@openstapps/core';
import {Logger} from '@openstapps/logger';
import {Subject} from 'rxjs';
import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
import {MenuService} from '../../menu/menu.service';
import {SettingsProvider} from '../../settings/settings.provider';
import {DataProvider} from '../data.provider';
/**
@@ -82,14 +81,13 @@ export class DataListComponent implements OnInit {
*
* @param alertController AlertController
* @param dataProvider DataProvider
* @param events Events
* @param menuService MenuService
*/
constructor(
private readonly alertController: AlertController,
private dataProvider: DataProvider,
private readonly events: Events,
private readonly menuService: MenuService,
private readonly settingsProvider: SettingsProvider,
) {
this.queryTextChanged
.pipe(
@@ -115,10 +113,12 @@ export class DataListComponent implements OnInit {
/**
* Subscribe to 'settings.changed' events
*/
this.events.subscribe('stapps.settings.changed',
(category: string, name: string, value: SCSettingValue | SCSettingValues) => {
Logger.log(`received event "settings.changed" with category:
${category}, name: ${name}, value: ${JSON.stringify(value)}`);
this.settingsProvider.settingsActionChanged$.subscribe(({type, payload}) => {
if (type === 'stapps.settings.changed') {
const {category, name, value} = payload!;
Logger.log(`received event "settings.changed" with category:
${category}, name: ${name}, value: ${JSON.stringify(value)}`);
}
},
);
}