Merge pull request #7786 from stopfstedt/user-events-roles-filter

Adds user context filter to dashboard calendar

packages/frontend/config/environment.js

@@ -47,6 +47,11 @@ module.exports = function (environment) {
         visualNoiseLevel: 1,
       },
     },
+    'ember-local-storage': {
+      namespace: true,
+      keyDelimiter: '/',
+      includeEmberDataSupport: false,
+    },
     fontawesome: {
       enableExperimentalBuildTimeTransform: false,
       defaultPrefix: 'fas',

packages/frontend/tests/acceptance/dashboard/week-test.js

@@ -1,4 +1,4 @@
-import { currentRouteName } from '@ember/test-helpers';
+import { currentRouteName, findAll } from '@ember/test-helpers';
 import { DateTime } from 'luxon';
 import { module, test } from 'qunit';
 import { setupAuthentication, freezeDateAt, unfreezeDate } from 'ilios-common';
@@ -9,9 +9,11 @@ import percySnapshot from '@percy/ember';
 
 module('Acceptance | Dashboard Week at a Glance', function (hooks) {
   setupApplicationTest(hooks);
+
   const today = DateTime.fromObject({ hour: 8 });
 
   hooks.beforeEach(async function () {
+    this.intl = this.owner.lookup('service:intl');
     this.school = this.server.create('school');
     this.user = await setupAuthentication({ school: this.school });
   });
@@ -133,6 +135,51 @@ module('Acceptance | Dashboard Week at a Glance', function (hooks) {
     assert.ok(true, 'no a11y errors found!');
   });
 
+  test('week summary displays the whole week', async function (assert) {
+    assert.expect(3);
+    const startOfTheWeek = DateTime.fromJSDate(
+      this.owner.lookup('service:locale-days').firstDayOfThisWeek,
+    ).set({ minute: 2 });
+    const endOfTheWeek = DateTime.fromJSDate(
+      this.owner.lookup('service:locale-days').lastDayOfThisWeek,
+    ).set({ hour: 22, minute: 5 });
+
+    this.server.create('userevent', {
+      user: this.user.id,
+      startDate: startOfTheWeek.toJSDate(),
+      endDate: startOfTheWeek.plus({ hour: 1 }).toJSDate(),
+      offering: 1,
+      isPublished: true,
+    });
+    this.server.create('userevent', {
+      user: this.user.id,
+      startDate: endOfTheWeek.toJSDate(),
+      endDate: endOfTheWeek.plus({ hour: 1 }).toJSDate(),
+      offering: 2,
+      isPublished: true,
+    });
+    const dashboard = '.dashboard-week';
+    const events = `${dashboard} .event`;
+
+    await page.visit();
+
+    const eventBLocks = findAll(events);
+    assert.strictEqual(eventBLocks.length, 2);
+    const options = {
+      weekday: 'long',
+      hour: 'numeric',
+      minute: 'numeric',
+    };
+    assert.strictEqual(
+      page.week.weekGlance.events[0].text,
+      'event 0 ' + this.intl.formatTime(startOfTheWeek.toJSDate(), options),
+    );
+    assert.strictEqual(
+      page.week.weekGlance.events[1].text,
+      'event 1 ' + this.intl.formatTime(endOfTheWeek.toJSDate(), options),
+    );
+  });
+
   test('calendar is active in dashboard navigation', async function (assert) {
     await page.visit();
     assert.notOk(page.navigation.calendar.isActive);

packages/ilios-common/.lint-todo

@@ -77,8 +77,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628da
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1720137600000|1722729600000|1725321600000|addon/components/course/visualize-instructors.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1720137600000|1722729600000|1725321600000|addon/components/course/visualize-session-type.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1720137600000|1722729600000|1725321600000|addon/components/course/visualize-term.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|105|6|105|6|1e67fb6d3c62d7707918389c0b1b072c756afbd2|1720137600000|1722729600000|1725321600000|addon/components/dashboard/calendar.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|106|6|106|6|448d60c76fbd9ee5aeb7219dde978518fcba1aea|1720137600000|1722729600000|1725321600000|addon/components/dashboard/calendar.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|9b56ba661238d88b20a82b6f8647d8e16a07b05f|1720137600000|1722729600000|1725321600000|addon/components/dashboard/courses-calendar-filter.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|23cd787c79c34a628dadb6e96dd4004d42eebb79|1720137600000|1722729600000|1725321600000|addon/components/dashboard/courses-calendar-filter.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|a90be151f45cd8ab32827e9247a9a9eb7f1baef2|1720137600000|1722729600000|1725321600000|addon/components/dashboard/courses-calendar-filter.hbs

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/dashboard/calendar-filters.js

@@ -0,0 +1,30 @@
+import { collection, create, text } from 'ember-cli-page-object';
+import c from './filter-checkbox';
+import cohortsFilter from './cohort-calendar-filter';
+import coursesFilter from './courses-calendar-filter';
+import selectedVocabulary from './selected-vocabulary';
+
+const definition = {
+  scope: '[data-test-dashboard-calendar-filters]',
+  coursesFilter,
+  sessionTypesFilter: {
+    scope: '[data-test-session-type-filter]',
+    title: text('h5'),
+    sessionTypes: collection('li', c),
+  },
+  vocabularyFilter: {
+    scope: '[data-test-vocabulary-filter]',
+    title: text('h5'),
+    sessionTypes: collection('li', c),
+    vocabularies: collection('[data-test-dashboard-selected-vocabulary]', selectedVocabulary),
+  },
+  courseLevelsFilter: {
+    scope: '[data-test-course-level-filter]',
+    title: text('h5'),
+    courseLevels: collection('li', c),
+  },
+  cohortsFilter,
+};
+
+export default definition;
+export const component = create(definition);

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/dashboard/calendar.js

@@ -1,15 +1,41 @@
-import { create } from 'ember-cli-page-object';
-import weeklyCalendar from './../weekly-calendar';
-import dailyCalendar from './../daily-calendar';
-import weekGlance from './../week-glance';
-import monthlyCalendar from './../monthly-calendar';
+import { collection, create, fillable, property } from 'ember-cli-page-object';
+import toggle from '../toggle-buttons';
+import userContextFilter from './user-context-filter';
+import filters from './calendar-filters';
+import filterTags from './filter-tags';
+import calendar from './../ilios-calendar';
 
 const definition = {
   scope: '[data-test-dashboard-calendar]',
-  dailyCalendar,
-  weekGlance,
-  weeklyCalendar,
-  monthlyCalendar,
+  controls: {
+    scope: '[data-test-dashboard-calendar-controls]',
+    mySchedule: {
+      scope: '[data-test-myschedule]',
+      toggle,
+    },
+    showFilters: {
+      scope: '[data-test-showfilters]',
+      toggle,
+    },
+    showCourseFilters: {
+      scope: '[data-test-showcoursefilters]',
+      toggle,
+    },
+    userContextFilter,
+    schoolPicker: {
+      scope: '[data-test-schoolpicker]',
+      select: {
+        scope: '[data-test-select-school]',
+        set: fillable(),
+        options: collection('option', {
+          isSelected: property('selected'),
+        }),
+      },
+    },
+    filters,
+  },
+  filterTags,
+  calendar,
 };
 
 export default definition;

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/dashboard/filter-tags.js

@@ -0,0 +1,12 @@
+import { collection, create } from 'ember-cli-page-object';
+
+const definition = {
+  scope: '[data-test-dashboard-filter-tags]',
+  tags: collection('[data-test-filter-tag]'),
+  clearAll: {
+    scope: '[data-test-clear-filters]',
+  },
+};
+
+export default definition;
+export const component = create(definition);

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/dashboard/user-context-filter.js

@@ -0,0 +1,32 @@
+import { attribute, clickable, create, hasClass, property, text } from 'ember-cli-page-object';
+
+const definition = {
+  scope: '[data-test-dashboard-user-context-filter]',
+  instructing: {
+    isChecked: property('checked', '[data-test-instructing-input]'),
+    label: text('[data-test-instructing-label]'),
+    toggle: clickable('[data-test-instructing-label]'),
+    isActive: hasClass('active', '[data-test-instructing-label]'),
+    ariaDescription: attribute('aria-description', '[data-test-instructing-label]'),
+    title: attribute('title', '[data-test-instructing-label]'),
+  },
+  learning: {
+    isChecked: property('checked', '[data-test-learning-input]'),
+    label: text('[data-test-learning-label]'),
+    toggle: clickable('[data-test-learning-label]'),
+    isActive: hasClass('active', '[data-test-learning-label]'),
+    ariaDescription: attribute('aria-description', '[data-test-learning-label]'),
+    title: attribute('title', '[data-test-learning-label]'),
+  },
+  admin: {
+    isChecked: property('checked', '[data-test-admin-input]'),
+    label: text('[data-test-admin-label]'),
+    toggle: clickable('[data-test-admin-label]'),
+    isActive: hasClass('active', '[data-test-admin-label]'),
+    ariaDescription: attribute('aria-description', '[data-test-admin-label]'),
+    title: attribute('title', '[data-test-admin-label]'),
+  },
+};
+
+export default definition;
+export const component = create(definition);

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/weekly-calendar-event.js

@@ -1,4 +1,4 @@
-import { attribute, create, hasClass, isPresent, text } from 'ember-cli-page-object';
+import { attribute, create, hasClass, isPresent, text, triggerable } from 'ember-cli-page-object';
 
 const definition = {
   scope: '[data-test-weekly-calendar-event]',
@@ -15,6 +15,11 @@ const definition = {
   isScheduled: isPresent('[data-test-scheduled-icon]'),
   isDraft: isPresent('[data-test-draft-icon]'),
   wasRecentlyUpdated: isPresent('[data-test-recently-updated-icon]'),
+  mouseOver: triggerable('mouseover'),
+  tooltip: {
+    scope: '[data-test-ilios-calendar-event-tooltip]',
+    resetScope: true,
+  },
 };
 
 export default definition;