Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UBER-120 Yesterday date filter #3190

Merged
merged 1 commit into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions models/view/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,17 @@ export function createModel (builder: Builder): void {
view.filter.FilterDateToday
)

builder.createDoc(
view.class.FilterMode,
core.space.Model,
{
label: view.string.Today,
result: view.function.FilterDateYesterday,
disableValueSelector: true
},
view.filter.FilterDateYesterday
)

builder.createDoc(
view.class.FilterMode,
core.space.Model,
Expand Down
1 change: 1 addition & 0 deletions models/view/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export default mergeIds(viewId, view, {
FilterNestedDontMatchResult: '' as FilterFunction,
FilterDateOutdated: '' as FilterFunction,
FilterDateToday: '' as FilterFunction,
FilterDateYesterday: '' as FilterFunction,
FilterDateWeek: '' as FilterFunction,
FilterDateNextWeek: '' as FilterFunction,
FilterDateMonth: '' as FilterFunction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,21 @@
? [
view.filter.FilterDateOutdated,
view.filter.FilterDateToday,
view.filter.FilterDateYesterday,
view.filter.FilterDateWeek,
view.filter.FilterDateNextW,
view.filter.FilterDateM,
view.filter.FilterDateNextM,
view.filter.FilterDateCustom,
view.filter.FilterDateNotSpecified
]
: [view.filter.FilterDateToday, view.filter.FilterDateWeek, view.filter.FilterDateM, view.filter.FilterDateCustom]
: [
view.filter.FilterDateToday,
view.filter.FilterDateYesterday,
view.filter.FilterDateWeek,
view.filter.FilterDateM,
view.filter.FilterDateCustom
]
filter.mode = filter.mode === undefined ? filter.modes[0] : filter.mode

const client = getClient()
Expand Down
35 changes: 21 additions & 14 deletions plugins/view-resources/src/filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,42 +98,49 @@ export async function dateOutdated (filter: Filter): Promise<ObjQueryType<any>>
}

export async function dateToday (filter: Filter): Promise<ObjQueryType<any>> {
const todayStart = new Date().setUTCHours(0, 0, 0, 0)
const todayEnd = new Date().setUTCHours(23, 59, 59, 999)
const todayStart = new Date().setHours(0, 0, 0, 0)
const todayEnd = new Date().setHours(23, 59, 59, 999)
return { $gte: todayStart, $lte: todayEnd }
}

export async function dateYesterday (filter: Filter): Promise<ObjQueryType<any>> {
const yesterday = new Date(new Date().setDate(new Date().getDate() - 1))
const yesterdayStart = new Date(yesterday).setHours(0, 0, 0, 0)
const yesterdayEnd = new Date(yesterday).setHours(23, 59, 59, 999)
return { $gte: yesterdayStart, $lte: yesterdayEnd }
}

export async function dateWeek (filter: Filter): Promise<ObjQueryType<any>> {
const day = new Date().getDay()
const startDayDiff = day === 0 ? 6 : day - 1
const endDayDiff = 7 - startDayDiff
const weekStart = new Date(new Date().setUTCDate(new Date().getUTCDate() - startDayDiff)).setUTCHours(0, 0, 0, 0)
const weekEnd = new Date(new Date().setUTCDate(new Date().getUTCDate() + endDayDiff)).setUTCHours(23, 59, 59, 999)
const weekStart = new Date(new Date().setDate(new Date().getDate() - startDayDiff)).setHours(0, 0, 0, 0)
const weekEnd = new Date(new Date().setDate(new Date().getDate() + endDayDiff)).setHours(23, 59, 59, 999)
return { $gte: weekStart, $lte: weekEnd }
}

export async function dateNextWeek (filter: Filter): Promise<ObjQueryType<any>> {
const day = new Date().getDay()
const startDayDiff = day === 0 ? 6 : day - 1
const endDayDiff = 7 - startDayDiff
const weekStart = new Date(new Date().setUTCDate(new Date().getUTCDate() - startDayDiff + 7)).setUTCHours(0, 0, 0, 0)
const weekEnd = new Date(new Date().setUTCDate(new Date().getUTCDate() + endDayDiff + 7)).setUTCHours(23, 59, 59, 999)
const weekStart = new Date(new Date().setDate(new Date().getDate() - startDayDiff + 7)).setHours(0, 0, 0, 0)
const weekEnd = new Date(new Date().setDate(new Date().getDate() + endDayDiff + 7)).setHours(23, 59, 59, 999)
return { $gte: weekStart, $lte: weekEnd }
}

export async function dateMonth (filter: Filter): Promise<ObjQueryType<any>> {
const today = new Date()
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0)
const monthStart = new Date(new Date().setUTCDate(1)).setUTCHours(0, 0, 0, 0)
const monthEnd = lastDayOfMonth.setUTCHours(23, 59, 59, 999)
const monthStart = new Date(new Date().setDate(1)).setHours(0, 0, 0, 0)
const monthEnd = lastDayOfMonth.setHours(23, 59, 59, 999)
return { $gte: monthStart, $lte: monthEnd }
}

export async function dateNextMonth (filter: Filter): Promise<ObjQueryType<any>> {
const today = new Date()
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 2, 0)
const monthStart = new Date(new Date().setUTCMonth(new Date().getUTCMonth() + 1, 1)).setUTCHours(0, 0, 0, 0)
const monthEnd = lastDayOfMonth.setUTCHours(23, 59, 59, 999)
const monthStart = new Date(new Date().setMonth(new Date().getMonth() + 1, 1)).setHours(0, 0, 0, 0)
const monthEnd = lastDayOfMonth.setHours(23, 59, 59, 999)
return { $gte: monthStart, $lte: monthEnd }
}

