chore: modified filter with save option

Signed-off-by: Crisciany Souza <[email protected]>

Author: Any97Cris

lib/Db/SignRequestMapper.php

@@ -551,13 +551,13 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, array
 				);
 			}
 			if (!empty($filter['start'])) {
-				$start = (new \DateTime('@'.$filter['start']))->format('Y-m-d H:i:s');
+				$start = (new \DateTime('@' . $filter['start'], new \DateTimeZone('UTC')))->format('Y-m-d H:i:s');
 				$qb->andWhere(
 					$qb->expr()->gte('f.created_at', $qb->createNamedParameter($start, IQueryBuilder::PARAM_STR))
 				);
 			}
 			if (!empty($filter['end'])) {
-				$end = (new \DateTime('@'.$filter['end']))->format('Y-m-d H:i:s');
+				$end = (new \DateTime('@' . $filter['end'], new \DateTimeZone('UTC')))->format('Y-m-d H:i:s');
 				$qb->andWhere(
 					$qb->expr()->lte('f.created_at', $qb->createNamedParameter($end, IQueryBuilder::PARAM_STR))
 				);

lib/Service/AccountService.php

@@ -233,7 +233,8 @@ public function getConfig(?IUser $user = null): array {
 		$info['hasSignatureFile'] = $this->hasSignatureFile($user);
 		$info['phoneNumber'] = $this->getPhoneNumber($user);
 		$info['isApprover'] = $this->validateHelper->userCanApproveValidationDocuments($user, false);
-		$info['grid_view'] = $this->getUserConfigByKey($user, 'grid_view') === '1';;
+		$info['grid_view'] = $this->getUserConfigByKey($user, 'grid_view') === '1';
+		;
 
 		return $info;
 	}

src/store/filters.js

@@ -27,7 +27,16 @@ export const useFiltersStore = defineStore('filter', {
 	actions: {
 		async onFilterUpdateChips(event) {
 			this.chips = { ...this.chips, [event.id]: [...event.detail] }
-			let value = this.chips['modified'][0]?.id;
+
+			emit('libresign:filters:update')
+			logger.debug('File list filter chips updated', { chips: event.detail })
+
+			console.log('onFilterUpdateChips')
+		},
+
+		async onFilterUpdateChipsAndSave(event) {
+			this.chips = { ...this.chips, [event.id]: [...event.detail] }
+			let value = this.chips['modified'][0]?.id || '';
 
 			await axios.put(generateOcsUrl('/apps/libresign/api/v1/account/config/{key}', { key: 'filter_modified' }), {
 				value,
@@ -37,6 +46,8 @@ export const useFiltersStore = defineStore('filter', {
 
 			emit('libresign:filters:update')
 			logger.debug('File list filter chips updated', { chips: event.detail })
+
+			console.log('onFilterUpdateChipsAndSave')
 		},
 	},
 })

src/views/FilesList/FileListFilter/FileListFilter.vue

@@ -20,7 +20,7 @@
 			</NcActionButton>
 			<NcActionButton class="files-list-filter__clear-button"
 				close-after-click
-				@click="$emit('reset-filter')">
+				@click="$emit('set-marked-filter')">
 				{{ t('files', 'Set marked filter') }}
 			</NcActionButton>
 		</template>

src/views/FilesList/FileListFilter/FileListFilterModified.vue

@@ -5,7 +5,8 @@
 <template>
 	<FileListFilter :is-active="isActive"
 		:filter-name="t('libresign', 'Modified')"
-		@reset-filter="resetFilter">
+		@reset-filter="resetFilter"
+		@set-marked-filter="setMarkedFilter">
 		<template #icon>
 			<NcIconSvgWrapper :path="mdiCalendarRange" />
 		</template>
@@ -132,8 +133,32 @@ export default {
 				this.selectedOption = null
 				this.timeRangeEnd = null
 				this.timeRangeStart = null
+				this.filtersStore.onFilterUpdateChipsAndSave({ detail: '', id: 'modified' })
 			}
 		},
+		setMarkedFilter(){
+
+			const chips = []
+
+			let preset = this.currentPreset
+
+			if (preset) {
+
+				chips.push({
+					start: preset.start,
+					end: preset.end,
+					icon: calendarSvg,
+					text: preset.label,
+					id: preset.id,
+					onclick: () => this.setPreset(),
+				})
+
+			} else {
+				this.resetFilter()
+			}
+
+			this.filtersStore.onFilterUpdateChipsAndSave({ detail: chips, id: 'modified' })
+		}
 	},
 }
 </script>