Merge branch 'develop' into feature/digital/SSR-476

src/digital-components/textbox-question/textbox-question.vue

@@ -183,6 +183,9 @@ export default {
             },
         },
     },
+    mounted() {
+        this.$emit("textboxQuestionEvent.inputIdAssigned", this.inputId);
+    },
     watch: {
         async value(newValue) {
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation

src/layouts/service-location/service-location.spec.js

@@ -113,28 +113,6 @@ describe("updating service zip", () => {
         expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeQuestion);
     });
 
-    test("resets appointment type selection when service zip code is updated by service zip modal", () => {
-        // Arrange
-        const { wrapper } = setupMocks({});
-
-        const serviceZipCodeComponent = wrapper.findComponent({
-            ref: "serviceZipCodeQuestion",
-        });
-
-        const newServiceZipCodeQuestion = {
-            zipCode: "61606",
-            state: "IL",
-        };
-
-        wrapper.vm.selectedAppointmentType = "Inshop";
-
-        // Act
-        serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
-
-        // Assert
-        expect(wrapper.vm.selectedAppointmentType).toStrictEqual(null);
-    });
-
     test("displays military zip message when zip is updated", () => {
         // Arrange
         const { wrapper } = setupMocks({});

src/layouts/service-location/service-location.vue

@@ -146,10 +146,6 @@ export default {
                 };
             },
             set: function (newValue) {
-                if (newValue.zipCode !== this.zipCode) {
-                    this.selectedAppointmentType = null;
-                }
-
                 this.zipCode = newValue.zipCode;
                 this.state = newValue.state;