diff --git a/src/addons/mod/feedback/pages/attempt/attempt.ts b/src/addons/mod/feedback/pages/attempt/attempt.ts index 762aa611c..e2db40423 100644 --- a/src/addons/mod/feedback/pages/attempt/attempt.ts +++ b/src/addons/mod/feedback/pages/attempt/attempt.ts @@ -24,10 +24,9 @@ import { AddonModFeedback, AddonModFeedbackProvider, AddonModFeedbackWSAnonAttempt, - AddonModFeedbackWSAttempt, AddonModFeedbackWSFeedback, } from '../../services/feedback'; -import { AddonModFeedbackFormItem, AddonModFeedbackHelper } from '../../services/feedback-helper'; +import { AddonModFeedbackAttempt, AddonModFeedbackFormItem, AddonModFeedbackHelper } from '../../services/feedback-helper'; /** * Page that displays a feedback attempt review. @@ -41,7 +40,7 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy { cmId: number; courseId: number; feedback?: AddonModFeedbackWSFeedback; - attempt?: AddonModFeedbackWSAttempt; + attempt?: AddonModFeedbackAttempt; attempts: AddonModFeedbackAttemptsSwipeManager; anonAttempt?: AddonModFeedbackWSAnonAttempt; items: AddonModFeedbackAttemptItem[] = []; @@ -102,7 +101,7 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy { this.anonAttempt = attempt; delete this.attempt; } else { - this.attempt = attempt; + this.attempt = (await AddonModFeedbackHelper.addImageProfile([attempt]))[0]; delete this.anonAttempt; } @@ -145,7 +144,7 @@ export class AddonModFeedbackAttemptPage implements OnInit, OnDestroy { * @param attempt Attempt to check. * @returns If attempt is anonymous. */ - isAnonAttempt(attempt: AddonModFeedbackWSAttempt | AddonModFeedbackWSAnonAttempt): attempt is AddonModFeedbackWSAnonAttempt { + isAnonAttempt(attempt: AddonModFeedbackAttempt | AddonModFeedbackWSAnonAttempt): attempt is AddonModFeedbackWSAnonAttempt { return !('fullname' in attempt); } diff --git a/src/addons/mod/feedback/services/feedback-helper.ts b/src/addons/mod/feedback/services/feedback-helper.ts index 47920a859..1b312968e 100644 --- a/src/addons/mod/feedback/services/feedback-helper.ts +++ b/src/addons/mod/feedback/services/feedback-helper.ts @@ -220,9 +220,9 @@ export class AddonModFeedbackHelperProvider { * @param entries Entries array to get profile from. * @returns Returns the same array with the profileimageurl added if found. */ - protected async addImageProfile(entries: AddonModFeedbackWSAttempt[]): Promise; - protected async addImageProfile(entries: AddonModFeedbackWSNonRespondent[]): Promise; - protected async addImageProfile( + async addImageProfile(entries: AddonModFeedbackWSAttempt[]): Promise; + async addImageProfile(entries: AddonModFeedbackWSNonRespondent[]): Promise; + async addImageProfile( entries: (AddonModFeedbackWSAttempt | AddonModFeedbackWSNonRespondent)[], ): Promise<(AddonModFeedbackAttempt | AddonModFeedbackNonRespondent)[]> { return Promise.all(entries.map(async (entry: AddonModFeedbackAttempt | AddonModFeedbackNonRespondent) => { diff --git a/src/addons/mod/forum/services/handlers/discussion-link.ts b/src/addons/mod/forum/services/handlers/discussion-link.ts index edb09160b..f00ed9ed5 100644 --- a/src/addons/mod/forum/services/handlers/discussion-link.ts +++ b/src/addons/mod/forum/services/handlers/discussion-link.ts @@ -65,12 +65,8 @@ export class AddonModForumDiscussionLinkHandlerService extends CoreContentLinksH pageParams.parent = parseInt(params.parent); } - const path = cmId && courseId - ? `${AddonModForumModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/${discussionId}` - : `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`; - CoreNavigator.navigateToSitePath( - path, + `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`, { siteId, params: pageParams }, ); }, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index badb8dc75..dafc3ff30 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -196,15 +196,12 @@ export class AppComponent implements OnInit, AfterViewInit { */ ngAfterViewInit(): void { if (!this.outlet) { - this.logger.debug('Aftew view init: no outlet found'); - return; } - this.logger.debug('Aftew view init'); + this.logger.debug('App component initialized'); CoreSubscriptions.once(this.outlet.activateEvents, async () => { - this.logger.debug('Activate event triggered'); await CorePlatform.ready(); this.logger.debug('Hide splash screen'); diff --git a/src/core/components/iframe/core-iframe.html b/src/core/components/iframe/core-iframe.html index 28ce77c89..bf4921455 100644 --- a/src/core/components/iframe/core-iframe.html +++ b/src/core/components/iframe/core-iframe.html @@ -1,5 +1,10 @@ - - + + + + + + + @@ -7,13 +12,12 @@ - - {{ 'core.iframehelp' | translate }} - + diff --git a/src/core/components/iframe/iframe.scss b/src/core/components/iframe/iframe.scss index e71baa682..d8778a5d6 100644 --- a/src/core/components/iframe/iframe.scss +++ b/src/core/components/iframe/iframe.scss @@ -1,5 +1,9 @@ :host { flex-grow: 1; + + .core-iframe-loading { + display: none; + } } :host-context(.core-iframe-fullscreen) {