Skip to content

Move timestamps to ISO strings in lists #1401

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 31, 2023
Merged

Move timestamps to ISO strings in lists #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8c17bd
Move timestamps to ISO strings in lists
joanagmaia Aug 30, 2023
9d3a979
Fix display of view more in dashboard
joanagmaia Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions frontend/src/modules/dashboard/components/dashboard-members.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
query: filterQueryService().setQuery({
...allMembers.filter,
joinedDate: {
value: periodStartDate,
operator: 'gt',
value: periodRange,
operator: 'between',
},
}),
}"
Expand Down Expand Up @@ -186,8 +186,8 @@
query: filterQueryService().setQuery({
...allMembers.filter,
lastActivityDate: {
value: periodStartDate,
operator: 'gt',
value: periodRange,
operator: 'between',
},
}),
}"
Expand Down Expand Up @@ -252,11 +252,16 @@ export default {
'members',
'period',
]),
periodStartDate() {
return moment()
.utc()
.subtract(this.period.value, 'day')
.format('YYYY-MM-DD');
periodRange() {
return [
moment()
.utc()
.subtract(this.period.value - 1, 'day')
.format('YYYY-MM-DD'),
moment()
.utc()
.format('YYYY-MM-DD'),
];
},
},
methods: {
Expand Down
24 changes: 15 additions & 9 deletions frontend/src/modules/dashboard/components/dashboard-organizations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
No new organizations during this period
</app-dashboard-empty-state>
<div
v-if="organizations.length >= 5"
v-if="recentOrganizations.length >= 5"
class="pt-3"
>
<router-link
Expand All @@ -81,8 +81,8 @@
query: filterQueryService().setQuery({
...allOrganizations.filter,
joinedDate: {
value: periodStartDate,
operator: 'gt',
value: periodRange,
operator: 'between',
},
}),
}"
Expand Down Expand Up @@ -161,8 +161,8 @@
query: filterQueryService().setQuery({
...allOrganizations.filter,
lastActivityDate: {
value: periodStartDate,
operator: 'gt',
value: periodRange,
operator: 'between',
},
}),
}"
Expand Down Expand Up @@ -224,10 +224,16 @@ export default {
'organizations',
'period',
]),
periodStartDate() {
return moment()
.subtract(this.period.value, 'day')
.format('YYYY-MM-DD');
periodRange() {
return [
moment()
.utc()
.subtract(this.period.value - 1, 'day')
.format('YYYY-MM-DD'),
moment()
.utc()
.format('YYYY-MM-DD'),
];
},
},
methods: {
Expand Down
30 changes: 24 additions & 6 deletions frontend/src/shared/modules/filters/config/apiFilterRenderer/date.filter.renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,18 @@ export const dateApiFilterRenderer = (property: string, { value, operator }: Dat
filterOperator = FilterDateOperator.BETWEEN;
}

let filter = {
[property]: {
[filterOperator]: value,
},
};
if ([FilterDateOperator.EQ, FilterDateOperator.NE].includes(operator)) {
let filter;

if ([FilterDateOperator.BETWEEN, FilterDateOperator.NOT_BETWEEN].includes(operator)) {
filter = {
[property]: {
[filterOperator]: [
moment.utc(value[0]).startOf('day').toISOString(),
moment.utc(value[1]).endOf('day').toISOString(),
],
},
};
} else if ([FilterDateOperator.EQ, FilterDateOperator.NE].includes(operator)) {
filter = {
[property]: {
between: [
Expand All @@ -26,6 +32,18 @@ export const dateApiFilterRenderer = (property: string, { value, operator }: Dat
],
},
};
} else {
let parsedValue = moment.utc(value).startOf('day').toISOString();

if ([FilterDateOperator.GT].includes(operator)) {
parsedValue = moment.utc(value).endOf('day').toISOString();
}

filter = {
[property]: {
[filterOperator]: parsedValue,
},
};
}

return [
Expand Down