refactor: rename nested VMs

webiny · Nov 21, 2024 · 94a6cb3 · 94a6cb3
1 parent f56f16b
commit 94a6cb3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/packages/admin-ui/src/Select/Select.tsx b/packages/admin-ui/src/Select/Select.tsx
@@ -489,14 +489,14 @@ const DecoratableSelect = (props: SelectProps) => {
         <SelectRenderer
             selectRootProps={{ ...selectRootProps }}
             selectTriggerProps={{
-                ...vm.selectTriggerVm,
+                ...vm.selectTrigger,
                 size,
                 variant,
                 startIcon,
                 endIcon,
                 invalid
             }}
-            selectOptionsProps={vm.selectOptionsVm}
+            selectOptionsProps={vm.selectOptions}
             onValueChange={changeValue}
             onValueReset={resetValue}
         />

diff --git 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
@@ -13,8 +13,8 @@ interface SelectPresenterParams {
 
 interface ISelectPresenter<TParams extends SelectPresenterParams = SelectPresenterParams> {
     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)) ?? []
             }
         };