EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3643 forum: Rename services

main
Noel De Martin 2021-03-01 15:38:08 +01:00
parent e726858216
commit 5d39d8efc9
20 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.ts
View File

@ -17,7 +17,7 @@ import { CoreSites } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom';
import { PopoverController } from '@singletons';
import { CoreEvents } from '@singletons/events';
import { AddonModForum, AddonModForumDiscussion, AddonModForumProvider } from '../../services/forum.service';
import { AddonModForum, AddonModForumDiscussion, AddonModForumProvider } from '../../services/forum';
/**
* This component is meant to display a popover with the discussion options.

4
src/addons/mod/forum/components/edit-post/edit-post.ts
View File

@ -18,8 +18,8 @@ import { CoreFileEntry, CoreFileUploader } from '@features/fileuploader/services
import { CoreSites } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom';
import { ModalController, Translate } from '@singletons';
import { AddonModForumData, AddonModForumPost, AddonModForumReply } from '@addons/mod/forum/services/forum.service';
import { AddonModForumHelper } from '@addons/mod/forum/services/helper.service';
import { AddonModForumData, AddonModForumPost, AddonModForumReply } from '@addons/mod/forum/services/forum';
import { AddonModForumHelper } from '@addons/mod/forum/services/helper';
/**
* Page that displays a form to edit discussion post.

8
src/addons/mod/forum/components/index/index.ts
View File

@ -24,11 +24,11 @@ import {
AddonModForumDiscussion,
AddonModForumNewDiscussionData,
AddonModForumReplyDiscussionData,
} from '@addons/mod/forum/services/forum.service';
import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '@addons/mod/forum/services/offline.service';
} from '@addons/mod/forum/services/forum';
import { AddonModForumOffline, AddonModForumOfflineDiscussion } from '@addons/mod/forum/services/offline';
import { ModalController, PopoverController, Translate } from '@singletons';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import { AddonModForumHelper } from '@addons/mod/forum/services/helper.service';
import { AddonModForumHelper } from '@addons/mod/forum/services/helper';
import { CoreGroups, CoreGroupsProvider } from '@services/groups';
import { CoreEvents, CoreEventObserver } from '@singletons/events';
import {
@ -36,7 +36,7 @@ import {
AddonModForumManualSyncData,
AddonModForumSyncProvider,
AddonModForumSyncResult,
} from '@addons/mod/forum/services/sync.service';
} from '@addons/mod/forum/services/sync';
import { CoreSites } from '@services/sites';
import { CoreUser } from '@features/user/services/user';
import { CoreDomUtils } from '@services/utils/dom';

2
src/addons/mod/forum/components/post-options-menu/post-options-menu.ts
View File

@ -15,7 +15,7 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
import { CoreApp } from '@services/app';
import { AddonModForum, AddonModForumPost } from '@addons/mod/forum/services/forum.service';
import { AddonModForum, AddonModForumPost } from '@addons/mod/forum/services/forum';
import { Network, NgZone, PopoverController } from '@singletons';
import { Subscription } from 'rxjs';
import { CoreDomUtils } from '@services/utils/dom';

8
src/addons/mod/forum/components/post/post.ts
View File

@ -39,16 +39,16 @@ import {
AddonModForumReply,
AddonModForumUpdateDiscussionPostWSOptionsObject,
AddonModForumWSPostAttachment,
} from '../../services/forum.service';
} from '../../services/forum';
import { CoreTag } from '@features/tag/services/tag';
import { ModalController, PopoverController, Translate } from '@singletons';
import { CoreFileEntry, CoreFileUploader } from '@features/fileuploader/services/fileuploader';
import { IonContent } from '@ionic/angular';
import { AddonModForumSync } from '../../services/sync.service';
import { AddonModForumSync } from '../../services/sync';
import { CoreSync } from '@services/sync';
import { CoreTextUtils } from '@services/utils/text';
import { AddonModForumHelper } from '../../services/helper.service';
import { AddonModForumOffline, AddonModForumReplyOptions } from '../../services/offline.service';
import { AddonModForumHelper } from '../../services/helper';
import { AddonModForumOffline, AddonModForumReplyOptions } from '../../services/offline';
import { CoreUtils } from '@services/utils/utils';
import { AddonModForumPostOptionsMenuComponent } from '../post-options-menu/post-options-menu';
import { AddonModForumEditPostComponent } from '../edit-post/edit-post';

2
src/addons/mod/forum/components/sort-order-selector/sort-order-selector.ts
View File

@ -13,7 +13,7 @@
// limitations under the License.
import { Component, Input } from '@angular/core';
import { AddonModForumSortOrder } from '@addons/mod/forum/services/forum.service';
import { AddonModForumSortOrder } from '@addons/mod/forum/services/forum';
import { ModalController } from '@singletons';
/**

2
src/addons/mod/forum/forum.module.ts
View File

@ -24,7 +24,7 @@ import { CoreScreen } from '@services/screen';
import { AddonModForumComponentsModule } from './components/components.module';
import { AddonModForumModuleHandler, AddonModForumModuleHandlerService } from './services/handlers/module';
import { SITE_SCHEMA } from './services/offline-db';
import { SITE_SCHEMA } from './services/database/offline';
import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
import { AddonModForumPrefetchHandler } from './services/handlers/prefetch';
import { CoreCronDelegate } from '@services/cron';

8
src/addons/mod/forum/pages/discussion/discussion.page.ts
View File

@ -34,10 +34,10 @@ import {
AddonModForumPost,
AddonModForumProvider,
AddonModForumRatingInfo,
} from '../../services/forum.service';
import { AddonModForumHelper } from '../../services/helper.service';
import { AddonModForumOffline } from '../../services/offline.service';
import { AddonModForumSync, AddonModForumSyncProvider } from '../../services/sync.service';
} from '../../services/forum';
import { AddonModForumHelper } from '../../services/helper';
import { AddonModForumOffline } from '../../services/offline';
import { AddonModForumSync, AddonModForumSyncProvider } from '../../services/sync';
type SortType = 'flat-newest' | 'flat-oldest' | 'nested';

2
src/addons/mod/forum/pages/index/index.ts
View File

@ -14,7 +14,7 @@
import { Component, OnInit } from '@angular/core';
import { AddonModForumData } from '@addons/mod/forum/services/forum.service';
import { AddonModForumData } from '@addons/mod/forum/services/forum';
import { CoreCourseAnyModuleData } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';

8
src/addons/mod/forum/pages/new-discussion/new-discussion.page.ts
View File

@ -24,16 +24,16 @@ import {
AddonModForumCanAddDiscussion,
AddonModForumData,
AddonModForumProvider,
} from '@addons/mod/forum/services/forum.service';
} from '@addons/mod/forum/services/forum';
import { CoreEditorRichTextEditorComponent } from '@features/editor/components/rich-text-editor/rich-text-editor';
import { AddonModForumSync, AddonModForumSyncProvider } from '@addons/mod/forum/services/sync.service';
import { AddonModForumSync, AddonModForumSyncProvider } from '@addons/mod/forum/services/sync';
import { CoreSites } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom';
import { Translate } from '@singletons';
import { CoreSync } from '@services/sync';
import { AddonModForumDiscussionOptions, AddonModForumOffline } from '@addons/mod/forum/services/offline.service';
import { AddonModForumDiscussionOptions, AddonModForumOffline } from '@addons/mod/forum/services/offline';
import { CoreUtils } from '@services/utils/utils';
import { AddonModForumHelper } from '@addons/mod/forum/services/helper.service';
import { AddonModForumHelper } from '@addons/mod/forum/services/helper';
import { IonRefresher } from '@ionic/angular';
import { CoreFileUploader } from '@features/fileuploader/services/fileuploader';
import { CoreTextUtils } from '@services/utils/text';

9
src/addons/mod/forum/services/offline-db.ts → src/addons/mod/forum/services/database/offline.ts
View File

@ -13,6 +13,7 @@
// limitations under the License.
import { CoreSiteSchema } from '@services/sites';
import { AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from '../offline';
/**
* Database variables for AddonModForum service.
@ -113,3 +114,11 @@ export const SITE_SCHEMA: CoreSiteSchema = {
},
],
};
export type AddonModForumOfflineDiscussionDBRecord = Omit<AddonModForumOfflineDiscussion, 'options'> & {
options: string;
};
export type AddonModForumOfflineReplyDBRecord = Omit<AddonModForumOfflineReply, 'options'> & {
options: string;
};

24
src/addons/mod/forum/services/forum.service.ts → src/addons/mod/forum/services/forum.ts
View File

@ -26,7 +26,7 @@ import { CoreUrlUtils } from '@services/utils/url';
import { CoreUtils } from '@services/utils/utils';
import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws';
import { makeSingleton, Translate } from '@singletons';
import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumReplyOptions } from './offline.service';
import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumReplyOptions } from './offline';
const ROOT_CACHE_KEY = 'mmaModForum:';
@ -216,11 +216,7 @@ export class AddonModForumProvider {
const response = await site.write<AddonModForumAddDiscussionWSResponse>('mod_forum_add_discussion', params);
// Other errors ocurring.
if (!response || !response.discussionid) {
return Promise.reject(CoreUtils.instance.createFakeWSError(''));
} else {
return response.discussionid;
}
return response.discussionid;
}
/**
@ -832,7 +828,7 @@ export class AddonModForumProvider {
let numPages = typeof options.numPages == 'undefined' ? -1 : options.numPages;
if (!numPages) {
return Promise.resolve(result);
return result;
}
const getPage = (page: number): Promise<{ discussions: AddonModForumDiscussion[]; error: boolean }> =>
@ -1114,7 +1110,7 @@ export class AddonModForumProvider {
return storeOffline();
} else {
// The WebService has thrown an error or offline not supported, reject.
return Promise.reject(error);
throw error;
}
}
}
@ -1142,8 +1138,10 @@ export class AddonModForumProvider {
subject: subject,
message: message,
// eslint-disable-next-line max-len
options: CoreUtils.instance.objectToArrayOfObjects<AddonModForumAddDiscussionPostWSOptionsArray[0], AddonModForumAddDiscussionPostWSOptionsObject>(
options: CoreUtils.instance.objectToArrayOfObjects<
AddonModForumAddDiscussionPostWSOptionsArray[0],
AddonModForumAddDiscussionPostWSOptionsObject
>(
options || {},
'name',
'value',
@ -1297,8 +1295,10 @@ export class AddonModForumProvider {
subject: subject,
message: message,
// eslint-disable-next-line max-len
options: CoreUtils.instance.objectToArrayOfObjects<AddonModForumUpdateDiscussionPostWSOptionsArray[0], AddonModForumUpdateDiscussionPostWSOptionsObject>(
options: CoreUtils.instance.objectToArrayOfObjects<
AddonModForumUpdateDiscussionPostWSOptionsArray[0],
AddonModForumUpdateDiscussionPostWSOptionsObject
>(
options || {},
'name',
'value',

4
src/addons/mod/forum/services/handlers/module.ts
View File

@ -13,7 +13,7 @@
// limitations under the License.
import { Injectable, Type } from '@angular/core';
import { AddonModForum, AddonModForumProvider } from '../forum.service';
import { AddonModForum, AddonModForumProvider } from '../forum';
import { CoreCourse, CoreCourseAnyModuleData } from '@features/course/services/course';
import { CoreCourseModule } from '@features/course/services/course-helper';
import { CoreNavigationOptions, CoreNavigator } from '@services/navigator';
@ -73,7 +73,7 @@ export class AddonModForumModuleHandlerService implements CoreCourseModuleHandle
title: module.name,
class: 'addon-mod_forum-handler',
showDownloadButton: true,
action(_: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
action(event: Event, module: CoreCourseModule, courseId: number, options?: CoreNavigationOptions): void {
options = options || {};
options.params = options.params || {};
Object.assign(options.params, { module });

4
src/addons/mod/forum/services/handlers/prefetch.ts
View File

@ -14,7 +14,7 @@
import { Injectable } from '@angular/core';
import { CoreCourseActivityPrefetchHandlerBase } from '@features/course/classes/activity-prefetch-handler';
import { AddonModForum, AddonModForumData, AddonModForumPost, AddonModForumProvider } from '../forum.service';
import { AddonModForum, AddonModForumData, AddonModForumPost, AddonModForumProvider } from '../forum';
import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
import { CoreFilepool } from '@services/filepool';
import { CoreWSExternalFile } from '@services/ws';
@ -22,7 +22,7 @@ import { CoreCourse, CoreCourseAnyModuleData, CoreCourseCommonModWSOptions } fro
import { CoreUser } from '@features/user/services/user';
import { CoreGroups, CoreGroupsProvider } from '@services/groups';
import { CoreUtils } from '@services/utils/utils';
import { AddonModForumSync } from '../sync.service';
import { AddonModForumSync } from '../sync';
import { makeSingleton } from '@singletons';
/**

2
src/addons/mod/forum/services/handlers/push-click.ts
View File

@ -15,7 +15,7 @@
import { Injectable } from '@angular/core';
import { Params } from '@angular/router';
import { AddonModForum } from '@addons/mod/forum/services/forum.service';
import { AddonModForum } from '@addons/mod/forum/services/forum';
import { CoreNavigator } from '@services/navigator';
import { CorePushNotificationsClickHandler } from '@features/pushnotifications/services/push-delegate';
import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications';

2
src/addons/mod/forum/services/handlers/sync-cron.ts
View File

@ -15,7 +15,7 @@
import { Injectable } from '@angular/core';
import { CoreCronHandler } from '@services/cron';
import { makeSingleton } from '@singletons';
import { AddonModForumSync } from '../sync.service';
import { AddonModForumSync } from '../sync';
/**
* Synchronization cron handler.

4
src/addons/mod/forum/services/helper.service.ts → src/addons/mod/forum/services/helper.ts
View File

@ -29,8 +29,8 @@ import {
AddonModForumDiscussion,
AddonModForumPost,
AddonModForumProvider,
} from './forum.service';
import { AddonModForumDiscussionOptions, AddonModForumOffline, AddonModForumOfflineReply } from './offline.service';
} from './forum';
import { AddonModForumDiscussionOptions, AddonModForumOffline, AddonModForumOfflineReply } from './offline';
/**
* Service that provides some features for forums.

32
src/addons/mod/forum/services/offline.service.ts → src/addons/mod/forum/services/offline.ts
View File

@ -18,8 +18,13 @@ import { CoreFile } from '@services/file';
import { CoreSites } from '@services/sites';
import { CoreTextUtils } from '@services/utils/text';
import { makeSingleton } from '@singletons';
import { AddonModForumProvider } from './forum.service';
import { DISCUSSIONS_TABLE, REPLIES_TABLE } from './offline-db';
import { AddonModForumProvider } from './forum';
import {
AddonModForumOfflineDiscussionDBRecord,
AddonModForumOfflineReplyDBRecord,
DISCUSSIONS_TABLE,
REPLIES_TABLE,
} from './database/offline';
/**
* Service to handle offline forum.
@ -69,7 +74,7 @@ export class AddonModForumOfflineProvider {
timecreated: timeCreated,
};
const record = await site.getDb().getRecord<AddonModForumOfflineDiscussionRecord>(DISCUSSIONS_TABLE, conditions);
const record = await site.getDb().getRecord<AddonModForumOfflineDiscussionDBRecord>(DISCUSSIONS_TABLE, conditions);
return this.parseRecordOptions(record);
}
@ -82,7 +87,7 @@ export class AddonModForumOfflineProvider {
*/
async getAllNewDiscussions(siteId?: string): Promise<AddonModForumOfflineDiscussion[]> {
const site = await CoreSites.instance.getSite(siteId);
const records = await site.getDb().getRecords<AddonModForumOfflineDiscussionRecord>(DISCUSSIONS_TABLE);
const records = await site.getDb().getRecords<AddonModForumOfflineDiscussionDBRecord>(DISCUSSIONS_TABLE);
return this.parseRecordsOptions(records);
}
@ -122,7 +127,7 @@ export class AddonModForumOfflineProvider {
userid: userId || site.getUserId(),
};
const records = await site.getDb().getRecords<AddonModForumOfflineDiscussionRecord>(DISCUSSIONS_TABLE, conditions);
const records = await site.getDb().getRecords<AddonModForumOfflineDiscussionDBRecord>(DISCUSSIONS_TABLE, conditions);
return this.parseRecordsOptions(records);
}
@ -155,7 +160,7 @@ export class AddonModForumOfflineProvider {
userId?: number,
): Promise<void> {
const site = await CoreSites.instance.getSite(siteId);
const data: AddonModForumOfflineDiscussionRecord = {
const data: AddonModForumOfflineDiscussionDBRecord = {
forumid: forumId,
name: name,
courseid: courseId,
@ -196,7 +201,7 @@ export class AddonModForumOfflineProvider {
*/
async getAllReplies(siteId?: string): Promise<AddonModForumOfflineReply[]> {
const site = await CoreSites.instance.getSite(siteId);
const records = await site.getDb().getRecords<AddonModForumOfflineReplyRecord>(REPLIES_TABLE);
const records = await site.getDb().getRecords<AddonModForumOfflineReplyDBRecord>(REPLIES_TABLE);
return this.parseRecordsOptions(records);
}
@ -236,7 +241,7 @@ export class AddonModForumOfflineProvider {
userid: userId || site.getUserId(),
};
const records = await site.getDb().getRecords<AddonModForumOfflineReplyRecord>(REPLIES_TABLE, conditions);
const records = await site.getDb().getRecords<AddonModForumOfflineReplyDBRecord>(REPLIES_TABLE, conditions);
return this.parseRecordsOptions(records);
}
@ -276,7 +281,7 @@ export class AddonModForumOfflineProvider {
userid: userId || site.getUserId(),
};
const records = await site.getDb().getRecords<AddonModForumOfflineReplyRecord>(REPLIES_TABLE, conditions);
const records = await site.getDb().getRecords<AddonModForumOfflineReplyDBRecord>(REPLIES_TABLE, conditions);
return this.parseRecordsOptions(records);
}
@ -309,7 +314,7 @@ export class AddonModForumOfflineProvider {
userId?: number,
): Promise<void> {
const site = await CoreSites.instance.getSite(siteId);
const data: AddonModForumOfflineReplyRecord = {
const data: AddonModForumOfflineReplyDBRecord = {
postid: postId,
discussionid: discussionId,
forumid: forumId,
@ -437,10 +442,3 @@ export type AddonModForumOfflineReply = {
userid: number;
timecreated: number;
};
export type AddonModForumOfflineDiscussionRecord = Omit<AddonModForumOfflineDiscussion, 'options'> & {
options: string;
};
export type AddonModForumOfflineReplyRecord = Omit<AddonModForumOfflineReply, 'options'> & {
options: string;
};

6
src/addons/mod/forum/services/sync.service.ts → src/addons/mod/forum/services/sync.ts
View File

@ -31,9 +31,9 @@ import {
AddonModForumAddDiscussionPostWSOptionsObject,
AddonModForumAddDiscussionWSOptionsObject,
AddonModForumProvider,
} from './forum.service';
import { AddonModForumHelper } from './helper.service';
import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from './offline.service';
} from './forum';
import { AddonModForumHelper } from './helper';
import { AddonModForumOffline, AddonModForumOfflineDiscussion, AddonModForumOfflineReply } from './offline';
declare module '@singletons/events' {

2
src/core/features/sitehome/services/sitehome.ts
View File

@ -19,7 +19,7 @@ import { CoreSite, CoreSiteWSPreSets } from '@classes/site';
import { makeSingleton } from '@singletons';
import { CoreCourse } from '../../course/services/course';
import { CoreCourses } from '../../courses/services/courses';
import { AddonModForum, AddonModForumData } from '@addons/mod/forum/services/forum.service';
import { AddonModForum, AddonModForumData } from '@addons/mod/forum/services/forum';
/**
* Items with index 1 and 3 were removed on 2.5 and not being supported in the app.