From 94a6cb35d0bc988530ad267bafe594509112506e Mon Sep 17 00:00:00 2001 From: Leonardo Giacone Date: Thu, 21 Nov 2024 16:26:28 +0100 Subject: [PATCH] refactor: rename nested VMs --- packages/admin-ui/src/Select/Select.tsx | 4 ++-- .../admin-ui/src/Select/SelectPresenter.test.ts | 14 +++++++------- packages/admin-ui/src/Select/SelectPresenter.ts | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/admin-ui/src/Select/Select.tsx b/packages/admin-ui/src/Select/Select.tsx index 3c3c9238df..6abf31fd90 100644 --- a/packages/admin-ui/src/Select/Select.tsx +++ b/packages/admin-ui/src/Select/Select.tsx @@ -489,14 +489,14 @@ const DecoratableSelect = (props: SelectProps) => { diff --git a/packages/admin-ui/src/Select/SelectPresenter.test.ts b/packages/admin-ui/src/Select/SelectPresenter.test.ts index bd1b4ef40a..77ced75390 100644 --- a/packages/admin-ui/src/Select/SelectPresenter.test.ts +++ b/packages/admin-ui/src/Select/SelectPresenter.test.ts @@ -3,31 +3,31 @@ import { SelectPresenter } from "./SelectPresenter"; describe("SelectPresenter", () => { const onValueChange = jest.fn(); - it("should return the compatible `selectTriggerVm` based on props", () => { + it("should return the compatible `vm.selectTrigger` based on props", () => { const onValueChange = jest.fn(); // `placeholder` { const presenter = new SelectPresenter(); presenter.init({ onValueChange, placeholder: "Custom placeholder" }); - expect(presenter.vm.selectTriggerVm.placeholder).toEqual("Custom placeholder"); + expect(presenter.vm.selectTrigger.placeholder).toEqual("Custom placeholder"); } { // default: no props const presenter = new SelectPresenter(); presenter.init({ onValueChange }); - expect(presenter.vm.selectTriggerVm.placeholder).toEqual("Select an option"); - expect(presenter.vm.selectTriggerVm.hasValue).toEqual(false); + expect(presenter.vm.selectTrigger.placeholder).toEqual("Select an option"); + expect(presenter.vm.selectTrigger.hasValue).toEqual(false); } }); - it("should return the compatible `selectOptionsVm` based on props", () => { + it("should return the compatible `vm.selectOptions` based on props", () => { // with `options` as string { const presenter = new SelectPresenter(); presenter.init({ onValueChange, options: ["Option 1", "Option 2"] }); - expect(presenter.vm.selectOptionsVm.options).toEqual([ + expect(presenter.vm.selectOptions.options).toEqual([ { value: "Option 1", label: "Option 1", @@ -78,7 +78,7 @@ describe("SelectPresenter", () => { } ] }); - expect(presenter.vm.selectOptionsVm.options).toEqual([ + expect(presenter.vm.selectOptions.options).toEqual([ { value: "option-1", label: "Option 1", diff --git a/packages/admin-ui/src/Select/SelectPresenter.ts b/packages/admin-ui/src/Select/SelectPresenter.ts index d1141b46ec..fe905841ed 100644 --- a/packages/admin-ui/src/Select/SelectPresenter.ts +++ b/packages/admin-ui/src/Select/SelectPresenter.ts @@ -13,8 +13,8 @@ interface SelectPresenterParams { interface ISelectPresenter { vm: { - selectTriggerVm: SelectTriggerVm; - selectOptionsVm: SelectOptionsVm; + selectTrigger: SelectTriggerVm; + selectOptions: SelectOptionsVm; }; init: (params: TParams) => void; changeValue: (value: string) => void; @@ -37,11 +37,11 @@ class SelectPresenter implements ISelectPresenter { get vm() { return { - selectTriggerVm: { + selectTrigger: { placeholder: this.params?.placeholder || "Select an option", hasValue: !!this.params?.value }, - selectOptionsVm: { + selectOptions: { options: this.options?.map(option => SelectOptionMapper.toFormatted(option)) ?? [] } };