-
- {{t "general.terms"}}
-
-
- {{#if (is-array this.vocabularies)}}
-
- {{#each this.vocabularies as |vocabulary|}}
-
- {{else}}
-
- {{/if}}
+
+
+ {{t "general.terms"}}
+
+
+ {{#if (is-array this.vocabularies)}}
+
+ {{#each this.vocabularies as |vocabulary|}}
+
+ {{else}}
+
+ {{/if}}
+
+
+ {{else}}
+
+
+ {{t "general.sessionTypes"}}
+
+
+ {{#if (is-array this.sessionTypes)}}
+
+ {{#each this.sessionTypes as |type|}}
+
+
+ {{type.title}}
+
+
+ {{/each}}
+
+ {{else}}
+
+ {{/if}}
+
-
-{{else}}
-
-
- {{t "general.sessionTypes"}}
-
-
- {{#if (is-array this.sessionTypes)}}
+
+
+ {{t "general.courseLevels"}}
+
+
- {{#each this.sessionTypes as |type|}}
+ {{#each this.courseLevels as |level|}}
- {{type.title}}
+ {{level}}
{{/each}}
- {{else}}
-
- {{/if}}
-
-
-
-
- {{t "general.courseLevels"}}
-
-
-
- {{#each this.courseLevels as |level|}}
-
-
- {{level}}
-
-
- {{/each}}
-
+
-
-
-{{/if}}
+
+ {{/if}}
+
\ No newline at end of file
diff --git a/packages/ilios-common/addon/components/dashboard/calendar.hbs b/packages/ilios-common/addon/components/dashboard/calendar.hbs
index bb0df9aeaa..70500ae104 100644
--- a/packages/ilios-common/addon/components/dashboard/calendar.hbs
+++ b/packages/ilios-common/addon/components/dashboard/calendar.hbs
@@ -3,8 +3,8 @@
data-test-dashboard-calendar
>
-
-
+
+
-
+
{{#if @showFilters}}
-
+
- {{#if this.showClearFilters}}
-
- {{t "general.clearFilters"}}
-
- {{/if}}
{{/if}}
- {{#unless @mySchedule}}
-
+ {{#if @mySchedule}}
+ {{#if this.showUserContextFilters}}
+
+
+
+ {{/if}}
+ {{else}}
+
{{#if this.hasMoreThanOneSchool}}
-
+
{{#each (sort-by "title" @allSchools) as |school|}}
- {{/unless}}
-
- {{#if (and @showFilters this.bestSelectedSchool)}}
-
+ {{/if}}
+ {{#if (and @showFilters this.bestSelectedSchool)}}
+
+
[
- this.getCohortProxies.bind(this),
- this.bestSelectedSchool,
- ]);
+ @action
+ setUserContext(userContext) {
+ this.dashboardStorage?.set('userContext', userContext);
+ }
+
+ @cached
+ get cohortProxiesData() {
+ return new TrackedAsyncData(this.getCohortProxies(this.bestSelectedSchool));
+ }
+
+ get cohortProxies() {
+ return this.cohortProxiesData.isResolved ? this.cohortProxiesData.value : [];
+ }
+
+ get showUserContextFilters() {
+ return this.currentUser.performsNonLearnerFunction;
+ }
get fromTimeStamp() {
if ('week' === this.args.selectedView) {
@@ -58,32 +72,63 @@ export default class DashboardCalendarComponent extends Component {
return 1;
}
- constructor() {
- super(...arguments);
- this.setup.perform();
+ @cached
+ get userData() {
+ return new TrackedAsyncData(this.currentUser.getModel());
+ }
+
+ get user() {
+ return this.userData.isResolved ? this.userData.value : null;
+ }
+
+ @cached
+ get usersPrimarySchoolData() {
+ return new TrackedAsyncData(this.user?.school);
+ }
+
+ get usersPrimarySchool() {
+ return this.usersPrimarySchoolData.isResolved ? this.usersPrimarySchoolData.value : null;
}
- setup = dropTask(async () => {
- const user = await this.currentUser.getModel();
- this.usersPrimarySchool = await user.school;
+ get icsFeedKey() {
+ return this.user?.icsFeedKey;
+ }
- const icsFeedKey = user.icsFeedKey;
+ get absoluteIcsUri() {
+ if (!this.icsFeedKey) {
+ return '';
+ }
const apiHost = this.iliosConfig.apiHost;
const loc = window.location.protocol + '//' + window.location.hostname;
const server = apiHost ? apiHost : loc;
- this.absoluteIcsUri = server + '/ics/' + icsFeedKey;
- });
+ return server + '/ics/' + this.icsFeedKey;
+ }
+
+ @cached
+ get eventsData() {
+ return new TrackedAsyncData(
+ this.loadEvents(this.bestSelectedSchool, this.fromTimeStamp, this.toTimeStamp),
+ );
+ }
+
+ get events() {
+ return this.eventsData.isResolved ? this.eventsData.value : [];
+ }
+
+ get isLoadingEvents() {
+ return this.eventsData.isPending;
+ }
- loadEvents = restartableTask(async (event, [school, fromTimeStamp, toTimeStamp]) => {
+ async loadEvents(school, fromTimeStamp, toTimeStamp) {
if (!school || !fromTimeStamp || !toTimeStamp) {
- return;
+ return [];
}
if (this.args.mySchedule) {
- this.ourEvents = await this.userEvents.getEvents(fromTimeStamp, toTimeStamp);
+ return this.userEvents.getEvents(fromTimeStamp, toTimeStamp);
} else {
- this.ourEvents = await this.schoolEvents.getEvents(school.id, fromTimeStamp, toTimeStamp);
+ return this.schoolEvents.getEvents(school.id, fromTimeStamp, toTimeStamp);
}
- });
+ }
async getCohortProxies(school) {
if (!school) {
@@ -130,12 +175,13 @@ export default class DashboardCalendarComponent extends Component {
'eventsWithSelectedCohorts',
'eventsWithSelectedCourses',
'eventsWithSelectedTerms',
+ 'eventsWithSelectedUserContext',
];
const allFilteredEvents = eventTypes.map((name) => {
return this[name];
});
- return this.ourEvents.filter((event) => {
+ return this.events.filter((event) => {
return allFilteredEvents.every((arr) => {
return arr.includes(event);
});
@@ -156,30 +202,30 @@ export default class DashboardCalendarComponent extends Component {
get eventsWithSelectedSessionTypes() {
if (!this.args.selectedSessionTypeIds?.length) {
- return this.ourEvents;
+ return this.events;
}
const selectedIds = this.args.selectedSessionTypeIds.map(Number);
- return this.ourEvents.filter((event) => {
+ return this.events.filter((event) => {
return selectedIds.includes(event.sessionTypeId);
});
}
get eventsWithSelectedCourseLevels() {
if (!this.args.selectedCourseLevels?.length) {
- return this.ourEvents;
+ return this.events;
}
const levels = this.args.selectedCourseLevels.map(Number);
- return this.ourEvents.filter((event) => {
+ return this.events.filter((event) => {
return levels.includes(event.courseLevel);
});
}
get eventsWithSelectedCohorts() {
if (!this.args.selectedCohortIds?.length) {
- return this.ourEvents;
+ return this.events;
}
const selectedIds = this.args.selectedCohortIds.map(Number);
- return this.ourEvents.filter((event) => {
+ return this.events.filter((event) => {
const matchingCohorts = event.cohorts.filter(({ id }) => selectedIds.includes(id));
return matchingCohorts.length > 0;
});
@@ -187,26 +233,46 @@ export default class DashboardCalendarComponent extends Component {
get eventsWithSelectedCourses() {
if (!this.args.selectedCourseIds?.length) {
- return this.ourEvents;
+ return this.events;
}
const selectedIds = this.args.selectedCourseIds.map(Number);
- return this.ourEvents.filter((event) => {
+ return this.events.filter((event) => {
return selectedIds.includes(event.course);
});
}
get eventsWithSelectedTerms() {
if (!this.args.selectedTermIds?.length) {
- return this.ourEvents;
+ return this.events;
}
const selectedIds = this.args.selectedTermIds.map(Number);
- return this.ourEvents.filter((event) => {
+ return this.events.filter((event) => {
const allTerms = mapBy([].concat(event.sessionTerms || [], event.courseTerms || []), 'id');
const matchingTerms = allTerms.filter((id) => selectedIds.includes(id));
return matchingTerms.length > 0;
});
}
+ get eventsWithSelectedUserContext() {
+ if (!this.userContext) {
+ return this.events;
+ }
+
+ return this.events.filter((event) => {
+ if ('administrator' === this.userContext) {
+ // TODO: Replace this with Set.intersect() once that becomes
+ // available in all browsers, or polyfill it. [ST 2024/06/20].
+ // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set/intersection
+ return (
+ event.userContexts.includes('course administrator') ||
+ event.userContexts.includes('course director') ||
+ event.userContexts.includes('session administrator')
+ );
+ }
+ return event.userContexts.includes(this.userContext);
+ });
+ }
+
@action
changeSchool(event) {
this.args.changeSchool(event.target.value);
diff --git a/packages/ilios-common/addon/components/dashboard/filter-tags.hbs b/packages/ilios-common/addon/components/dashboard/filter-tags.hbs
index c65b0e18d6..c226e69679 100644
--- a/packages/ilios-common/addon/components/dashboard/filter-tags.hbs
+++ b/packages/ilios-common/addon/components/dashboard/filter-tags.hbs
@@ -3,6 +3,7 @@
class="filters-list"
{{did-insert (perform this.load) this.activeFilters}}
{{did-update (perform this.load) this.activeFilters}}
+ data-test-dashboard-filter-tags
>
{{#if this.filterTags}}