5
5
import dayjs from '@/utils/datetime/dayjs' ;
6
6
import parseDateQueryParam from '@/utils/datetime/parse-date-query-param' ;
7
7
import { type SortOrder } from '@/utils/sort-by' ;
8
+ import DOMAIN_WORKFLOWS_ARCHIVAL_START_DAYS_CONFIG from '@/views/domain-workflows-archival/config/domain-workflows-archival-start-days.config' ;
8
9
import { type WorkflowStatusClosed } from '@/views/domain-workflows-archival/domain-workflows-archival-header/domain-workflows-archival-header.types' ;
9
10
import DOMAIN_WORKFLOWS_BASIC_START_DAYS_CONFIG from '@/views/domain-workflows-basic/config/domain-workflows-basic-start-days.config' ;
10
11
import { type WorkflowStatusBasicVisibility } from '@/views/domain-workflows-basic/domain-workflows-basic-filters/domain-workflows-basic-filters.types' ;
@@ -13,13 +14,15 @@ import isWorkflowStatus from '@/views/shared/workflow-status-tag/helpers/is-work
13
14
import { type WorkflowStatus } from '@/views/shared/workflow-status-tag/workflow-status-tag.types' ;
14
15
import { type WorkflowsHeaderInputType } from '@/views/shared/workflows-header/workflows-header.types' ;
15
16
17
+ const now = dayjs ( ) ;
18
+
16
19
const domainPageQueryParamsConfig : [
17
20
PageQueryParam < 'inputType' , WorkflowsHeaderInputType > ,
18
21
// Search input
19
22
PageQueryParam < 'search' , string > ,
20
23
PageQueryParamMultiValue < 'statuses' , Array < WorkflowStatus > | undefined > ,
21
24
PageQueryParam < 'timeRangeStart' , Date | undefined > ,
22
- PageQueryParam < 'timeRangeEnd' , Date | undefined > ,
25
+ PageQueryParam < 'timeRangeEnd' , Date > ,
23
26
PageQueryParam < 'sortColumn' , string > ,
24
27
PageQueryParam < 'sortOrder' , SortOrder > ,
25
28
// Query input
@@ -37,8 +40,8 @@ const domainPageQueryParamsConfig: [
37
40
'statusesArchival' ,
38
41
Array < WorkflowStatusClosed > | undefined
39
42
> ,
40
- PageQueryParam < 'timeRangeStartArchival' , Date | undefined > ,
41
- PageQueryParam < 'timeRangeEndArchival' , Date | undefined > ,
43
+ PageQueryParam < 'timeRangeStartArchival' , Date > ,
44
+ PageQueryParam < 'timeRangeEndArchival' , Date > ,
42
45
PageQueryParam < 'sortColumnArchival' , string > ,
43
46
PageQueryParam < 'sortOrderArchival' , SortOrder > ,
44
47
PageQueryParam < 'queryArchival' , string > ,
@@ -68,7 +71,8 @@ const domainPageQueryParamsConfig: [
68
71
{
69
72
key : 'timeRangeEnd' ,
70
73
queryParamKey : 'end' ,
71
- parseValue : parseDateQueryParam ,
74
+ defaultValue : now . toDate ( ) ,
75
+ parseValue : ( v ) => parseDateQueryParam ( v ) ?? now . toDate ( ) ,
72
76
} ,
73
77
{
74
78
key : 'sortColumn' ,
@@ -102,20 +106,18 @@ const domainPageQueryParamsConfig: [
102
106
{
103
107
key : 'timeRangeStartBasic' ,
104
108
queryParamKey : 'start' ,
105
- defaultValue : dayjs ( )
109
+ defaultValue : now
106
110
. subtract ( DOMAIN_WORKFLOWS_BASIC_START_DAYS_CONFIG , 'days' )
107
111
. toDate ( ) ,
108
112
parseValue : ( v ) =>
109
113
parseDateQueryParam ( v ) ??
110
- dayjs ( )
111
- . subtract ( DOMAIN_WORKFLOWS_BASIC_START_DAYS_CONFIG , 'days' )
112
- . toDate ( ) ,
114
+ now . subtract ( DOMAIN_WORKFLOWS_BASIC_START_DAYS_CONFIG , 'days' ) . toDate ( ) ,
113
115
} ,
114
116
{
115
117
key : 'timeRangeEndBasic' ,
116
118
queryParamKey : 'end' ,
117
- defaultValue : dayjs ( ) . toDate ( ) ,
118
- parseValue : ( v ) => parseDateQueryParam ( v ) ?? dayjs ( ) . toDate ( ) ,
119
+ defaultValue : now . toDate ( ) ,
120
+ parseValue : ( v ) => parseDateQueryParam ( v ) ?? now . toDate ( ) ,
119
121
} ,
120
122
{
121
123
key : 'inputTypeArchival' ,
@@ -144,12 +146,20 @@ const domainPageQueryParamsConfig: [
144
146
{
145
147
key : 'timeRangeStartArchival' ,
146
148
queryParamKey : 'astart' ,
147
- parseValue : parseDateQueryParam ,
149
+ defaultValue : now
150
+ . subtract ( DOMAIN_WORKFLOWS_ARCHIVAL_START_DAYS_CONFIG , 'days' )
151
+ . toDate ( ) ,
152
+ parseValue : ( v ) =>
153
+ parseDateQueryParam ( v ) ??
154
+ now
155
+ . subtract ( DOMAIN_WORKFLOWS_ARCHIVAL_START_DAYS_CONFIG , 'days' )
156
+ . toDate ( ) ,
148
157
} ,
149
158
{
150
159
key : 'timeRangeEndArchival' ,
151
160
queryParamKey : 'aend' ,
152
- parseValue : parseDateQueryParam ,
161
+ defaultValue : now . toDate ( ) ,
162
+ parseValue : ( v ) => parseDateQueryParam ( v ) ?? now . toDate ( ) ,
153
163
} ,
154
164
{
155
165
key : 'sortColumnArchival' ,
0 commit comments