Pārlūkot izejas kodu

refactor autocomplete data name

tripeur 4 gadi atpakaļ
vecāks
revīzija
59faac107e

+ 2 - 2
src/PlanningPage.vue

@@ -30,7 +30,7 @@ import cHeader from "@/components/Header.vue";
 import importJsonState from "@/mixins/ImportJsonState";
 import Toast from "./utils/Toast";
 import Benevole from "./models/Benevole";
-import AutocompleteValues from "./models/AutocompleteOptions";
+import AutocompleteOptions from "./models/AutocompleteOptions";
 
 const API_URL = process.env.VUE_APP_API_URL;
 const uuidv4check = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
@@ -51,7 +51,7 @@ export default defineComponent({
     benevoleList(): Array<Benevole> {
       return this.$store.state.benevoleList;
     },
-    autocompleteData(): Array<AutocompleteValues> {
+    autocompleteData(): Array<AutocompleteOptions> {
       return this.benevoleList.map((o) => {
         return { id: o.id.toString(), name: o.fullname };
       });

+ 5 - 5
src/components/AutoCompleteInput.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script lang="ts">
-import AutocompleteValues from "@/models/AutocompleteOptions";
+import AutocompleteOptions from "@/models/AutocompleteOptions";
 import { defineComponent, PropType } from "vue";
 import toast from "@/utils/Toast";
 export default defineComponent({
@@ -47,7 +47,7 @@ export default defineComponent({
       type: String,
     },
     autocompleteList: {
-      type: Array as PropType<Array<AutocompleteValues>>,
+      type: Array as PropType<Array<AutocompleteOptions>>,
       default: () => [],
     },
     placeholder: { type: String, default: () => "" },
@@ -77,11 +77,11 @@ export default defineComponent({
     },
   },
   computed: {
-    filtredAutocomplete(): Array<AutocompleteValues> {
+    filtredAutocomplete(): Array<AutocompleteOptions> {
       const lower = this.value.toLowerCase();
       return this.autocompleteList.filter((o) => o.name.toLowerCase().includes(lower));
     },
-    displayedAutocomplete(): Array<AutocompleteValues> {
+    displayedAutocomplete(): Array<AutocompleteOptions> {
       return this.filtredAutocomplete.slice(0, this.limit);
     },
     showAutocomplete(): boolean {
@@ -108,7 +108,7 @@ export default defineComponent({
         }
       }
     },
-    toggle(v: AutocompleteValues, e: MouseEvent) {
+    toggle(v: AutocompleteOptions, e: MouseEvent) {
       e.stopPropagation();
       this.expanded = false;
       this.value = v.name;

+ 2 - 2
src/components/EditeurBenevole.vue

@@ -79,7 +79,7 @@ import styledInput from "./input.vue";
 import chipsInput from "./SelectChipInput.vue";
 import { defineComponent, PropType } from "vue";
 import { MutationTypes } from "@/store/Mutations";
-import AutocompleteValues from "@/models/AutocompleteOptions";
+import AutocompleteOptions from "@/models/AutocompleteOptions";
 
 export default defineComponent({
   name: "EditeurBenevole",
@@ -107,7 +107,7 @@ export default defineComponent({
     },
   },
   computed: {
-    autocompleteList(): Array<AutocompleteValues> {
+    autocompleteList(): Array<AutocompleteOptions> {
       return this.competenceList.map((contraint) => {
         return { id: contraint.id.toString(), name: contraint.fullname };
       });

+ 2 - 2
src/components/EditeurQuestionnaireQuestion.vue

@@ -70,7 +70,7 @@ import { Question, QuestionCompetence, QuestionType } from "@/models/Questionnai
 import styledInput from "@/components/input.vue";
 import chipsInput from "@/components/SelectChipInput.vue";
 import Competence from "@/models/Competence";
-import AutocompleteValues from "@/models/AutocompleteOptions";
+import AutocompleteOptions from "@/models/AutocompleteOptions";
 import "@/assets/css/button-group.css";
 
 export default defineComponent({
@@ -200,7 +200,7 @@ export default defineComponent({
     },
   },
   computed: {
-    autocompleteList(): Array<AutocompleteValues> {
+    autocompleteList(): Array<AutocompleteOptions> {
       return this.potentialCompetences.map((o) => ({ id: o.id.toString(), name: o.name }));
     },
   },

+ 4 - 4
src/components/SelectChipInput.vue

@@ -48,7 +48,7 @@
 
 <script lang="ts">
 import "@/assets/css/chip.css";
-import AutocompleteValues from "@/models/AutocompleteOptions";
+import AutocompleteOptions from "@/models/AutocompleteOptions";
 import { defineComponent, PropType } from "vue";
 interface selectItem {
   index: number;
@@ -69,10 +69,10 @@ export default defineComponent({
     },
     /*
      * Potential values that could be selected by the user
-     * type Array<String> | Array<AutocompleteValues>
+     * type Array<String> | Array<AutocompleteOptions>
      */
     autocompleteList: {
-      type: Array as PropType<Array<string | AutocompleteValues>>,
+      type: Array as PropType<Array<string | AutocompleteOptions>>,
       default: () => [],
     },
     placeholder: {
@@ -125,7 +125,7 @@ export default defineComponent({
     },
     updateItems(): void {
       this.items = this.autocompleteList.map(
-        (o: AutocompleteValues | string, idx: number): selectItem => {
+        (o: AutocompleteOptions | string, idx: number): selectItem => {
           let id: string, txt: string, classes: string;
           if (typeof o == "object") {
             id = "id" in o ? o.id : o;

+ 1 - 1
src/models/AutocompleteOptions.ts

@@ -1,4 +1,4 @@
-export default interface AutocompleteValues {
+export default interface AutocompleteOptions {
   id: string;
   name: string;
   class?: string;

+ 2 - 2
src/views/PlanningViewManager.vue

@@ -60,7 +60,7 @@ import SelectChipInput from "@/components/SelectChipInput.vue";
 import PlanningViewRenderer from "@/components/PlanningViewRenderer.vue";
 import { v4 as uuidv4 } from "uuid";
 import { defineComponent } from "vue";
-import AutocompleteValues from "@/models/AutocompleteOptions";
+import AutocompleteOptions from "@/models/AutocompleteOptions";
 
 const API_URL = process.env.VUE_APP_API_URL;
 
@@ -74,7 +74,7 @@ export default defineComponent({
     };
   },
   computed: {
-    autocompleteList(): Array<AutocompleteValues> {
+    autocompleteList(): Array<AutocompleteOptions> {
       return this.$store.state.creneauGroupList
         .filter((r) => r.parentId == "")
         .map((o) => {