diff --git a/src/components/ItemComponents/NewItemForm.vue b/src/components/ItemComponents/NewItemForm.vue index aa969c15b3ec82ba9d90b67e9bcb4c38a607397f..570ef7df0b97a804d3ef1326754a182938b4adef 100644 --- a/src/components/ItemComponents/NewItemForm.vue +++ b/src/components/ItemComponents/NewItemForm.vue @@ -33,22 +33,22 @@ <!-- Select category --> <div class="mb-6"> <label - class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400" - id="selectCategoryLabel" - >Kategori</label + class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400" + id="selectCategoryLabel" + >Kategori</label > <select - v-model="v$.item.select.$model" - id="categories" - class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light" + v-model="v$.item.select.$model" + id="categories" + class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light" > <option class="text-gray-400" value="" disabled selected> Velg en kategori </option> <option - v-for="category in categories" - :key="category" - class="text-gray-900 text-sm" + v-for="category in categories" + :key="category" + class="text-gray-900 text-sm" > {{ category }} </option> @@ -56,9 +56,9 @@ <!-- error message for select box --> <div - class="text-error" - v-for="(error, index) of v$.item.select.$errors" - :key="index" + class="text-error" + v-for="(error, index) of v$.item.select.$errors" + :key="index" > <div class="text-error text-sm"> {{ error.$message }} @@ -66,6 +66,7 @@ </div> </div> + <!-- Grupper --> <div class="mb-6"> <label class="block text-sm font-medium text-gray-900 dark:text-gray-400" @@ -93,29 +94,6 @@ <label class="text-error text-sm block">{{ groupErrorMessage }}</label> </div> - <!-- error message for select box --> - <div - class="overflow-auto w-full h-32 mt-2 text-base list-none bg-white rounded divide-y divide-gray-100 dark:bg-gray-700" - > - <ul class="py-1" aria-labelledby="dropdownDefault"> - <li> - <div class="form-check" v-for="group in groups" :key="group"> - <input - - class="form-check-input appearance-none h-4 w-4 border border-gray-300 rounded-sm bg-white checked:bg-primary-medium checked:bg-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer" - type="checkbox" - :value="group.communityId" - @change="onChangeGroup($event)" - > - <label class="form-check-label inline-block text-gray-800"> - {{ group.name }} - </label> - </div> - </li> - </ul> - </div> - <label class="text-error text-sm block">{{ groupErrorMessage }}</label> - <!-- price --> <div class="mb-6 mt-4" :class="{ error: v$.item.price.$errors.length }"> <label diff --git a/tests/unit/component-tests/community-component-tests/add-new-item.spec.js b/tests/unit/component-tests/community-component-tests/add-new-item.spec.js index 9026411b4cfe97a22636a8eb1d54fa12a224bc0c..286a81848eb1b42f673d18a0f7bbc8db36af0aef 100644 --- a/tests/unit/component-tests/community-component-tests/add-new-item.spec.js +++ b/tests/unit/component-tests/community-component-tests/add-new-item.spec.js @@ -6,7 +6,6 @@ describe("addNewItem elements rendering", () => { const wrapper = shallowMount(AddNewItem); expect(wrapper.find("#titleLabel").text()).toMatch("Tittel"); - expect(wrapper.find("#selectCategoryLabel").text()).toMatch("Kategori"); expect(wrapper.find("#priceLabel").text()).toMatch("Pris"); expect(wrapper.find("#descriptionLabel").text()).toMatch("Beskrivelse"); expect(wrapper.find("#imageLabel").text()).toMatch("Bilde"); @@ -19,10 +18,6 @@ describe("addNewItem elements rendering", () => { await titleInput.setValue("Dyson"); expect(titleInput.element.value).toBe("Dyson"); - const selectedCategory = wrapper.find("#categories"); - await selectedCategory.setValue("Hage"); - expect(selectedCategory.element.value).toBe("Hage"); - const priceInput = wrapper.find("#price"); await priceInput.setValue(500); expect(priceInput.element.value).toBe("500");