Skip to content

Migrate/root controller #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Thirus224849242 wants to merge 5 commits into
base: 10.0.x
Choose a base branch
from
Open

Migrate/root controller #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b54c692
feat: create initial files for migration of root-controller
Thirus224849242 Mar 29, 2026
9ecd077
feat: downgrade root-controller component for angularjs
Thirus224849242 Mar 29, 2026
a38835d
feat: downgrade root-controller component for angularjs
Thirus224849242 Mar 29, 2026
201bb0f
feat: remove root-controller from angularjs config
Thirus224849242 Mar 29, 2026
00622c8
feat: remove old root-controller coffeescript file and clean up
Thirus224849242 Mar 29, 2026
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
1 change: 0 additions & 1 deletion src/app/config/config.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ angular.module('doubtfire.config', [
'doubtfire.config.routing'
'doubtfire.config.analytics'
'doubtfire.config.runtime'
'doubtfire.config.root-controller'
'doubtfire.config.debug'
'doubtfire.config.privacy-policy'
])
8 changes: 0 additions & 8 deletions src/app/config/root-controller/root-controller.coffee
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions src/app/config/root-controller/root-controller.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import {Component} from '@angular/core';
import {GlobalStateService} from '../../projects/states/index/global-state.service';

@Component({
selector: 'f-root-controller',
template: '',
})
export class RootControllerComponent {
constructor(private globalStateService: GlobalStateService) {}
}
2 changes: 2 additions & 0 deletions src/app/doubtfire-angular.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import {
import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
import {FTaskBadgeComponent} from 'src/app/common/task-badge/task-badge.component';
import {DoubtfireAngularJSModule} from 'src/app/doubtfire-angularjs.module';
import {RootControllerComponent} from './config/root-controller/root-controller.component';
import {HttpAuthenticationInterceptor} from './common/services/http-authentication.interceptor';
import {
visualisationsProvider,
Expand Down Expand Up @@ -517,6 +518,7 @@ const GANTT_CHART_CONFIG = {
FeedbackAppealModalComponent,
ConfirmModerationModalComponent,
TaskClaimComponent,
RootControllerComponent,
],
providers: [
// Services we provide
Expand Down
12 changes: 10 additions & 2 deletions src/app/doubtfire-angularjs.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ import 'build/src/app/tasks/task-ilo-alignment/task-ilo-alignment-viewer/task-il
import 'build/src/app/config/privacy-policy/privacy-policy.js';
import 'build/src/app/config/runtime/runtime.js';
import 'build/src/app/config/config.js';
import 'build/src/app/config/root-controller/root-controller.js';
import 'build/src/app/config/routing/routing.js';
import 'build/src/app/config/vendor-dependencies/vendor-dependencies.js';
import 'build/src/app/config/analytics/analytics.js';
Expand Down Expand Up @@ -241,6 +240,7 @@ import {TaskPlannerComponent} from './projects/states/plan/task-planner/task-pla
import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component';
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';
import {RootControllerComponent} from './config/root-controller/root-controller.component';

export const DoubtfireAngularJSModule = angular
.module('doubtfire', [
Expand All @@ -260,7 +260,11 @@ export const DoubtfireAngularJSModule = angular
$locationProvider.html5Mode(true);
},
]);

DoubtfireAngularJSModule.controller('AppCtrl', [
function () {
// Root controller - intentionally empty, replaced by Angular
},
]);
// Downgrade angular modules that we need...
// factory -> service
DoubtfireAngularJSModule.factory('AboutDoubtfireModal', downgradeInjectable(AboutDoubtfireModal));
Expand Down Expand Up @@ -349,6 +353,10 @@ DoubtfireAngularJSModule.directive(
'taskCommentComposer',
downgradeComponent({component: TaskCommentComposerComponent}),
);
DoubtfireAngularJSModule.directive(
'appCtrl',
downgradeComponent({component: RootControllerComponent}),
);
DoubtfireAngularJSModule.directive(
'objectSelect',
downgradeComponent({component: ObjectSelectComponent}),
Expand Down