diff --git a/web/app/components/custom-editable-field.hbs b/web/app/components/custom-editable-field.hbs index 14cc80daf..8f1ee8452 100644 --- a/web/app/components/custom-editable-field.hbs +++ b/web/app/components/custom-editable-field.hbs @@ -6,6 +6,6 @@ @onChange={{if this.typeIsPeople this.onPeopleSelectChange}} @onSave={{if this.typeIsPeople this.onPeopleSave @onSave}} @isSaving={{@isSaving}} - @disabled={{@disabled}} + @isReadOnly={{@disabled}} /> diff --git a/web/app/components/document/sidebar.hbs b/web/app/components/document/sidebar.hbs index 18d544011..143d8137c 100644 --- a/web/app/components/document/sidebar.hbs +++ b/web/app/components/document/sidebar.hbs @@ -106,7 +106,7 @@ @value={{this.title}} @onSave={{this.saveTitle}} @isSaving={{this.saveIsRunning}} - @disabled={{not this.isOwner}} + @isReadOnly={{not this.isOwner}} @isRequired={{true}} @name="title" @tag="h1" @@ -127,7 +127,7 @@ @value={{this.summary}} @onSave={{this.saveSummary}} @isSaving={{this.saveIsRunning}} - @disabled={{not this.isOwner}} + @isReadOnly={{not this.isOwner}} @name="summary" @placeholder="Enter a summary" /> @@ -200,7 +200,7 @@ @onChange={{this.updateContributors}} @onSave={{perform this.save "contributors"}} @isSaving={{this.saveIsRunning}} - @disabled={{not this.isOwner}} + @isReadOnly={{not this.isOwner}} /> @@ -216,7 +216,7 @@ @onChange={{this.updateApprovers}} @onSave={{perform this.save "approvers"}} @isSaving={{this.saveIsRunning}} - @disabled={{this.editingIsDisabled}} + @isReadOnly={{this.editingIsDisabled}} {{! Provide the document to the `has-approved-doc` helper }} @document={{@document}} /> diff --git a/web/app/components/editable-field.hbs b/web/app/components/editable-field.hbs index 6da8157a9..7ee80ac5f 100644 --- a/web/app/components/editable-field.hbs +++ b/web/app/components/editable-field.hbs @@ -71,7 +71,7 @@ {{/if}} - {{#if (or @disabled @isSaving)}} + {{#if (or @isReadOnly @isSaving)}}
- {{#unless @disabled}} + {{#unless @isReadOnly}} diff --git a/web/app/components/editable-field.ts b/web/app/components/editable-field.ts index e8b16c209..a6274480c 100644 --- a/web/app/components/editable-field.ts +++ b/web/app/components/editable-field.ts @@ -16,7 +16,7 @@ interface EditableFieldComponentSignature { onSave: any; // TODO: type this onChange?: (value: any) => void; // TODO: type this isSaving?: boolean; - disabled?: boolean; + isReadOnly?: boolean; isRequired?: boolean; name?: string; placeholder?: string; diff --git a/web/tests/integration/components/editable-field-test.ts b/web/tests/integration/components/editable-field-test.ts index 1b1f48ad6..050c8f0f8 100644 --- a/web/tests/integration/components/editable-field-test.ts +++ b/web/tests/integration/components/editable-field-test.ts @@ -100,7 +100,7 @@ module("Integration | Component | editable-field", function (hooks) { `); diff --git a/web/tsconfig.json b/web/tsconfig.json index cce1854e1..604bdb589 100644 --- a/web/tsconfig.json +++ b/web/tsconfig.json @@ -25,7 +25,6 @@ "tests/**/*", "types/**/*", "node_modules/@gavant/glint-template-types/types/ember-animated/*", - "node_modules/@gavant/glint-template-types/types/ember-click-outside/modifier.d.ts", "node_modules/@gavant/glint-template-types/types/ember-concurrency/perform.d.ts", "node_modules/@gavant/glint-template-types/types/ember-on-helper/on-document.d.ts", "node_modules/@gavant/glint-template-types/types/ember-render-modifiers/*", diff --git a/web/types/glint/index.d.ts b/web/types/glint/index.d.ts index 72546dd52..c9961148f 100644 --- a/web/types/glint/index.d.ts +++ b/web/types/glint/index.d.ts @@ -40,7 +40,6 @@ import AnimatedValue from "ember-animated/components/animated-value"; import AnimatedOrphans from "ember-animated/components/animated-orphans"; import { AnimatedIfCurly } from "ember-animated/components/animated-if"; import { FlashMessageComponent } from "ember-cli-flash/flash-message"; -import OnClickOutsideModifier from "ember-click-outside/modifiers/on-click-outside"; import { HdsFormErrorComponent } from "hds/form/error"; import PowerSelectMultiple from "ember-power-select/components/power-select-multiple"; @@ -50,7 +49,6 @@ declare module "@glint/environment-ember-loose/registry" { "did-insert": typeof DidInsertModifier; "will-destroy": typeof WillDestroyModifier; "on-document": typeof OnDocumentHelper; - "click-outside": typeof OnClickOutsideModifier; "set-body-class": typeof EmberSetBodyClassHelper; AnimatedContainer: typeof AnimatedContainer; AnimatedValue: typeof AnimatedValue;