From 973d65ca0078f18bd9612990e3a9838277e2fe21 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 5 Jul 2023 07:30:37 +0100
Subject: [PATCH] Set blank default date for added_on repository filters
 [SCI-8744]

---
 .../filters/repositoryDateTimeValue.vue           |  2 +-
 app/javascript/vue/shared/date_picker.vue         | 15 ++++++++++-----
 app/javascript/vue/shared/date_time_picker.vue    |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue
index 4947a84ce..4af82b992 100644
--- a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue
+++ b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue
@@ -11,7 +11,7 @@
     <template v-if="!isPreset">
       <div class="datetime-filter-attributes">
         <div class="filter-datepicker-input">
-          <DateTimePicker @change="updateDate" :selectorId="`DatePicker${filter.id}`" :defaultValue="date || fallbackDate()" />
+          <DateTimePicker @change="updateDate" :selectorId="`DatePicker${filter.id}`" :defaultValue="null" />
         </div>
         <div class="between-delimiter vertical" v-if="operator == 'between'"></div>
         <div class="filter-datepicker-to-input">
diff --git a/app/javascript/vue/shared/date_picker.vue b/app/javascript/vue/shared/date_picker.vue
index 31338dda5..d7581405b 100644
--- a/app/javascript/vue/shared/date_picker.vue
+++ b/app/javascript/vue/shared/date_picker.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="datepicker sci-input-container right-icon">
-      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder="" />
+      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder="dd/mm/yyyy" />
       <i class="sn-icon sn-icon-calendar"></i>
   </div>
 </template>
@@ -11,7 +11,7 @@
     props: {
       selectorId: { type: String, required: true },
       useCurrent: { type: Boolean, default: true },
-      defaultValue: { type: Date, default: true }
+      defaultValue: { type: Date, default: null }
     },
     mounted() {
       $("#" + this.selectorId).datetimepicker(
@@ -22,14 +22,19 @@
           format: this.dateFormat,
           date: this.defaultValue
         }
-      );
-      this.update($("#" + this.selectorId).data("DateTimePicker").date());
+        );
+      if(this.isValidDate(this.defaultValue)) {
+        this.update($("#" + this.selectorId).data("DateTimePicker").date());
+      }
       $("#" + this.selectorId).on('dp.change', (e) => this.update(e.date))
     },
     methods: {
       update(value) {
         this.$emit('change', (value._isAMomentObject) ? value.toDate() : '');
-      }
+      },
+      isValidDate(date) {
+        return (date instanceof Date) && !isNaN(date.getTime());
+      },
     }
   }
 </script>
diff --git a/app/javascript/vue/shared/date_time_picker.vue b/app/javascript/vue/shared/date_time_picker.vue
index 732e9617d..5f750a2b2 100644
--- a/app/javascript/vue/shared/date_time_picker.vue
+++ b/app/javascript/vue/shared/date_time_picker.vue
@@ -34,6 +34,7 @@
         this.updateDateTime();
       },
       getTime(dateTime) {
+        if(!this.isValidDate(dateTime)) return
         return `${dateTime.getHours().toString().padStart(2, '0')}:${dateTime.getMinutes().toString().padStart(2, '0')}`
       },
       updateTime(value) {