Skip to content

reworks school competencies management workflow #9133

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

Draft
stopfstedt wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

reworks school competencies management workflow #9133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/frontend/app/components/school-manager.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import LeadershipExpanded from 'ilios-common/components/leadership-expanded';
import { fn } from '@ember/helper';
import LeadershipCollapsed from 'ilios-common/components/leadership-collapsed';
import hasManyLength from 'ilios-common/helpers/has-many-length';
import SchoolCompetenciesExpanded from 'frontend/components/school-competencies-expanded';
import SchoolCompetenciesCollapsed from 'frontend/components/school-competencies-collapsed';
import CompetenciesExpanded from 'frontend/components/school/competencies-expanded';
import CompetenciesCollapsed from 'frontend/components/school/competencies-collapsed';
import SchoolVocabulariesExpanded from 'frontend/components/school-vocabularies-expanded';
import SchoolVocabulariesCollapsed from 'frontend/components/school-vocabularies-collapsed';
import SchoolSessionTypesExpanded from 'frontend/components/school-session-types-expanded';
Expand Down Expand Up @@ -180,7 +180,7 @@ export default class SchoolManagerComponent extends Component {
/>
{{/if}}
{{#if (or (eq @school.competencies.length 0) @schoolCompetencyDetails)}}
<SchoolCompetenciesExpanded
<CompetenciesExpanded
@school={{@school}}
@canUpdate={{@canUpdateCompetency}}
@canDelete={{@canDeleteCompetency}}
Expand All @@ -191,7 +191,7 @@ export default class SchoolManagerComponent extends Component {
@setSchoolManageCompetencies={{@setSchoolManageCompetencies}}
/>
{{else}}
<SchoolCompetenciesCollapsed
<CompetenciesCollapsed
@school={{@school}}
@expand={{fn @setSchoolCompetencyDetails true}}
/>
Expand Down
0 ...ponents/school-competencies-collapsed.gjs → ...ponents/school/competencies-collapsed.gjs
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...mponents/school-competencies-expanded.gjs → ...mponents/school/competencies-expanded.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
import perform from 'ember-concurrency/helpers/perform';
import { or } from 'ember-truth-helpers';
import { fn } from '@ember/helper';
import SchoolCompetenciesManager from 'frontend/components/school-competencies-manager';
import SchoolCompetenciesList from 'frontend/components/school-competencies-list';
import CompetenciesManager from 'frontend/components/school/competencies-manager';
import CompetenciesList from 'frontend/components/school/competencies-list';
import {
faArrowRotateLeft,
faCaretDown,
Expand Down Expand Up @@ -190,7 +190,7 @@ export default class SchoolCompetenciesExpandedComponent extends Component {
</div>
<div class="school-competencies-expanded-content">
{{#if @isManaging}}
<SchoolCompetenciesManager
<CompetenciesManager
@canUpdate={{@canUpdate}}
@canDelete={{@canDelete}}
@canCreate={{@canCreate}}
Expand All @@ -199,7 +199,7 @@ export default class SchoolCompetenciesExpandedComponent extends Component {
@remove={{this.removeCompetency}}
/>
{{else if this.domains.length}}
<SchoolCompetenciesList @domains={{this.domains}} @canUpdate={{@canUpdate}} />
<CompetenciesList @domains={{this.domains}} @canUpdate={{@canUpdate}} />
{{/if}}
</div>
</section>
Expand Down
0 ...ts/school-competencies-list-item-pcrs.gjs → ...ts/school/competencies-list-item-pcrs.gjs
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ponents/school-competencies-list-item.gjs → ...ponents/school/competencies-list-item.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { action } from '@ember/object';
import { service } from '@ember/service';
import { TrackedAsyncData } from 'ember-async-data';
import { uniqueValues } from 'ilios-common/utils/array-helpers';
import SchoolCompetenciesListItemPcrs from 'frontend/components/school-competencies-list-item-pcrs';
import SchoolCompetenciesPcrsMapper from 'frontend/components/school-competencies-pcrs-mapper';
import CompetenciesListItemPcrs from 'frontend/components/school/competencies-list-item-pcrs';
import CompetenciesPcrsMapper from 'frontend/components/school/competencies-pcrs-mapper';

export default class SchoolCompetenciesListItemComponent extends Component {
@service store;
Expand Down Expand Up @@ -96,7 +96,7 @@ export default class SchoolCompetenciesListItemComponent extends Component {
<div class="grid-item {{if this.isDomain 'domain' 'competency'}}" data-test-title>
{{@competency.title}}
</div>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{@competency}}
@canUpdate={{@canUpdate}}
@setIsManaging={{this.setIsManaging}}
Expand All @@ -105,7 +105,7 @@ export default class SchoolCompetenciesListItemComponent extends Component {
@cancel={{this.cancel}}
/>
{{#if this.isManaging}}
<SchoolCompetenciesPcrsMapper
<CompetenciesPcrsMapper
@allPcrses={{this.allPcrses}}
@selectedPcrses={{this.selectedPcrses}}
@add={{this.addPcrsToBuffer}}
Expand Down
6 changes: 3 additions & 3 deletions ...p/components/school-competencies-list.gjs → ...p/components/school/competencies-list.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { TrackedAsyncData } from 'ember-async-data';
import { map } from 'rsvp';
import { sortBy } from 'ilios-common/utils/array-helpers';
import t from 'ember-intl/helpers/t';
import SchoolCompetenciesListItem from 'frontend/components/school-competencies-list-item';
import CompetenciesListItem from 'frontend/components/school/competencies-list-item';

export default class SchoolCompetenciesListComponent extends Component {
@cached
Expand Down Expand Up @@ -32,13 +32,13 @@ export default class SchoolCompetenciesListComponent extends Component {
<div class="grid-item">{{t "general.aamcPcrs"}}</div>
</div>
{{#each this.proxies as |proxy|}}
<SchoolCompetenciesListItem
<CompetenciesListItem
@competency={{proxy.domain}}
@isDomain={{true}}
@canUpdate={{@canUpdate}}
/>
{{#each proxy.competencies as |competency|}}
<SchoolCompetenciesListItem
<CompetenciesListItem
@competency={{competency}}
@isDomain={{false}}
@canUpdate={{@canUpdate}}
Expand Down
0 ...omponents/school-competencies-manager.gjs → ...omponents/school/competencies-manager.gjs
View file
Open in desktop
File renamed without changes.
0 ...nents/school-competencies-pcrs-mapper.gjs → ...nents/school/competencies-pcrs-mapper.gjs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...pp/components/competency-title-editor.gjs → ...onents/school/competency-title-editor.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import set from 'ember-set-helper/helpers/set';
import YupValidationMessage from 'ilios-common/components/yup-validation-message';
import focus from 'ilios-common/modifiers/focus';

export default class CompetencyTitleEditorComponent extends Component {
export default class SchoolCompetencyTitleEditorComponent extends Component {
@tracked title;

constructor() {
Expand All @@ -40,7 +40,7 @@ export default class CompetencyTitleEditorComponent extends Component {
this.validations.clearErrorDisplay();
});
<template>
<span class="competency-title-editor" data-test-competency-title-editor>
<span class="school-competency-title-editor" data-test-school-competency-title-editor>
{{#if @canUpdate}}
<EditableField
@value={{this.title}}
Expand Down
4 changes: 2 additions & 2 deletions ...rontend/app/components/new-competency.gjs → .../app/components/school/new-competency.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import perform from 'ember-concurrency/helpers/perform';
import LoadingSpinner from 'ilios-common/components/loading-spinner';
import YupValidationMessage from 'ilios-common/components/yup-validation-message';

export default class NewCompetencyComponent extends Component {
export default class SchoolNewCompetencyComponent extends Component {
@tracked title;

validations = new YupValidations(this, {
Expand Down Expand Up @@ -44,7 +44,7 @@ export default class NewCompetencyComponent extends Component {
this.title = null;
});
<template>
<div class="new-competency" data-test-new-competency ...attributes>
<div class="school-new-competency" data-test-school-new-competency ...attributes>
<input
type="text"
value={{this.title}}
Expand Down
10 changes: 5 additions & 5 deletions packages/frontend/app/styles/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
@forward "components/programyear-details";
@forward "components/programyear-header";
@forward "components/programyear-overview";
@forward "components/school-competencies-collapsed";
@forward "components/school-competencies-expanded";
@forward "components/school-competencies-list";
@forward "components/school-competencies-manager";
@forward "components/school-competencies-pcrs-mapper";
@forward "components/school-list";
@forward "components/school-manager";
@forward "components/school-new-vocabulary-form";
Expand Down Expand Up @@ -134,6 +129,11 @@
@forward "components/reports/subject-header";
@forward "components/reports/subjects-list";

@forward "components/school/competencies-collapsed";
@forward "components/school/competencies-expanded";
@forward "components/school/competencies-list";
@forward "components/school/competencies-manager";
@forward "components/school/competencies-pcrs-mapper";
@forward "components/school/emails";
@forward "components/school/emails-editor";

Expand Down
2 changes: 1 addition & 1 deletion ...onents/school-competencies-collapsed.scss → ...onents/school/competencies-collapsed.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "../ilios-common/mixins" as m;
@use "../../ilios-common/mixins" as m;

.school-competencies-collapsed {
@include m.collapsed-container(var(--orange));
Expand Down
2 changes: 1 addition & 1 deletion ...ponents/school-competencies-expanded.scss → ...ponents/school/competencies-expanded.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "../ilios-common/mixins" as m;
@use "../../ilios-common/mixins" as m;

.school-competencies-expanded {
@include m.detail-container(var(--orange));
Expand Down
2 changes: 1 addition & 1 deletion .../components/school-competencies-list.scss → .../components/school/competencies-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "../ilios-common/mixins" as m;
@use "../../ilios-common/mixins" as m;

@use "sass:color";

Expand Down
2 changes: 1 addition & 1 deletion ...mponents/school-competencies-manager.scss → ...mponents/school/competencies-manager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "../ilios-common/mixins" as m;
@use "../../ilios-common/mixins" as m;

.school-competencies-manager {
.domain {
Expand Down
2 changes: 1 addition & 1 deletion ...ents/school-competencies-pcrs-mapper.scss → ...ents/school/competencies-pcrs-mapper.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "../ilios-common/mixins" as m;
@use "../../ilios-common/mixins" as m;

.school-competencies-pcrs-mapper {
margin: 1em 2em;
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/tests/integration/components/competency-title-editor-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { module, test } from 'qunit';
import { setupRenderingTest } from 'frontend/tests/helpers';
import { render } from '@ember/test-helpers';
import { setupMirage } from 'frontend/tests/test-support/mirage';
import { component } from 'frontend/tests/pages/components/competency-title-editor';
import CompetencyTitleEditor from 'frontend/components/competency-title-editor';
import { component } from 'frontend/tests/pages/components/school/competency-title-editor';
import CompetencyTitleEditor from 'frontend/components/school/competency-title-editor';

module('Integration | Component | competency title editor', function (hooks) {
setupRenderingTest(hooks);
Expand Down
12 changes: 5 additions & 7 deletions ...ts/school-competencies-collapsed-test.gjs → ...ts/school/competencies-collapsed-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { module, test } from 'qunit';
import { setupRenderingTest } from 'frontend/tests/helpers';
import { setupMirage } from 'frontend/tests/test-support/mirage';
import { render } from '@ember/test-helpers';
import { component } from 'frontend/tests/pages/components/school-competencies-collapsed';
import SchoolCompetenciesCollapsed from 'frontend/components/school-competencies-collapsed';
import { component } from 'frontend/tests/pages/components/school/competencies-collapsed';
import CompetenciesCollapsed from 'frontend/components/school/competencies-collapsed';
import noop from 'ilios-common/helpers/noop';

module('Integration | Component | school competencies collapsed', function (hooks) {
module('Integration | Component | school/competencies-collapsed', function (hooks) {
setupRenderingTest(hooks);
setupMirage(hooks);

Expand All @@ -21,9 +21,7 @@ module('Integration | Component | school competencies collapsed', function (hook

this.set('school', schoolModel);
await render(
<template>
<SchoolCompetenciesCollapsed @school={{this.school}} @expand={{(noop)}} />
</template>,
<template><CompetenciesCollapsed @school={{this.school}} @expand={{(noop)}} /></template>,
);

assert.strictEqual(component.title.text, 'Competencies (3/4)');
Expand All @@ -44,7 +42,7 @@ module('Integration | Component | school competencies collapsed', function (hook
this.set('expand', () => assert.step('expand called'));
await render(
<template>
<SchoolCompetenciesCollapsed @school={{this.school}} @expand={{this.expand}} />
<CompetenciesCollapsed @school={{this.school}} @expand={{this.expand}} />
</template>,
);
await component.title.click();
Expand Down
10 changes: 5 additions & 5 deletions ...nts/school-competencies-expanded-test.gjs → ...nts/school/competencies-expanded-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
import { render } from '@ember/test-helpers';
import { setupMirage } from 'frontend/tests/test-support/mirage';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import { component } from 'frontend/tests/pages/components/school-competencies-expanded';
import SchoolCompetenciesExpanded from 'frontend/components/school-competencies-expanded';
import { component } from 'frontend/tests/pages/components/school/competencies-expanded';
import CompetenciesExpanded from 'frontend/components/school/competencies-expanded';
import noop from 'ilios-common/helpers/noop';

module('Integration | Component | school competencies expanded', function (hooks) {
module('Integration | Component | school/competencies-expanded', function (hooks) {
setupRenderingTest(hooks);
setupMirage(hooks);

Expand All @@ -31,7 +31,7 @@ module('Integration | Component | school competencies expanded', function (hooks
this.set('school', schoolModel);
await render(
<template>
<SchoolCompetenciesExpanded
<CompetenciesExpanded
@school={{this.school}}
@canUpdate={{true}}
@canDelete={{true}}
Expand All @@ -58,7 +58,7 @@ module('Integration | Component | school competencies expanded', function (hooks
this.set('school', schoolModel);
await render(
<template>
<SchoolCompetenciesExpanded
<CompetenciesExpanded
@school={{this.school}}
@canUpdate={{true}}
@canDelete={{true}}
Expand Down
20 changes: 10 additions & 10 deletions ...hool-competencies-list-item-pcrs-test.gjs → ...hool/competencies-list-item-pcrs-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { setupRenderingTest } from 'frontend/tests/helpers';
import { render } from '@ember/test-helpers';
import { setupMirage } from 'frontend/tests/test-support/mirage';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import { component } from 'frontend/tests/pages/components/school-competencies-list-item-pcrs';
import SchoolCompetenciesListItemPcrs from 'frontend/components/school-competencies-list-item-pcrs';
import { component } from 'frontend/tests/pages/components/school/competencies-list-item-pcrs';
import CompetenciesListItemPcrs from 'frontend/components/school/competencies-list-item-pcrs';
import noop from 'ilios-common/helpers/noop';

module('Integration | Component | school-competencies-list-item-pcrs', function (hooks) {
module('Integration | Component | school/competencies-list-item-pcrs', function (hooks) {
setupRenderingTest(hooks);
setupMirage(hooks);

Expand All @@ -32,7 +32,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competency}}
@canUpdate={{true}}
@setIsManaging={{(noop)}}
Expand All @@ -55,7 +55,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competency}}
@canUpdate={{true}}
@setIsManaging={{(noop)}}
Expand All @@ -81,7 +81,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competency}}
@canUpdate={{true}}
@setIsManaging={{this.manage}}
Expand All @@ -104,7 +104,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competency}}
@canUpdate={{true}}
@setIsManaging={{(noop)}}
Expand All @@ -126,7 +126,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competency}}
@canUpdate={{true}}
@setIsManaging={{(noop)}}
Expand All @@ -145,7 +145,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competencyModel}}
@canUpdate={{true}}
@setIsManaging={{(noop)}}
Expand All @@ -164,7 +164,7 @@ module('Integration | Component | school-competencies-list-item-pcrs', function
this.set('competency', this.competencyModel);
await render(
<template>
<SchoolCompetenciesListItemPcrs
<CompetenciesListItemPcrs
@competency={{this.competencyModel}}
@canUpdate={{false}}
@setIsManaging={{(noop)}}
Expand Down
Loading
Loading