refactor Leaderboard in progress
This commit is contained in:
parent
b8b4c31b45
commit
1abe2ddfaf
@ -1,19 +1,66 @@
|
|||||||
import { API } from '../utils/globals';
|
import { API } from '../utils/globals';
|
||||||
|
import KeyCloakService from '../services/KeyCloakService';
|
||||||
|
|
||||||
const getChallengeLeaderboard = async (
|
const getChallengeLeaderboard = (
|
||||||
setDataState,
|
endpoint,
|
||||||
challengeName,
|
challengeName,
|
||||||
setLoading
|
setDataStates,
|
||||||
|
setLoadingState,
|
||||||
|
setScoreSorted
|
||||||
) => {
|
) => {
|
||||||
await fetch(`${API}/leaderboard/${challengeName}`)
|
fetch(`${API}/${endpoint}/${challengeName}`, {
|
||||||
|
headers: { Authorization: `Bearer ${KeyCloakService.getToken()}` },
|
||||||
|
})
|
||||||
.then((response) => response.json())
|
.then((response) => response.json())
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
setDataState(data.entries);
|
let item = {};
|
||||||
});
|
let result = [];
|
||||||
|
let initSetScoreSorted = [];
|
||||||
if (setLoading) {
|
let tests = data.tests;
|
||||||
setLoading(false);
|
for (let submission of data.entries) {
|
||||||
|
for (let evaluation of submission.evaluations) {
|
||||||
|
item = {
|
||||||
|
...item,
|
||||||
|
evaluations: {
|
||||||
|
...item.evaluations,
|
||||||
|
[`${evaluation.test.metric}.${evaluation.test.name}`]:
|
||||||
|
evaluation.score,
|
||||||
|
},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
for (let test of tests) {
|
||||||
|
if (!item.evaluations) {
|
||||||
|
item.evaluations = {};
|
||||||
|
}
|
||||||
|
if (!Object.hasOwn(item.evaluations, `${test.metric}.${test.name}`)) {
|
||||||
|
item = {
|
||||||
|
...item,
|
||||||
|
evaluations: {
|
||||||
|
...item.evaluations,
|
||||||
|
[`${test.metric}.${test.name}`]: -999999999,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item = {
|
||||||
|
...item.evaluations,
|
||||||
|
id: submission.id,
|
||||||
|
submitter: submission.submitter,
|
||||||
|
when: submission.when,
|
||||||
|
tags: submission.tags,
|
||||||
|
};
|
||||||
|
result.push(item);
|
||||||
|
item = {};
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
for (let _ of tests) {
|
||||||
|
initSetScoreSorted.push(false);
|
||||||
|
}
|
||||||
|
console.log(result);
|
||||||
|
for (let setDataState of setDataStates) setDataState(result);
|
||||||
|
if (setScoreSorted) setScoreSorted(initSetScoreSorted);
|
||||||
|
if (setLoadingState) setLoadingState(false);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export default getChallengeLeaderboard;
|
export default getChallengeLeaderboard;
|
||||||
|
@ -1,20 +1,15 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import Media from 'react-media';
|
|
||||||
import theme from '../../utils/theme';
|
|
||||||
import { FlexColumn } from '../../utils/containers';
|
import { FlexColumn } from '../../utils/containers';
|
||||||
import { H2 } from '../../utils/fonts';
|
import { H2 } from '../../utils/fonts';
|
||||||
import Table from '../../components/generic/Table/Table';
|
import Table from '../../components/generic/Table/Table';
|
||||||
import PropsTypes from 'prop-types';
|
|
||||||
import getChallengeLeaderboard from '../../api/getChallengeLeaderboard';
|
import getChallengeLeaderboard from '../../api/getChallengeLeaderboard';
|
||||||
import leaderboardSearchQueryHandler from './leaderboardSearchQueryHandler';
|
import leaderboardSearchQueryHandler from './leaderboardSearchQueryHandler';
|
||||||
import {
|
import { CALC_PAGES } from '../../utils/globals';
|
||||||
CALC_PAGES,
|
|
||||||
EVALUATIONS_FORMAT,
|
|
||||||
RENDER_WHEN,
|
|
||||||
} from '../../utils/globals';
|
|
||||||
import Search from '../../components/generic/Search';
|
import Search from '../../components/generic/Search';
|
||||||
import Pager from '../../components/generic/Pager';
|
import Pager from '../../components/generic/Pager';
|
||||||
import Loading from '../../components/generic/Loading';
|
import Loading from '../../components/generic/Loading';
|
||||||
|
import orderKeys from './orderKeys';
|
||||||
|
import { ELEMENTS_PER_PAGE } from '../../utils/globals';
|
||||||
|
|
||||||
const Leaderboard = (props) => {
|
const Leaderboard = (props) => {
|
||||||
const [entriesFromApi, setEntriesFromApi] = React.useState([]);
|
const [entriesFromApi, setEntriesFromApi] = React.useState([]);
|
||||||
@ -22,72 +17,51 @@ const Leaderboard = (props) => {
|
|||||||
const [pageNr, setPageNr] = React.useState(1);
|
const [pageNr, setPageNr] = React.useState(1);
|
||||||
const [loading, setLoading] = React.useState(true);
|
const [loading, setLoading] = React.useState(true);
|
||||||
const [submitterSorted, setSubmitterSorted] = React.useState(false);
|
const [submitterSorted, setSubmitterSorted] = React.useState(false);
|
||||||
const [descriptionSorted, setDescriptionSorted] = React.useState(false);
|
// const [descriptionSorted, setDescriptionSorted] = React.useState(false);
|
||||||
const [entriesSorted, setEntriesSorted] = React.useState(false);
|
// const [entriesSorted, setEntriesSorted] = React.useState(false);
|
||||||
const [whenSorted, setWhenSorted] = React.useState(false);
|
const [whenSorted, setWhenSorted] = React.useState(false);
|
||||||
const [scoresSorted, setScoresSorted] = React.useState([]);
|
const [scoresSorted, setScoresSorted] = React.useState([]);
|
||||||
|
const [idSorted, setIdSorted] = React.useState([]);
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
challengeDataRequest(props.challengeName);
|
getChallengeLeaderboard(
|
||||||
|
'leaderboard',
|
||||||
|
props.challengeName,
|
||||||
|
[setEntries, setEntriesFromApi],
|
||||||
|
setLoading,
|
||||||
|
setScoresSorted
|
||||||
|
);
|
||||||
}, [props.challengeName]);
|
}, [props.challengeName]);
|
||||||
|
|
||||||
const challengeDataRequest = (challengeName) => {
|
|
||||||
getChallengeLeaderboard(setEntriesFromApi, challengeName);
|
|
||||||
getChallengeLeaderboard(setEntries, challengeName, setLoading);
|
|
||||||
};
|
|
||||||
|
|
||||||
const getMetricIndex = (metricName) => {
|
|
||||||
let i = 0;
|
|
||||||
for (let evaluation of entriesFromApi[0].evaluations) {
|
|
||||||
if (`${evaluation.test.metric}.${evaluation.test.name}` === metricName) {
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const searchQueryHandler = (event) => {
|
const searchQueryHandler = (event) => {
|
||||||
leaderboardSearchQueryHandler(event, entriesFromApi, setPageNr, setEntries);
|
leaderboardSearchQueryHandler(event, entriesFromApi, setPageNr, setEntries);
|
||||||
};
|
};
|
||||||
|
|
||||||
const getPossibleMetrics = () => {
|
const sortByUpdate = React.useCallback(
|
||||||
let metrics = [];
|
(elem) => {
|
||||||
for (let entry of entriesFromApi) {
|
let newEntries = entries.slice();
|
||||||
for (let evaluation of entry.evaluations) {
|
const possibleMetrics = orderKeys(entries[0]).filter(
|
||||||
let metric = evaluation.test.metric;
|
(key) => !['id', 'submitter', 'when'].includes(key)
|
||||||
let name = evaluation.test.name;
|
);
|
||||||
if (metric && !metrics.includes(`${metric}.${name}`)) {
|
let metricIndex = possibleMetrics.indexOf(elem);
|
||||||
metrics.push(`${metric}.${name}`);
|
let newScoresSorted = scoresSorted.slice();
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return metrics;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getLeaderboardHeader = () => {
|
|
||||||
let header = ['#', 'submitter', 'description'];
|
|
||||||
for (let metric of getPossibleMetrics()) {
|
|
||||||
header.push(metric);
|
|
||||||
}
|
|
||||||
header.push('entries');
|
|
||||||
header.push('when');
|
|
||||||
return header;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getLeaderboardHeaderMobile = () => {
|
|
||||||
let header = ['#', 'submitter', 'description', 'entries', 'when'];
|
|
||||||
for (let metric of getPossibleMetrics()) {
|
|
||||||
header.push(metric);
|
|
||||||
}
|
|
||||||
return header;
|
|
||||||
};
|
|
||||||
|
|
||||||
const sortByUpdate = (elem) => {
|
|
||||||
let metricIndex = 0;
|
|
||||||
let newEntries = entries;
|
|
||||||
switch (elem) {
|
switch (elem) {
|
||||||
|
case 'id':
|
||||||
|
if (idSorted) {
|
||||||
|
setIdSorted(false);
|
||||||
|
newEntries = newEntries.sort((a, b) =>
|
||||||
|
a.id > b.id ? 1 : b.id > a.id ? -1 : 0
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
setIdSorted(true);
|
||||||
|
newEntries = newEntries.sort((a, b) =>
|
||||||
|
a.id < b.id ? 1 : b.id < a.id ? -1 : 0
|
||||||
|
);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 'submitter':
|
case 'submitter':
|
||||||
if (submitterSorted) {
|
if (submitterSorted) {
|
||||||
|
setSubmitterSorted(false);
|
||||||
newEntries = newEntries.sort((a, b) =>
|
newEntries = newEntries.sort((a, b) =>
|
||||||
a.submitter.toLowerCase() < b.submitter.toLowerCase()
|
a.submitter.toLowerCase() < b.submitter.toLowerCase()
|
||||||
? 1
|
? 1
|
||||||
@ -95,8 +69,8 @@ const Leaderboard = (props) => {
|
|||||||
? -1
|
? -1
|
||||||
: 0
|
: 0
|
||||||
);
|
);
|
||||||
setSubmitterSorted(false);
|
|
||||||
} else {
|
} else {
|
||||||
|
setSubmitterSorted(true);
|
||||||
newEntries = newEntries.sort((a, b) =>
|
newEntries = newEntries.sort((a, b) =>
|
||||||
a.submitter.toLowerCase() > b.submitter.toLowerCase()
|
a.submitter.toLowerCase() > b.submitter.toLowerCase()
|
||||||
? 1
|
? 1
|
||||||
@ -104,69 +78,31 @@ const Leaderboard = (props) => {
|
|||||||
? -1
|
? -1
|
||||||
: 0
|
: 0
|
||||||
);
|
);
|
||||||
setSubmitterSorted(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'description':
|
|
||||||
if (descriptionSorted) {
|
|
||||||
newEntries = newEntries.sort((a, b) =>
|
|
||||||
a.description.toLowerCase() < b.description.toLowerCase()
|
|
||||||
? 1
|
|
||||||
: b.description.toLowerCase() < a.description.toLowerCase()
|
|
||||||
? -1
|
|
||||||
: 0
|
|
||||||
);
|
|
||||||
setDescriptionSorted(false);
|
|
||||||
} else {
|
|
||||||
newEntries = newEntries.sort((a, b) =>
|
|
||||||
a.description.toLowerCase() > b.description.toLowerCase()
|
|
||||||
? 1
|
|
||||||
: b.description.toLowerCase() > a.description.toLowerCase()
|
|
||||||
? -1
|
|
||||||
: 0
|
|
||||||
);
|
|
||||||
setDescriptionSorted(true);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'entries':
|
|
||||||
if (entriesSorted) {
|
|
||||||
newEntries = newEntries.sort((a, b) => b.times - a.times);
|
|
||||||
setEntriesSorted(false);
|
|
||||||
} else {
|
|
||||||
newEntries = newEntries.sort((a, b) => a.times - b.times);
|
|
||||||
setEntriesSorted(true);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'when':
|
case 'when':
|
||||||
if (whenSorted) {
|
if (whenSorted) {
|
||||||
|
setWhenSorted(false);
|
||||||
newEntries = newEntries.sort((a, b) =>
|
newEntries = newEntries.sort((a, b) =>
|
||||||
a.when < b.when ? 1 : b.when < a.when ? -1 : 0
|
a.when < b.when ? 1 : b.when < a.when ? -1 : 0
|
||||||
);
|
);
|
||||||
setWhenSorted(false);
|
|
||||||
} else {
|
} else {
|
||||||
|
setWhenSorted(true);
|
||||||
newEntries = newEntries.sort((a, b) =>
|
newEntries = newEntries.sort((a, b) =>
|
||||||
a.when > b.when ? 1 : b.when > a.when ? -1 : 0
|
a.when > b.when ? 1 : b.when > a.when ? -1 : 0
|
||||||
);
|
);
|
||||||
setWhenSorted(true);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
metricIndex = getMetricIndex(elem);
|
|
||||||
// eslint-disable-next-line no-case-declarations
|
|
||||||
let newScoresSorted = scoresSorted;
|
|
||||||
if (scoresSorted[metricIndex]) {
|
if (scoresSorted[metricIndex]) {
|
||||||
newEntries = newEntries.sort(
|
newEntries = newEntries.sort(
|
||||||
(a, b) =>
|
(a, b) => (b ? b[elem] : -1) - (a ? a[elem] : -1)
|
||||||
b.evaluations[metricIndex].score -
|
|
||||||
a.evaluations[metricIndex].score
|
|
||||||
);
|
);
|
||||||
newScoresSorted[metricIndex] = false;
|
newScoresSorted[metricIndex] = false;
|
||||||
setScoresSorted(newScoresSorted);
|
setScoresSorted(newScoresSorted);
|
||||||
} else {
|
} else {
|
||||||
newEntries = newEntries.sort(
|
newEntries = newEntries.sort(
|
||||||
(a, b) =>
|
(a, b) => (a ? a[elem] : -1) - (b ? b[elem] : -1)
|
||||||
a.evaluations[metricIndex].score -
|
|
||||||
b.evaluations[metricIndex].score
|
|
||||||
);
|
);
|
||||||
newScoresSorted[metricIndex] = true;
|
newScoresSorted[metricIndex] = true;
|
||||||
setScoresSorted(newScoresSorted);
|
setScoresSorted(newScoresSorted);
|
||||||
@ -174,103 +110,36 @@ const Leaderboard = (props) => {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
setEntries(newEntries);
|
setEntries(newEntries);
|
||||||
};
|
},
|
||||||
|
[entries, idSorted, scoresSorted, submitterSorted, whenSorted]
|
||||||
const mobileRender = () => {
|
|
||||||
return (
|
|
||||||
<FlexColumn padding="24px 12px" width="70%" as="section" id="start">
|
|
||||||
<H2 as="h2" margin="0 0 12px 0">
|
|
||||||
Leaderboard
|
|
||||||
</H2>
|
|
||||||
{!loading ? (
|
|
||||||
<>
|
|
||||||
<Search searchQueryHandler={searchQueryHandler} />
|
|
||||||
<Table
|
|
||||||
challengeName={props.challengeName}
|
|
||||||
headerElements={getLeaderboardHeaderMobile()}
|
|
||||||
tableType="leaderboard"
|
|
||||||
gridTemplateColumns={
|
|
||||||
entries[0]
|
|
||||||
? '1fr 2fr 3fr ' +
|
|
||||||
'2fr '.repeat(entries[0].evaluations.length) +
|
|
||||||
'1fr 2fr'
|
|
||||||
: ''
|
|
||||||
}
|
|
||||||
user={props.user}
|
|
||||||
staticColumnElements={[
|
|
||||||
{ name: 'id', format: null, order: 1, align: 'left' },
|
|
||||||
{ name: 'submitter', format: null, order: 2, align: 'left' },
|
|
||||||
{ name: 'description', format: null, order: 3, align: 'left' },
|
|
||||||
{ name: 'times', format: null, order: 4, align: 'left' },
|
|
||||||
{ name: 'when', format: RENDER_WHEN, order: 5, align: 'right' },
|
|
||||||
]}
|
|
||||||
metrics={getPossibleMetrics()}
|
|
||||||
iterableColumnElement={{
|
|
||||||
name: 'evaluations',
|
|
||||||
format: EVALUATIONS_FORMAT,
|
|
||||||
order: 3,
|
|
||||||
align: 'left',
|
|
||||||
}}
|
|
||||||
pageNr={pageNr}
|
|
||||||
elements={entries}
|
|
||||||
sortByUpdate={sortByUpdate}
|
|
||||||
/>
|
|
||||||
<Pager
|
|
||||||
pageNr={pageNr}
|
|
||||||
elements={entries}
|
|
||||||
setPageNr={setPageNr}
|
|
||||||
width="48px"
|
|
||||||
borderRadius="64px"
|
|
||||||
pages={CALC_PAGES(entries)}
|
|
||||||
number={`${pageNr} / ${CALC_PAGES(entries)}`}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<Loading />
|
|
||||||
)}
|
|
||||||
</FlexColumn>
|
|
||||||
);
|
);
|
||||||
};
|
|
||||||
|
|
||||||
const desktopRender = () => {
|
const n = (pageNr - 1) * (ELEMENTS_PER_PAGE * 2);
|
||||||
|
let elements = entries.slice(n, n + ELEMENTS_PER_PAGE * 2);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FlexColumn padding="24px" as="section" width="100%" maxWidth="1600px">
|
<FlexColumn
|
||||||
<H2 as="h2" margin="0 0 32px 0">
|
padding="24px"
|
||||||
Leaderboard
|
gap="32px"
|
||||||
</H2>
|
as="section"
|
||||||
|
width="100%"
|
||||||
|
maxWidth="1600px"
|
||||||
|
>
|
||||||
|
<H2 as="h2">Leaderboard</H2>
|
||||||
{!loading ? (
|
{!loading ? (
|
||||||
<>
|
<>
|
||||||
<Search searchQueryHandler={searchQueryHandler} />
|
<Search
|
||||||
<Table
|
searchQueryHandler={(event) =>
|
||||||
challengeName={props.challengeName}
|
searchQueryHandler(event, entries, setPageNr, setEntries)
|
||||||
headerElements={getLeaderboardHeader()}
|
|
||||||
gridTemplateColumns={
|
|
||||||
entries[0]
|
|
||||||
? '1fr 2fr 3fr ' +
|
|
||||||
'2fr '.repeat(entries[0].evaluations.length) +
|
|
||||||
'1fr 2fr'
|
|
||||||
: ''
|
|
||||||
}
|
}
|
||||||
user={props.user}
|
/>
|
||||||
staticColumnElements={[
|
{elements.length > 0 && entries[0] && (
|
||||||
{ name: 'id', format: null, order: 1, align: 'left' },
|
<Table
|
||||||
{ name: 'submitter', format: null, order: 2, align: 'left' },
|
items={elements}
|
||||||
{ name: 'description', format: null, order: 3, align: 'left' },
|
orderedKeys={orderKeys(entries[0])}
|
||||||
{ name: 'times', format: null, order: 4, align: 'left' },
|
|
||||||
{ name: 'when', format: RENDER_WHEN, order: 5, align: 'right' },
|
|
||||||
]}
|
|
||||||
metrics={getPossibleMetrics()}
|
|
||||||
iterableColumnElement={{
|
|
||||||
name: 'evaluations',
|
|
||||||
format: EVALUATIONS_FORMAT,
|
|
||||||
order: 3,
|
|
||||||
align: 'left',
|
|
||||||
}}
|
|
||||||
pageNr={pageNr}
|
|
||||||
elements={entries}
|
|
||||||
setPageNr={setPageNr}
|
|
||||||
sortByUpdate={sortByUpdate}
|
sortByUpdate={sortByUpdate}
|
||||||
/>
|
/>
|
||||||
|
)}
|
||||||
<Pager
|
<Pager
|
||||||
pageNr={pageNr}
|
pageNr={pageNr}
|
||||||
elements={entries}
|
elements={entries}
|
||||||
@ -288,20 +157,35 @@ const Leaderboard = (props) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Media query={theme.mobile}>{mobileRender()}</Media>
|
|
||||||
<Media query={theme.desktop}>{desktopRender()}</Media>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
Leaderboard.propsTypes = {
|
|
||||||
challengeName: PropsTypes.string,
|
|
||||||
};
|
|
||||||
|
|
||||||
Leaderboard.defaultProps = {
|
|
||||||
challengeName: '',
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Leaderboard;
|
export default Leaderboard;
|
||||||
|
|
||||||
|
// case 'description':
|
||||||
|
// if (descriptionSorted) {
|
||||||
|
// newEntries = newEntries.sort((a, b) =>
|
||||||
|
// a.description.toLowerCase() < b.description.toLowerCase()
|
||||||
|
// ? 1
|
||||||
|
// : b.description.toLowerCase() < a.description.toLowerCase()
|
||||||
|
// ? -1
|
||||||
|
// : 0
|
||||||
|
// );
|
||||||
|
// setDescriptionSorted(false);
|
||||||
|
// } else {
|
||||||
|
// newEntries = newEntries.sort((a, b) =>
|
||||||
|
// a.description.toLowerCase() > b.description.toLowerCase()
|
||||||
|
// ? 1
|
||||||
|
// : b.description.toLowerCase() > a.description.toLowerCase()
|
||||||
|
// ? -1
|
||||||
|
// : 0
|
||||||
|
// );
|
||||||
|
// setDescriptionSorted(true);
|
||||||
|
// }
|
||||||
|
// break;
|
||||||
|
// case 'entries':
|
||||||
|
// if (entriesSorted) {
|
||||||
|
// newEntries = newEntries.sort((a, b) => b.times - a.times);
|
||||||
|
// setEntriesSorted(false);
|
||||||
|
// } else {
|
||||||
|
// newEntries = newEntries.sort((a, b) => a.times - b.times);
|
||||||
|
// setEntriesSorted(true);
|
||||||
|
// }
|
||||||
|
// break;
|
||||||
|
23
src/pages/Leaderboard/orderKeys.js
Normal file
23
src/pages/Leaderboard/orderKeys.js
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
const orderKeys = (elem) => {
|
||||||
|
if (elem) {
|
||||||
|
let result = ['id'];
|
||||||
|
const elemKeys = Object.keys(elem);
|
||||||
|
const dev0keys = elemKeys
|
||||||
|
.filter((key) => key.split('.')[1] === 'dev-0')
|
||||||
|
.sort();
|
||||||
|
const dev1keys = elemKeys
|
||||||
|
.filter((key) => key.split('.')[1] === 'dev-1')
|
||||||
|
.sort();
|
||||||
|
const testAkeys = elemKeys
|
||||||
|
.filter((key) => key.split('.')[1] === 'test-A')
|
||||||
|
.sort();
|
||||||
|
result = result.concat(dev0keys);
|
||||||
|
result = result.concat(dev1keys);
|
||||||
|
result = result.concat(testAkeys);
|
||||||
|
result.push('when');
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default orderKeys;
|
Loading…
Reference in New Issue
Block a user