rename visualizer-course-X components to course/visualize-X-graph.

this should make it clear what namespace these belong to, and what their parent components are.
ilios · Jul 8, 2024 · 0476d0b · 0476d0b
1 parent 64f9655
commit 0476d0b
Show file tree

Hide file tree

Showing 86 changed files with 244 additions and 234 deletions.
diff --git a/...ualizer-course-instructor-session-type.js → ...isualize-instructor-session-type-graph.js b/...ualizer-course-instructor-session-type.js → ...isualize-instructor-session-type-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-instructor-session-type]',
+  scope: '[data-test-course-visualize-instructor-session-type-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/...ponents/visualizer-course-session-type.js → ...course/visualize-instructor-term-graph.js b/...ponents/visualizer-course-session-type.js → ...course/visualize-instructor-term-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-session-type]',
+  scope: '[data-test-course-visualize-instructor-term-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/...on/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor.js b/...on/addon-test-support/ilios-common/page-objects/components/course/visualize-instructor.js
@@ -1,6 +1,6 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import termsChart from '../visualizer-course-instructor-term';
-import sessionTypesChart from '../visualizer-course-instructor-session-type';
+import termsChart from './visualize-instructor-term-graph';
+import sessionTypesChart from './visualize-instructor-session-type-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-instructor]',

diff --git a/...onents/visualizer-course-session-types.js → ...nts/course/visualize-instructors-graph.js b/...onents/visualizer-course-session-types.js → ...nts/course/visualize-instructors-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-session-types]',
+  scope: '[data-test-course-visualize-instructors-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/...n/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors.js b/...n/addon-test-support/ilios-common/page-objects/components/course/visualize-instructors.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, fillable, text, value } from 'ember-cli-page-object';
-import instructorsChart from '../visualizer-course-instructors';
+import instructorsChart from './visualize-instructors-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-instructors]',

diff --git a/...omponents/visualizer-course-objectives.js → ...ents/course/visualize-objectives-graph.js b/...omponents/visualizer-course-objectives.js → ...ents/course/visualize-objectives-graph.js
@@ -1,7 +1,7 @@
 import { attribute, clickable, collection, create, notHasClass, text } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-objectives]',
+  scope: '[data-test-course-visualize-objectives-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/...on/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives.js b/...on/addon-test-support/ilios-common/page-objects/components/course/visualize-objectives.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import objectivesChart from '../visualizer-course-objectives';
+import objectivesChart from './visualize-objectives-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-objectives]',

diff --git a/...ents/visualizer-course-instructor-term.js → ...ts/course/visualize-session-type-graph.js b/...ents/visualizer-course-instructor-term.js → ...ts/course/visualize-session-type-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-instructor-term]',
+  scope: '[data-test-course-visualize-session-type-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/.../addon-test-support/ilios-common/page-objects/components/course/visualize-session-type.js b/.../addon-test-support/ilios-common/page-objects/components/course/visualize-session-type.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import sessionTypeChart from '../visualizer-course-session-type';
+import sessionTypeChart from './visualize-session-type-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-session-type]',

diff --git a/...mponents/visualizer-course-instructors.js → ...s/course/visualize-session-types-graph.js b/...mponents/visualizer-course-instructors.js → ...s/course/visualize-session-types-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-instructors]',
+  scope: '[data-test-course-visualize-session-types-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/...addon-test-support/ilios-common/page-objects/components/course/visualize-session-types.js b/...addon-test-support/ilios-common/page-objects/components/course/visualize-session-types.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, fillable, text, value } from 'ember-cli-page-object';
-import sessionTypesChart from '../visualizer-course-session-types';
+import sessionTypesChart from './visualize-session-types-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-session-types]',

diff --git a/...ponents/visualizer-course-vocabularies.js → ...ts/course/visualize-vocabularies-graph.js b/...ponents/visualizer-course-vocabularies.js → ...ts/course/visualize-vocabularies-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-vocabularies]',
+  scope: '[data-test-course-visualize-vocabularies-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/.../addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies.js b/.../addon-test-support/ilios-common/page-objects/components/course/visualize-vocabularies.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create } from 'ember-cli-page-object';
-import vocabulariesChart from '../visualizer-course-vocabularies';
+import vocabulariesChart from './visualize-vocabularies-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-vocabularies]',

