Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/doubtfire-angular.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ import {TaskAssessmentCardComponent} from './projects/states/dashboard/directive
import {TaskSubmissionCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component';
import {TaskDashboardComponent} from './projects/states/dashboard/directives/task-dashboard/task-dashboard.component';
import {InboxComponent} from './units/states/tasks/inbox/inbox.component';
import {UnitsTasksStateComponent} from './units/states/tasks/tasks.component';
import {ProjectProgressBarComponent} from './common/project-progress-bar/project-progress-bar.component';
import {TeachingPeriodListComponent} from './admin/states/teaching-periods/teaching-period-list/teaching-period-list.component';
import {FChipComponent} from './common/f-chip/f-chip.component';
Expand Down Expand Up @@ -454,6 +455,7 @@ const GANTT_CHART_CONFIG = {
TaskSubmissionCardComponent,
TaskDashboardComponent,
InboxComponent,
UnitsTasksStateComponent,
ProjectProgressBarComponent,
TeachingPeriodListComponent,
CreateNewUnitModal,
Expand Down
26 changes: 25 additions & 1 deletion src/app/doubtfire-angularjs.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ import 'build/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.js';
import 'build/src/app/units/modals/modals.js';
import 'build/src/app/units/units.js';
import 'build/src/app/units/states/tasks/inbox/inbox.js';
import 'build/src/app/units/states/tasks/tasks.js';
import 'build/src/app/units/states/tasks/viewer/directives/directives.js';
import 'build/src/app/units/states/tasks/viewer/viewer.js';
import 'build/src/app/units/states/tasks/definition/definition.js';
Expand Down Expand Up @@ -203,6 +202,7 @@ import {FooterComponent} from './common/footer/footer.component';
import {TaskAssessmentCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-assessment-card/task-assessment-card.component';
import {TaskSubmissionCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component';
import {InboxComponent} from './units/states/tasks/inbox/inbox.component';
import {UnitsTasksStateComponent} from './units/states/tasks/tasks.component';
import {TaskDefinitionEditorComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component';
import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
import {UnitTaskEditorComponent} from './units/states/edit/directives/unit-tasks-editor/unit-task-editor.component';
Expand Down Expand Up @@ -242,6 +242,26 @@ import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/p
import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
import {TutorNotesComponent} from './projects/states/tutor-notes/tutor-notes.component';

angular.module('doubtfire.units.states.tasks', [
'doubtfire.units.states.tasks.inbox',
'doubtfire.units.states.tasks.definition',
'doubtfire.units.states.tasks.moderation',
'doubtfire.units.states.tasks.overflow',
'doubtfire.units.states.tasks.viewer',
])
.config(($stateProvider: any) => {
$stateProvider.state('units/tasks', {
abstract: true,
parent: 'units/index',
url: '/tasks',
template: '<f-units-tasks-state></f-units-tasks-state>',
data: {
pageTitle: '_Home_',
roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
},
});
});

export const DoubtfireAngularJSModule = angular
.module('doubtfire', [
'doubtfire.config',
Expand Down Expand Up @@ -417,6 +437,10 @@ DoubtfireAngularJSModule.directive(
downgradeComponent({component: TasksViewerComponent}),
);
DoubtfireAngularJSModule.directive('fInbox', downgradeComponent({component: InboxComponent}));
DoubtfireAngularJSModule.directive(
'unitsTasksState',
downgradeComponent({component: UnitsTasksStateComponent}),
);
DoubtfireAngularJSModule.directive(
'fTaskDueCard',
downgradeComponent({component: TaskDueCardComponent}),
Expand Down
70 changes: 0 additions & 70 deletions src/app/units/states/tasks/tasks.coffee

This file was deleted.

1 change: 1 addition & 0 deletions src/app/units/states/tasks/tasks.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<ui-view></ui-view>
Empty file.
85 changes: 85 additions & 0 deletions src/app/units/states/tasks/tasks.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { StateService, TransitionService, Transition } from '@uirouter/angular';
import { TaskService } from 'src/app/api/services/task.service';

@Component({
selector: 'f-units-tasks-state',
templateUrl: 'tasks.component.html',
styleUrls: ['tasks.component.scss'],
})
export class UnitsTasksStateComponent implements OnInit, OnDestroy {
taskData: {
taskKey: unknown;
source: unknown;
selectedTask: unknown;
taskDefMode: boolean;
onSelectedTaskChange: (task: unknown) => void;
};

private deregisterTransition: Function;

constructor(
private stateService: StateService,
private transitionService: TransitionService,
private taskService: TaskService,
) {}

ngOnInit(): void {
this.taskData = {
taskKey: null,
source: null,
selectedTask: null,
taskDefMode: false,
onSelectedTaskChange: (task: unknown) => {
// Bug fix 4: cleaner taskKey assignment — only call taskKey() if task exists
this.taskData.taskKey = (task as {taskKey: () => unknown})?.taskKey() ?? null;
// Bug fix 3: avoid redundant $state.go — only navigate if task exists
if (task) {
this.setTaskKeyAsUrlParams(task);
}
},
};

// Read initial taskKey from URL on load
// Bug fix 1: null-safe parsing — guard against missing params
const initialKey = this.stateService.params?.['taskKey'];
this.setTaskKeyFromUrlParams(initialKey);

// Listen for state transitions to keep taskKey in sync
this.deregisterTransition = this.transitionService.onStart({to: 'units/tasks.**'}, (trans: Transition) => {
const toParams = trans.params('to');
const fromState = trans.from();
const toState = trans.to();
const fromParams = trans.params('from');

// Bug fix 2: force taskKeyString to a string to avoid type mismatches
const taskKeyString = toParams['taskKey'] != null ? String(toParams['taskKey']) : null;
this.setTaskKeyFromUrlParams(taskKeyString);

// Bug fix 5: safer preventDefault — also check that states are defined before comparing
if (fromState?.name && fromState.name === toState?.name && fromParams['unitId'] === toParams['unitId']) {
return false;
}
});
}

ngOnDestroy(): void {
if (this.deregisterTransition) {
this.deregisterTransition();
}
}

private setTaskKeyAsUrlParams(task: unknown): void {
this.stateService.go(
this.stateService.$current.name,
{taskKey: (task as {taskKeyToUrlString: () => string})?.taskKeyToUrlString()},
{notify: false },
);
}

private setTaskKeyFromUrlParams(taskKeyString: string | null): void {
if (taskKeyString) {
this.taskData.taskKey = this.taskService.taskKeyFromString(taskKeyString);
}
}
}