Temporary removal of validation in criteria search

OpenSILEX · Dec 11, 2023 · 30bbbdc · 30bbbdc
1 parent aa74ba7
commit 30bbbdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/opensilex-front/front/src/components/common/views/ModalListBuilder.vue b/opensilex-front/front/src/components/common/views/ModalListBuilder.vue
@@ -68,7 +68,6 @@
               <p>{{modalExplanation}}</p>
             </div>
 
-            <ValidationObserver ref="validatorRef">
               <div
                   v-for="(singleLine, index) in lineList"
                   v-bind:key="index"
@@ -92,7 +91,6 @@
                   ></opensilex-Button>
                 </div>
               </div>
-            </ValidationObserver>
 
             <div class="add-criteria-button-container">
               <opensilex-Button
@@ -114,7 +112,6 @@
 
 <script lang="ts">
 import { BModal } from 'bootstrap-vue';
-import { ValidationObserver } from 'vee-validate';
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import { Prop, Ref } from 'vue-property-decorator';
@@ -127,7 +124,6 @@ interface LineData{
 @Component
 export default class ModalListBuilder<T extends LineData, LineOutputClass> extends Vue {
 
-  @Ref("validatorRef") readonly validatorRef!: InstanceType<typeof ValidationObserver>;
   @Ref("modalRef") readonly modalRef!: BModal;
 
   /**
@@ -265,12 +261,11 @@ export default class ModalListBuilder<T extends LineData, LineOutputClass> exten
 
   async hide(validate: boolean) {
     if (validate) {
-      if(await this.validatorRef.validate()){
         this.setOnLastValidateParameters();
         this.setOutputList();
         this.modalRef.hide();
         this.treeselectRefreshKey += 1;
-      }
+
     }else{
       this.idCount = this.idCountOnLastValidate;
       this.lineList = this.lineListOnLastValidate.map(e=>e);

diff --git a/opensilex-front/front/src/components/scientificObjects/CriteriaSearchModalLine.vue b/opensilex-front/front/src/components/scientificObjects/CriteriaSearchModalLine.vue
@@ -4,14 +4,14 @@
         label="CriteriaSearchModalLine.variable"
         :variables.sync="lineData.variable_uri"
         :multiple="false"
-        :required="true"
+        :required="false"
         @select="loadVariableInformation($event)"
         class="col-md-5"
     ></opensilex-VariableSelector>
     <opensilex-CriteriaOperatorSelector
         :operator.sync="lineData.criteria_operator"
         :rules="lineData.criteria_rules"
-        :required="true"
+        :required="false"
         @select="loadCriteriaInformation($event)"
         class="col-md-2"
     ></opensilex-CriteriaOperatorSelector>
@@ -23,7 +23,7 @@
           type="number"
           rules="integer"
           :disabled="criteriaOperatorIsIsNotMeasured()"
-          :required="!criteriaOperatorIsIsNotMeasured()"
+          :required="false"
           placeholder="XSDIntegerInput.placeholder"
       ></opensilex-InputForm>
       <opensilex-InputForm
@@ -33,14 +33,14 @@
           type="number"
           rules="decimal"
           :disabled="criteriaOperatorIsIsNotMeasured()"
-          :required="!criteriaOperatorIsIsNotMeasured()"
+          :required="false"
           placeholder="XSDDecimalInput.placeholder"
       ></opensilex-InputForm>
       <opensilex-DateForm
           v-else-if="$opensilex.checkURIs(lineData.datatype, Xsd.DATE)"
           label="CriteriaSearchModalLine.value"
           :value.sync="lineData.value"
-          :required="!criteriaOperatorIsIsNotMeasured()"
+          :required="false"
           :disabled="criteriaOperatorIsIsNotMeasured()"
           class="searchFilter"
       ></opensilex-DateForm>
@@ -49,7 +49,7 @@
           label="CriteriaSearchModalLine.value"
           :value.sync="lineData.value"
           :disabled="criteriaOperatorIsIsNotMeasured()"
-          :required="!criteriaOperatorIsIsNotMeasured()"
+          :required="false"
       ></opensilex-DateTimeForm>
       <opensilex-SelectForm
           v-else-if="$opensilex.checkURIs(lineData.datatype, Xsd.BOOLEAN)"
@@ -58,7 +58,7 @@
           :multiple="false"
           placeholder="CriteriaSearchModalLine.boolean-field-placeholder"
           :showCount="false"
-          :required="!criteriaOperatorIsIsNotMeasured()"
+          :required="false"
           :disabled="criteriaOperatorIsIsNotMeasured()"
           :options="trueFalseList"
       ></opensilex-SelectForm>