diff --git a/...omponents/visualizer-course-vocabulary.js → ...ents/course/visualize-vocabulary-graph.js b/...omponents/visualizer-course-vocabulary.js → ...ents/course/visualize-vocabulary-graph.js
@@ -1,7 +1,7 @@
 import { collection, create, notHasClass } from 'ember-cli-page-object';
 
 const definition = {
-  scope: '[data-test-visualizer-course-vocabulary]',
+  scope: '[data-test-course-visualize-vocabulary-graph]',
   isIcon: notHasClass('no-icon'),
   chart: {
     scope: '.simple-chart',

diff --git a/...on/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary.js b/...on/addon-test-support/ilios-common/page-objects/components/course/visualize-vocabulary.js
@@ -1,5 +1,5 @@
 import { attribute, collection, create, text } from 'ember-cli-page-object';
-import termsChart from '../visualizer-course-vocabulary';
+import termsChart from './visualize-vocabulary-graph';
 
 const definition = create({
   scope: '[data-test-course-visualize-vocabulary]',

diff --git a/packages/ilios-common/addon-test-support/ilios-common/page-objects/sessions.js b/packages/ilios-common/addon-test-support/ilios-common/page-objects/sessions.js
@@ -1,5 +1,5 @@
 import { create, visitable } from 'ember-cli-page-object';
-import courseSessions from './components/course-sessions';
+import courseSessions from './components/course/sessions';
 
 export default create({
   visit: visitable('/courses/:courseId'),

diff --git a/packages/ilios-common/addon/components/course/objectives.hbs b/packages/ilios-common/addon/components/course/objectives.hbs
@@ -30,7 +30,7 @@
           @model={{@course}}
           aria-label={{t "general.visualizeCourseObjectives"}}
         >
-          <VisualizerCourseObjectives
+          <Course::VisualizeObjectivesGraph
             @course={{@course}}
             @width={{20}}
             @height={{20}}

diff --git a/packages/ilios-common/addon/components/course/visualizations.hbs b/packages/ilios-common/addon/components/course/visualizations.hbs
@@ -33,15 +33,15 @@
           <h4>
             {{t "general.objectives"}}
           </h4>
-          <VisualizerCourseObjectives @isIcon={{true}} @course={{@model}} @showDataTable={{false}} />
+          <Course::VisualizeObjectivesGraph @isIcon={{true}} @course={{@model}} @showDataTable={{false}} />
         </LinkTo>
       </div>
       <div data-test-visualize-session-types>
         <LinkTo @route="course-visualize-session-types" @model={{@model}}>
           <h4>
             {{t "general.sessionTypes"}}
           </h4>
-          <VisualizerCourseSessionTypes
+          <Course::VisualizeSessionTypesGraph
             @isIcon={{true}}
             @course={{@model}}
             @chartType="donut"
@@ -53,15 +53,15 @@
           <h4>
             {{t "general.vocabularies"}}
           </h4>
-          <VisualizerCourseVocabularies @isIcon={{true}} @course={{@model}} />
+          <Course::VisualizeVocabulariesGraph @isIcon={{true}} @course={{@model}} />
         </LinkTo>
       </div>
       <div data-test-visualize-instructors>
         <LinkTo @route="course-visualize-instructors" @model={{@model}}>
           <h4>
             {{t "general.instructors"}}
           </h4>
-          <VisualizerCourseInstructors
+          <Course::VisualizeInstructorsGraph
             @isIcon={{true}}
             @course={{@model}}
             @chartType="donut"

diff --git a/...alizer-course-instructor-session-type.hbs → ...sualize-instructor-session-type-graph.hbs b/...alizer-course-instructor-session-type.hbs → ...sualize-instructor-session-type-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-instructor-session-type {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-instructor-session-type
+  class="course-visualize-instructor-session-type-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-instructor-session-type-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}

diff --git a/...ualizer-course-instructor-session-type.js → ...isualize-instructor-session-type-graph.js b/...ualizer-course-instructor-session-type.js → ...isualize-instructor-session-type-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseInstructorSessionType extends Component {
+export default class CourseVisualizeInstructorSessionTypeGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/...nts/visualizer-course-instructor-term.hbs → ...ourse/visualize-instructor-term-graph.hbs b/...nts/visualizer-course-instructor-term.hbs → ...ourse/visualize-instructor-term-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-instructor-term {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-instructor-term
+  class="course-visualize-instructors-term-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-instructor-term-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}

diff --git a/...ents/visualizer-course-instructor-term.js → ...course/visualize-instructor-term-graph.js b/...ents/visualizer-course-instructor-term.js → ...course/visualize-instructor-term-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseInstructorTerm extends Component {
+export default class CourseVisualizeInstructorTermGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/packages/ilios-common/addon/components/course/visualize-instructor.hbs b/packages/ilios-common/addon/components/course/visualize-instructor.hbs
@@ -46,7 +46,7 @@
       <h4>
         {{t "general.terms"}}
       </h4>
-      <VisualizerCourseInstructorTerm
+      <Course::VisualizeInstructorTermGraph
         @course={{@course}}
         @user={{@user}}
       />
@@ -55,7 +55,7 @@
       <h4>
         {{t "general.sessionTypes"}}
       </h4>
-      <VisualizerCourseInstructorSessionType
+      <Course::VisualizeInstructorSessionTypeGraph
         @course={{@course}}
         @user={{@user}}
       />

diff --git a/...ponents/visualizer-course-instructors.hbs → ...ts/course/visualize-instructors-graph.hbs b/...ponents/visualizer-course-instructors.hbs → ...ts/course/visualize-instructors-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-instructors {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-instructors
+  class="course-visualize-instructors-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-instructors-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}

diff --git a/...mponents/visualizer-course-instructors.js → ...nts/course/visualize-instructors-graph.js b/...mponents/visualizer-course-instructors.js → ...nts/course/visualize-instructors-graph.js
@@ -12,7 +12,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseInstructors extends Component {
+export default class CourseVisualizeInstructorsGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/packages/ilios-common/addon/components/course/visualize-instructors.hbs b/packages/ilios-common/addon/components/course/visualize-instructors.hbs
@@ -43,7 +43,7 @@
       >
     </div>
     <div class="visualizations">
-      <VisualizerCourseInstructors @filter={{this.name}} @course={{@model}} />
+      <Course::VisualizeInstructorsGraph @filter={{this.name}} @course={{@model}} />
     </div>
   {{/unless}}
 </section>
diff --git a/...mponents/visualizer-course-objectives.hbs → ...nts/course/visualize-objectives-graph.hbs b/...mponents/visualizer-course-objectives.hbs → ...nts/course/visualize-objectives-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-objectives {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-objectives
+  class="course-visualize-objectives-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-objectives-graph
   ...attributes
 >
   {{#if this.isLoaded}}

diff --git a/...omponents/visualizer-course-objectives.js → ...ents/course/visualize-objectives-graph.js b/...omponents/visualizer-course-objectives.js → ...ents/course/visualize-objectives-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { mapBy, sortBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseObjectives extends Component {
+export default class CourseVisualizeObjectivesGraph extends Component {
   @service router;
   @service intl;
   @service dataLoader;

diff --git a/packages/ilios-common/addon/components/course/visualize-objectives.hbs b/packages/ilios-common/addon/components/course/visualize-objectives.hbs
@@ -31,6 +31,6 @@
     </LinkTo>
   </h3>
   <div class="visualizations">
-    <VisualizerCourseObjectives @course={{@model}} @showDataTable={{true}}/>
+    <Course::VisualizeObjectivesGraph @course={{@model}} @showDataTable={{true}}/>
   </div>
 </section>
diff --git a/...don/components/visualizer-course-term.hbs → ...s/course/visualize-session-type-graph.hbs b/...don/components/visualizer-course-term.hbs → ...s/course/visualize-session-type-graph.hbs
@@ -1,5 +1,7 @@
 <div
-  class="visualizer-course-term {{unless @isIcon "not-icon"}}"
+  class="course-visualize-session-type-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-session-type-graph
+  ...attributes
 >
   {{#if this.isLoaded}}
     {{#if (or @isIcon this.data.length)}}

diff --git a/...ponents/visualizer-course-session-type.js → ...ts/course/visualize-session-type-graph.js b/...ponents/visualizer-course-session-type.js → ...ts/course/visualize-session-type-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseSessionType extends Component {
+export default class CourseVisualizeSessionTypeGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/packages/ilios-common/addon/components/course/visualize-session-type.hbs b/packages/ilios-common/addon/components/course/visualize-session-type.hbs
@@ -38,7 +38,7 @@
       </LinkTo>
     </h3>
     <div class="visualizations">
-      <VisualizerCourseSessionType
+      <Course::VisualizeSessionTypeGraph
         @course={{@model.course}}
         @sessionType={{@model.sessionType}}
       />

diff --git a/...nents/visualizer-course-session-types.hbs → .../course/visualize-session-types-graph.hbs b/...nents/visualizer-course-session-types.hbs → .../course/visualize-session-types-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-session-types {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-session-types
+  class="course-visualize-session-types-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-session-types-graph
   ...attributes
 >
   {{#if (or @isIcon this.data.length)}}

diff --git a/...onents/visualizer-course-session-types.js → ...s/course/visualize-session-types-graph.js b/...onents/visualizer-course-session-types.js → ...s/course/visualize-session-types-graph.js
@@ -11,7 +11,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseSessionTypes extends Component {
+export default class CourseVisualizeSessionTypesGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/packages/ilios-common/addon/components/course/visualize-session-types.hbs b/packages/ilios-common/addon/components/course/visualize-session-types.hbs
@@ -41,6 +41,6 @@
     >
   </div>
   <div class="visualizations">
-    <VisualizerCourseSessionTypes @filter={{this.title}} @course={{@model}} />
+    <Course::VisualizeSessionTypesGraph @filter={{this.title}} @course={{@model}} />
   </div>
 </section>
diff --git a/...onents/visualizer-course-session-type.hbs → ...omponents/course/visualize-term-graph.hbs b/...onents/visualizer-course-session-type.hbs → ...omponents/course/visualize-term-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-session-type {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-session-type
+  class="course-visualize-term-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-term-graph
   ...attributes
 >
   {{#if this.isLoaded}}

diff --git a/...ddon/components/visualizer-course-term.js → ...components/course/visualize-term-graph.js b/...ddon/components/visualizer-course-term.js → ...components/course/visualize-term-graph.js
@@ -4,10 +4,15 @@ import { restartableTask, timeout } from 'ember-concurrency';
 import { service } from '@ember/service';
 import { cached, tracked } from '@glimmer/tracking';
 import { TrackedAsyncData } from 'ember-async-data';
-import { findBy, findById, mapBy, uniqueValues } from 'ilios-common/utils/array-helpers';
-import { uniqueById } from '../utils/array-helpers';
+import {
+  findBy,
+  findById,
+  mapBy,
+  uniqueById,
+  uniqueValues,
+} from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseTerm extends Component {
+export default class CourseVisualizeTermGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/packages/ilios-common/addon/components/course/visualize-term.hbs b/packages/ilios-common/addon/components/course/visualize-term.hbs
@@ -46,7 +46,7 @@
       </LinkTo>
     </h3>
     <div class="visualizations">
-      <VisualizerCourseTerm @course={{@model.course}} @term={{@model.term}} />
+      <Course::VisualizeTermGraph @course={{@model.course}} @term={{@model.term}} />
     </div>
   {{/unless}}
 </section>
diff --git a/...onents/visualizer-course-vocabularies.hbs → ...s/course/visualize-vocabularies-graph.hbs b/...onents/visualizer-course-vocabularies.hbs → ...s/course/visualize-vocabularies-graph.hbs
@@ -1,6 +1,6 @@
 <div
-  class="visualizer-course-vocabularies {{unless @isIcon "not-icon"}}"
-  data-test-visualizer-course-vocabularies
+  class="course-visualize-vocabularies-graph {{unless @isIcon "not-icon"}}"
+  data-test-course-visualize-vocabularies-graph
   ...attributes
 >
   {{#if this.isLoaded}}

diff --git a/...ponents/visualizer-course-vocabularies.js → ...ts/course/visualize-vocabularies-graph.js b/...ponents/visualizer-course-vocabularies.js → ...ts/course/visualize-vocabularies-graph.js
@@ -10,7 +10,7 @@ import { TrackedAsyncData } from 'ember-async-data';
 import AsyncProcess from 'ilios-common/classes/async-process';
 import { findBy, mapBy } from 'ilios-common/utils/array-helpers';
 
-export default class VisualizerCourseVocabularies extends Component {
+export default class CourseVisualizeVocabulariesGraph extends Component {
   @service router;
   @service intl;
   @tracked tooltipContent = null;

diff --git a/packages/ilios-common/addon/components/course/visualize-vocabularies.hbs b/packages/ilios-common/addon/components/course/visualize-vocabularies.hbs
@@ -32,6 +32,6 @@
     </LinkTo>
   </h3>
   <div class="visualizations">
-    <VisualizerCourseVocabularies @course={{@model}} />
+    <Course::VisualizeVocabulariesGraph @course={{@model}} />
   </div>
 </section>