Skip to content

Commit a8c9dae

Browse files
committed
fix sort order
1 parent 3feb3e9 commit a8c9dae

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

cylc/uiserver/review.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,9 @@ def suites(
527527
elif order == "name_desc":
528528
data["entries"].sort(key=lambda entry: entry["name"], reverse=True)
529529
elif order == "time_asc":
530-
data["entries"].sort(key=self._sort_summary_entries, reverse=True)
530+
data["entries"].sort(key=self._sort_summary_entries, reverse=False)
531531
else: # order == "time_desc"
532-
data["entries"].sort(key=self._sort_summary_entries)
532+
data["entries"].sort(key=self._sort_summary_entries, reverse=True)
533533
data["of_n_entries"] = len(data["entries"])
534534
if per_page:
535535
data["n_pages"] = data["of_n_entries"] // per_page

tests/functional/cylc-review/08-suites-page.t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ cylc_ws_json_greps "${TEST_NAME}.stdout" "${TEST_NAME}.stdout" \
5757
"[('page',), 1]" \
5858
"[('per_page',), 100]" \
5959
"[('of_n_entries',), 2]" \
60-
"[('entries', 0, 'name'), '${PREFIX_GROUP1}a']" \
61-
"[('entries', 1, 'name'), '${PREFIX_GROUP1}b']"
60+
"[('entries', 0, 'name'), '${PREFIX_GROUP1}b']" \
61+
"[('entries', 1, 'name'), '${PREFIX_GROUP1}a']"
6262
#-------------------------------------------------------------------------------
6363
# Data transfer output check for [abc], sort by time_asc
6464
TEST_NAME="${TEST_NAME_BASE}-200-curl-suites-time-asc"
@@ -69,8 +69,8 @@ cylc_ws_json_greps "${TEST_NAME}.stdout" "${TEST_NAME}.stdout" \
6969
"[('page',), 1]" \
7070
"[('per_page',), 100]" \
7171
"[('of_n_entries',), 2]" \
72-
"[('entries', 0, 'name'), '${PREFIX_GROUP1}b']" \
73-
"[('entries', 1, 'name'), '${PREFIX_GROUP1}a']"
72+
"[('entries', 0, 'name'), '${PREFIX_GROUP1}a']" \
73+
"[('entries', 1, 'name'), '${PREFIX_GROUP1}b']"
7474
#-------------------------------------------------------------------------------
7575
# Data transfer output check for [abc], sort by name_asc
7676
TEST_NAME="${TEST_NAME_BASE}-200-curl-suites-name-asc"
@@ -93,8 +93,8 @@ cylc_ws_json_greps "${TEST_NAME}.stdout" "${TEST_NAME}.stdout" \
9393
"[('page',), 1]" \
9494
"[('per_page',), 100]" \
9595
"[('of_n_entries',), 2]" \
96-
"[('entries', 0, 'name'), '${PREFIX_GROUP1}b']" \
97-
"[('entries', 1, 'name'), '${PREFIX_GROUP1}a']"
96+
"[('entries', 0, 'name'), '${PREFIX_GROUP1}a']" \
97+
"[('entries', 1, 'name'), '${PREFIX_GROUP1}b']"
9898
#-------------------------------------------------------------------------------
9999
# Data transfer output check for [1-10], page 1
100100
TEST_NAME="${TEST_NAME_BASE}-200-curl-suites-2-page-1"
@@ -105,7 +105,7 @@ cylc_ws_json_greps "${TEST_NAME}.stdout" "${TEST_NAME}.stdout" \
105105
"[('page',), 1]" \
106106
"[('per_page',), 1]" \
107107
"[('of_n_entries',), 3]" \
108-
"[('entries', 0, 'name'), '${PREFIX_GROUP2}1']"
108+
"[('entries', 0, 'name'), '${PREFIX_GROUP2}3']"
109109
#-------------------------------------------------------------------------------
110110
# Data transfer output check for [1-10], page 2
111111
TEST_NAME="${TEST_NAME_BASE}-200-curl-suites-2-page-2"
@@ -127,7 +127,7 @@ cylc_ws_json_greps "${TEST_NAME}.stdout" "${TEST_NAME}.stdout" \
127127
"[('page',), 3]" \
128128
"[('per_page',), 1]" \
129129
"[('of_n_entries',), 3]" \
130-
"[('entries', 0, 'name'), '${PREFIX_GROUP2}3']"
130+
"[('entries', 0, 'name'), '${PREFIX_GROUP2}1']"
131131
#-------------------------------------------------------------------------------
132132
# Tidy up - note suites trivial so stop early on by themselves
133133
rm -fr "${HOME}/cylc-run/${TOP_LEVEL_TEST_DIR}"

0 commit comments

Comments
 (0)