Skip to content
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.

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

move course-* components into course directory and ditch the prefix. #7937

Merged
merged 2 commits into from
Jul 8, 2024
Merged
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
194 changes: 97 additions & 97 deletions packages/ilios-common/.lint-todo

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { clickable, count, create, collection, text } from 'ember-cli-page-object';
import objectives from './course/objectives';
import learningMaterials from './detail-learning-materials';
import meshTerms from './mesh-terms';
import taxonomies from './detail-taxonomies';
import collapsedTaxonomies from './collapsed-taxonomies';
import leadershipCollapsed from './leadership-collapsed';
import leadershipExpanded from './leadership-expanded';
import collapsedCompetencies from './collapsed-competencies';
import overview from './course-overview';
import header from './course-header';
import objectives from './objectives';
import learningMaterials from '../detail-learning-materials';
import meshTerms from '../mesh-terms';
import taxonomies from '../detail-taxonomies';
import collapsedTaxonomies from '../collapsed-taxonomies';
import leadershipCollapsed from '../leadership-collapsed';
import leadershipExpanded from '../leadership-expanded';
import collapsedCompetencies from '../collapsed-competencies';
import overview from './overview';
import header from './header';

export default create({
scope: '[data-test-ilios-course-details]',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { create, clickable, fillable, text, isVisible } from 'ember-cli-page-object';
import publicationMenu from './course/publication-menu';
import publicationStatus from './publication-status';
import publicationMenu from './publication-menu';
import publicationStatus from '../publication-status';
const definition = {
scope: '[data-test-course-header]',
title: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
isVisible,
value,
} from 'ember-cli-page-object';
import datePicker from './date-picker';
import datePicker from '../date-picker';

const definition = {
scope: '[data-test-course-overview]',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { clickable, create, fillable, text } from 'ember-cli-page-object';

import newSession from './new-session';
import sessionsGrid from './sessions-grid';
import sessionsGridHeader from './sessions-grid-header';
import newSession from '../new-session';
import sessionsGrid from '../sessions-grid';
import sessionsGridHeader from '../sessions-grid-header';

const definition = {
scope: '[data-test-course-sessions]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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-instructor-term-graph]',
isIcon: notHasClass('no-icon'),
chart: {
scope: '.simple-chart',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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-instructors-graph]',
isIcon: notHasClass('no-icon'),
chart: {
scope: '.simple-chart',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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-session-types-graph]',
isIcon: notHasClass('no-icon'),
chart: {
scope: '.simple-chart',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -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-vocabulary-graph]',
isIcon: notHasClass('no-icon'),
chart: {
scope: '.simple-chart',
Expand Down
Original file line number Diff line number Diff line change
@@ -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]',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { create, visitable } from 'ember-cli-page-object';

import details from './components/course-details';
import publicationcheck from './components/course-publicationcheck';
import details from './components/course/details';
import publicationcheck from './components/course/publicationcheck';

export default create({
visit: visitable('/courses/:courseId/publicationcheck'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { create, visitable } from 'ember-cli-page-object';

import publishAll from './components/publish-all-sessions';
import details from './components/course-details';
import details from './components/course/details';

export default create({
visit: visitable('/courses/:courseId/publishall'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-instructor';
import root from './components/course/visualize-instructor';

export default create({
visit: visitable('/data/courses/:courseId/instructors/:userId'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-instructors';
import root from './components/course/visualize-instructors';

export default create({
visit: visitable('/data/courses/:courseId/instructors'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-objectives';
import root from './components/course/visualize-objectives';

export default create({
visit: visitable('/data/courses/:courseId/objectives'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-session-type';
import root from './components/course/visualize-session-type';

export default create({
visit: visitable('/data/courses/:courseId/session-types/:sessionTypeId'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-session-types';
import root from './components/course/visualize-session-types';

export default create({
visit: visitable('/data/courses/:courseId/session-types'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-vocabularies';
import root from './components/course/visualize-vocabularies';

export default create({
visit: visitable('/data/courses/:courseId/vocabularies'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import root from './components/course-visualize-vocabulary';
import root from './components/course/visualize-vocabulary';

export default create({
visit: visitable('/data/courses/:courseId/vocabularies/:vocabularyId'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create, visitable } from 'ember-cli-page-object';
import visualizations from './components/course-visualizations';
import visualizations from './components/course/visualizations';

export default create({
visit: visitable('/data/courses/:courseId'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { create, visitable } from 'ember-cli-page-object';

import details from './components/course-details';
import details from './components/course/details';

export default create({
visit: visitable('/courses/:courseId'),
Expand Down
Original file line number Diff line number Diff line change
@@ -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'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
{{animate-loading "course" loadingTime=500}}
...attributes
>
<CourseHeader @course={{@course}} @editable={{and @editable this.notRolloverRoute}} />
<CourseOverview @course={{@course}} @editable={{and @editable this.notRolloverRoute}} />
<Course::Header @course={{@course}} @editable={{and @editable this.notRolloverRoute}} />
<Course::Overview @course={{@course}} @editable={{and @editable this.notRolloverRoute}} />
{{#if @showDetails}}
<CourseEditing
<Course::Editing
@course={{@course}}
@editable={{and @editable this.notRolloverRoute}}
@courseLeadershipDetails={{@courseLeadershipDetails}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { action } from '@ember/object';
import scrollIntoView from 'scroll-into-view';
import { service } from '@ember/service';

export default class IliosCourseDetailsComponent extends Component {
stopfstedt marked this conversation as resolved.
Show resolved Hide resolved
export default class CourseDetailsComponent extends Component {
@service router;

@action
Expand Down
6 changes: 3 additions & 3 deletions packages/ilios-common/addon/components/course/loader.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#let (load this.courseLoadingPromise) as |p|}}
{{#if p.isResolved}}
<IliosCourseDetails
<Course::Details
@course={{@course}}
@editable={{@editable}}
@showDetails={{@showDetails}}
Expand All @@ -20,8 +20,8 @@
<Course::BackToCourses />

<section aria-hidden="true" class="course-loader" {{animate-loading "course" finalOpacity=".75"}}>
<CourseHeader @course={{@course}} @editable={{false}} />
<CourseOverview @course={{@course}} @editable={{false}} />
<Course::Header @course={{@course}} @editable={{false}} />
<Course::Overview @course={{@course}} @editable={{false}} />

<div class="mock-detail-box" >
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@model={{@course}}
aria-label={{t "general.visualizeCourseObjectives"}}
>
<VisualizerCourseObjectives
<Course::VisualizeObjectivesGraph
@course={{@course}}
@width={{20}}
@height={{20}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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)}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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)}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading