build proper date transformer for route query binding

vue3/src/pages/SearchPage.vue

@@ -156,10 +156,11 @@ import RecipeCard from "@/components/display/RecipeCard.vue";
 import {useDisplay} from "vuetify";
 import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 import {useRouteQuery} from "@vueuse/router";
-import {stringToBool, toNumberArray} from "@/utils/utils";
+import {routeQueryDateTransformer, stringToBool, toNumberArray} from "@/utils/utils";
 import RandomIcon from "@/components/display/RandomIcon.vue";
 import {VRating, VSelect, VTextField} from "vuetify/components";
 import RatingField from "@/components/inputs/RatingField.vue";
+import {DateTime} from "luxon";
 
 const {t} = useI18n()
 const router = useRouter()
@@ -421,25 +422,24 @@ const filters = ref({
         modelValue: useRouteQuery('makenow', "false"),
     },
 
-    // cookedonGte: {
+    cookedonGte: {
-    //     id: 'cookedonGte',
+        id: 'cookedonGte',
-    //     label: 'Cooked after',
+        label: 'Cooked after',
-    //     hint: 'Only recipes that were cooked on or after the given date.',
+        hint: 'Only recipes that were cooked on or after the given date.',
-    //     enabled: false,
+        enabled: false,
-    //     default: null,
+        default: null,
-    //     is: VTextField,
+        is: VDateInput,
-    //     type: "date",
+        modelValue: useRouteQuery('cookedonGte', null, {transform: routeQueryDateTransformer}),
-    //     modelValue: useRouteQuery('cookedonGte', null, {transform: Date}),
+    },
-    // },
+    cookedonLte: {
-    // cookedonLte: {
+        id: 'cookedonLte',
-    //     id: 'cookedonLte',
+        label: 'Cooked before',
-    //     label: 'Cooked before',
+        hint: 'Only recipes that were cooked on or before the given date.',
-    //     hint: 'Only recipes that were cooked on or before the given date.',
+        enabled: false,
-    //     enabled: false,
+        default: null,
-    //     default: null,
+        is: VDateInput,
-    //     is: VDateInput,
+        modelValue: useRouteQuery('cookedonLte', null, {transform: routeQueryDateTransformer}),
-    //     modelValue: useRouteQuery('cookedonLte', null, {transform: Date}),
+    },
-    // },
 })
 
 /**

vue3/src/pages/TestPage.vue

@@ -1,88 +1,84 @@
 <template>
-    <v-file-input label="File input" v-model="image"></v-file-input>
+    <v-container>
-    <v-btn @click="imageToRecipe()">Upload</v-btn>
-    <v-textarea v-model="response"></v-textarea>
 
-    <hr class="mt-4">
+        <v-row>
-    <v-btn ref="dialogOpenerRef">REF</v-btn>
-    <v-btn @click="dialog = !dialog">model</v-btn>
-
-    <v-btn>
-        direct
-        <model-edit-dialog model="MealPlan" v-model="dialog" :item="defaultItem" :activator="activator"></model-edit-dialog>
-    </v-btn>
-
-    <template v-if="false">
-        <v-divider></v-divider>
-
-        <v-row class="mt-5">
             <v-col>
-                <v-text-field density="compact"></v-text-field>
+                <v-text-field v-model="dateTest1" label="Test 1 - text field type date" type="date"></v-text-field>
-
             </v-col>
             <v-col>
-                <model-select model="Food" density="compact"></model-select>
+                {{ dateTest1 }}
-
-            </v-col>
-        </v-row>
-        <v-row class="mt-5">
-            <v-col>
-
-                <v-text-field density="comfortable"></v-text-field>
-
-            </v-col>
-            <v-col>
-
-                <model-select model="Food" density="comfortable"></model-select>
-
-            </v-col>
-        </v-row>
-        <v-row class="mt-5">
-            <v-col>
-                <model-select model="Food"></model-select>
-                <v-text-field></v-text-field>
-            </v-col>
-            <v-col>
-
-                <model-select model="Food"></model-select>
             </v-col>
         </v-row>
 
-    </template>
+        <v-row>
+            <v-col>
+                <v-date-input v-model="dateTest2" label="Test 2 - date input"></v-date-input>
+            </v-col>
+            <v-col> {{ dateTest2 }}</v-col>
+        </v-row>
+
+        <v-row>
+            <v-col>
+                <v-date-input v-model="dateTest3" label="Test 3 - date input with routeQueryModel"></v-date-input>
+            </v-col>
+            <v-col> {{ dateTest3 }}</v-col>
+        </v-row>
 
 
+    </v-container>
 </template>
 
 <script setup lang="ts">
 
-
+import {computed, ref, toRaw, watch,} from "vue";
-import {ApiApi, MealPlan} from "@/openapi";
+import {VDateInput} from 'vuetify/labs/VDateInput'
-import {ref, useTemplateRef} from "vue";
+import {useRouteQuery} from "@vueuse/router";
-import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue";
 import {DateTime} from "luxon";
-import ModelSelect from "@/components/inputs/ModelSelect.vue";
-import {VueDraggable} from "vue-draggable-plus";
-import {useFileApi} from "@/composables/useFileApi";
-
-const {convertImageToRecipe, fileApiLoading} = useFileApi()
-
-const image = ref<null|File>(null)
-const response = ref('')
-
-const dialog = ref(false)
-const activator = useTemplateRef<Element>('dialogOpenerRef')
-
-const defaultItem = ref({
-    fromDate: DateTime.now().plus({day: 2}).toJSDate()
-} as MealPlan)
 
 
-function imageToRecipe() {
+const dateTest1 = ref(null)
-    if(image.value != null){
+const dateTest2 = ref(null)
-        convertImageToRecipe(image.value)
+
+const dateTest3 = useRouteQuery('cookedonGte', null, {
+    transform: {
+        get: (value: string | null | Date) => {
+
+            if (value == null) {
+                console.log('get null')
+                return null
+            } else {
+                console.log('get', new Date(value), (new Date(value)).getMonth())
+                return new Date(value)
+            }
+        },
+        set: value => {
+
+            if (value == null) {
+                console.log('-- set null')
+                return null
+            } else {
+                console.log('-- set', DateTime.fromJSDate(new Date(value)).toISODate())
+                return DateTime.fromJSDate(new Date(value)).toISODate()
+            }
+        }
     }
-}
+})
 
+const typeOfDateTest1 = computed(() => {
+    return dateTest1 instanceof Date
+})
+
+const typeOfDateTest2 = computed(() => {
+    return dateTest2 instanceof Date
+})
+
+watch(dateTest1, () => {
+    console.log(dateTest1.value, dateTest1.value.getMonth())
+})
+
+watch(dateTest2, () => {
+    console.log(dateTest2.value, dateTest2.value.getMonth())
+})
 
 </script>
 

vue3/src/utils/utils.ts

@@ -1,6 +1,7 @@
 import {getCookie} from "@/utils/cookie";
 import {Recipe, RecipeFromJSON, RecipeImageFromJSON, UserFileFromJSON} from "@/openapi";
 import {ErrorMessageType, PreparedMessage, useMessageStore} from "@/stores/MessageStore";
+import {DateTime} from "luxon";
 
 /**
  * Gets a nested property of an object given a dot-notation path.
@@ -70,4 +71,12 @@ export function stringToBool(param: string): boolean | undefined {
     } else {
         return undefined
     }
+}
+
+/**
+ * allows binding and transforming of dates to route query parameters
+ */
+export const routeQueryDateTransformer = {
+    get: (value: string | null | Date) => ((value == null) ? null : (new Date(value))),
+    set: (value: string | null | Date) => ((value == null) ? null : (DateTime.fromJSDate(new Date(value)).toISODate()))
 }