potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Conversation 0 Commits 80 Files changed 68 +4 -24
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7c68c9c0c1 - Show all commits

28
src/views/SearchView.vue
View file

@ -695,7 +695,6 @@ enum ViewMode {
} }
enum EventSortValues { enum EventSortValues {
MATCH_DESC = "MATCH_DESC",
CREATED_AT_ASC = "CREATED_AT_ASC", CREATED_AT_ASC = "CREATED_AT_ASC",
CREATED_AT_DESC = "CREATED_AT_DESC", CREATED_AT_DESC = "CREATED_AT_DESC",
START_TIME_ASC = "START_TIME_ASC", START_TIME_ASC = "START_TIME_ASC",
@ -704,10 +703,7 @@ enum EventSortValues {
} }
enum GroupSortValues { enum GroupSortValues {
MATCH_DESC = "MATCH_DESC",
CREATED_AT_ASC = "CREATED_AT_ASC",
CREATED_AT_DESC = "CREATED_AT_DESC", CREATED_AT_DESC = "CREATED_AT_DESC",
MEMBER_COUNT_ASC = "MEMBER_COUNT_ASC",
MEMBER_COUNT_DESC = "MEMBER_COUNT_DESC", MEMBER_COUNT_DESC = "MEMBER_COUNT_DESC",
LAST_EVENT_ACTIVITY = "LAST_EVENT_ACTIVITY", LAST_EVENT_ACTIVITY = "LAST_EVENT_ACTIVITY",
} }
@ -747,12 +743,12 @@ const searchTarget = useRouteQuery(
const mode = useRouteQuery("mode", ViewMode.LIST, enumTransformer(ViewMode)); const mode = useRouteQuery("mode", ViewMode.LIST, enumTransformer(ViewMode));
const sortByEvents = useRouteQuery( const sortByEvents = useRouteQuery(
"sortByEvents", "sortByEvents",
EventSortValues.MATCH_DESC, EventSortValues.START_TIME_ASC,
enumTransformer(EventSortValues) enumTransformer(EventSortValues)
); );
const sortByGroups = useRouteQuery( const sortByGroups = useRouteQuery(
"sortByGroups", "sortByGroups",
GroupSortValues.MATCH_DESC, GroupSortValues.LAST_EVENT_ACTIVITY,
enumTransformer(GroupSortValues) enumTransformer(GroupSortValues)
); );
const bbox = useRouteQuery("bbox", undefined); const bbox = useRouteQuery("bbox", undefined);
@ -971,29 +967,17 @@ const totalCount = computed(() => {
const sortOptionsGroups = computed(() => { const sortOptionsGroups = computed(() => {
const options = [ const options = [
{ {
key: GroupSortValues.MATCH_DESC, key: GroupSortValues.LAST_EVENT_ACTIVITY,
label: t("Best match"), label: t("Last event activity"),
},
{
key: GroupSortValues.MEMBER_COUNT_ASC,
label: t("Increasing number of members"),
}, },
{ {
key: GroupSortValues.MEMBER_COUNT_DESC, key: GroupSortValues.MEMBER_COUNT_DESC,
label: t("Decreasing number of members"), label: t("Decreasing number of members"),
}, },
{
key: GroupSortValues.CREATED_AT_ASC,
label: t("Increasing creation date"),
},
{ {
key: GroupSortValues.CREATED_AT_DESC, key: GroupSortValues.CREATED_AT_DESC,
label: t("Decreasing creation date"), label: t("Decreasing creation date"),
}, },
{
key: GroupSortValues.LAST_EVENT_ACTIVITY,
label: t("Last event activity"),
},
]; ];
return options; return options;
@ -1001,10 +985,6 @@ const sortOptionsGroups = computed(() => {
const sortOptionsEvents = computed(() => { const sortOptionsEvents = computed(() => {
const options = [ const options = [
{
key: EventSortValues.MATCH_DESC,
label: t("Best match"),
},
{ {
key: EventSortValues.START_TIME_ASC, key: EventSortValues.START_TIME_ASC,
label: t("Event date"), label: t("Event date"),