From 68c402ca3402a7210daf36cdd9eb67c63e181ab9 Mon Sep 17 00:00:00 2001 From: kahokago Date: Wed, 18 Feb 2026 08:07:37 +0000 Subject: [PATCH 1/2] Fixed SingleSelectPulldownInput component. --- .../single-select-pulldown-input/component.ts | 14 +-- .../single-select-pulldown-input/template.hbs | 3 +- .../singleselect-pulldown-input/component.ts | 85 ------------------- .../singleselect-pulldown-input/styles.scss | 9 -- .../singleselect-pulldown-input/template.hbs | 26 ------ .../single-select-pulldown-input/component.js | 2 +- .../singleselect-pulldown-input/component.js | 2 - 7 files changed, 3 insertions(+), 138 deletions(-) delete mode 100644 lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/component.ts delete mode 100644 lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/styles.scss delete mode 100644 lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/template.hbs delete mode 100644 lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/component.js diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts index 6562416a5..0c61e9a40 100644 --- a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts +++ b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts @@ -26,7 +26,7 @@ export default class SingleSelectPulldownInput extends Component { onInput!: () => void; onMetadataInput!: () => void; - anotherOption?: string; + // anotherOption?: string; didReceiveAttrs() { assert( @@ -39,9 +39,6 @@ export default class SingleSelectPulldownInput extends Component { get optionBlockValues() { const options = this.optionBlocks .map(item => this.getLocalizedItemText(item)); - if (this.anotherOption) { - options.push(this.anotherOption); - } return options; } @@ -53,15 +50,6 @@ export default class SingleSelectPulldownInput extends Component { this.changeset.set(this.valuePath, result); this.onMetadataInput(); this.onInput(); - this.set('anotherOption', null); - } - - @action - onInputSearch(text: string) { - if (!this.optionBlocks.find(item => item.displayText === text || this.getLocalizedItemText(item) === text)) { - this.set('anotherOption', text); - } - return true; } getLocalizedItemText(item: SchemaBlock) { diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/template.hbs b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/template.hbs index 4fef23b8f..1e9468898 100644 --- a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/template.hbs +++ b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/template.hbs @@ -6,10 +6,9 @@ ...attributes > void; - onMetadataInput!: () => void; - - anotherOption?: string; - - didReceiveAttrs() { - assert( - 'SchemaBlockRenderer::Editable::SingleSelectPulldownInput requires optionBlocks to render', - Boolean(this.optionBlocks), - ); - } - - @computed('optionBlocks.[]', 'anotherOption') - get optionBlockValues() { - const options = this.optionBlocks - .map(item => this.getLocalizedItemText(item)); - if (this.anotherOption) { - options.push(this.anotherOption); - } - return options; - } - - @action - onChange(option: string) { - const code = (option || '').trim(); - const item = this.optionBlocks.find(b => code === b.displayText); - const result = item ? item.displayText : option; - this.changeset.set(this.valuePath, result); - this.onMetadataInput(); - this.onInput(); - this.set('anotherOption', null); - } - - @action - onInputSearch(text: string) { - if (!this.optionBlocks.find(item => item.displayText === text || this.getLocalizedItemText(item) === text)) { - this.set('anotherOption', text); - } - return true; - } - - getLocalizedItemText(item: SchemaBlock) { - const text = item.helpText || item.displayText; - if (text === undefined) { - return item.displayText; - } - return `${item.displayText}`; - } - - getLocalizedText(text: string) { - if (!text.includes('|')) { - return text; - } - const texts = text.split('|'); - if (this.intl.locale.includes('ja')) { - return texts[0]; - } - return texts[1]; - } -} diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/styles.scss b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/styles.scss deleted file mode 100644 index 462216f6a..000000000 --- a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/styles.scss +++ /dev/null @@ -1,9 +0,0 @@ -.schema-block-input { - :global(input) { - height: 40px; - background-color: $color-bg-gray-blue-light; - color: $color-text-gray-blue; - border-radius: 2px; - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); - } -} diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/template.hbs b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/template.hbs deleted file mode 100644 index 4fef23b8f..000000000 --- a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/template.hbs +++ /dev/null @@ -1,26 +0,0 @@ - - - - {{option}} - - - - \ No newline at end of file diff --git a/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.js b/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.js index 91d59780a..354b25160 100644 --- a/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.js +++ b/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.js @@ -1,2 +1,2 @@ export { default } from - 'osf-components/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/component'; + 'osf-components/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component'; diff --git a/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/component.js b/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/component.js deleted file mode 100644 index 354b25160..000000000 --- a/lib/osf-components/app/components/registries/schema-block-renderer/editable/rdm/singleselect-pulldown-input/component.js +++ /dev/null @@ -1,2 +0,0 @@ -export { default } from - 'osf-components/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component'; From fa1b4a503497a584123c3de49321b943b2b799d6 Mon Sep 17 00:00:00 2001 From: kahokago Date: Fri, 20 Feb 2026 08:07:10 +0000 Subject: [PATCH 2/2] Removed an unnecessary line. --- .../editable/rdm/single-select-pulldown-input/component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts index 0c61e9a40..64dcf37c0 100644 --- a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts +++ b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/rdm/single-select-pulldown-input/component.ts @@ -26,8 +26,6 @@ export default class SingleSelectPulldownInput extends Component { onInput!: () => void; onMetadataInput!: () => void; - // anotherOption?: string; - didReceiveAttrs() { assert( 'SchemaBlockRenderer::Editable::SingleSelectPulldownInput requires optionBlocks to render',