Expand All @@ -143,13 +150,13 @@ export async function dateNotSpecified (filter: Filter): Promise<ObjQueryType<an

export async function dateCustom (filter: Filter): Promise<ObjQueryType<any>> {
if (filter.value.length === 1) {
const todayStart = new Date(filter.value[0]).setUTCHours(0, 0, 0, 0)
const todayEnd = new Date(filter.value[0]).setUTCHours(23, 59, 59, 999)
const todayStart = new Date(filter.value[0]).setHours(0, 0, 0, 0)
const todayEnd = new Date(filter.value[0]).setHours(23, 59, 59, 999)
return { $gte: todayStart, $lte: todayEnd }
}
if (filter.value.length === 2) {
const todayStart = new Date(filter.value[0]).setUTCHours(0, 0, 0, 0)
const todayEnd = new Date(filter.value[1]).setUTCHours(23, 59, 59, 999)
const todayStart = new Date(filter.value[0]).setHours(0, 0, 0, 0)
const todayEnd = new Date(filter.value[1]).setHours(23, 59, 59, 999)
return { $gte: todayStart, $lte: todayEnd }
}
return await dateNotSpecified(filter)
Expand Down
2 changes: 2 additions & 0 deletions plugins/view-resources/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ import {
dateNotSpecified,
dateOutdated,
dateToday,
dateYesterday,
dateWeek,
nestedDontMatchResult,
nestedMatchResult,
Expand Down Expand Up @@ -240,6 +241,7 @@ export default async (): Promise<Resources> => ({
StatusSort: statusSort,
FilterDateOutdated: dateOutdated,
FilterDateToday: dateToday,
FilterDateYesterday: dateYesterday,
FilterDateWeek: dateWeek,
FilterDateNextWeek: dateNextWeek,
FilterDateMonth: dateMonth,
Expand Down
1 change: 1 addition & 0 deletions plugins/view/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,7 @@ const view = plugin(viewId, {
FilterNestedDontMatch: '' as Ref<FilterMode>,
FilterDateOutdated: '' as Ref<FilterMode>,
FilterDateToday: '' as Ref<FilterMode>,
FilterDateYesterday: '' as Ref<FilterMode>,
FilterDateWeek: '' as Ref<FilterMode>,
FilterDateNextW: '' as Ref<FilterMode>,
FilterDateM: '' as Ref<FilterMode>,
Expand Down