diff --git a/management-service/pagination/pagination.go b/management-service/pagination/pagination.go index e45b1fc6..16f52002 100644 --- a/management-service/pagination/pagination.go +++ b/management-service/pagination/pagination.go @@ -7,7 +7,7 @@ import ( ) var ( - MaxPageSize int32 = 10 + MaxPageSize int32 = 50 DefaultPageSize int32 = 10 DefaultPage int32 = 1 ) diff --git a/ui/src/config.js b/ui/src/config.js index 25d44aba..b5bc8aef 100644 --- a/ui/src/config.js +++ b/ui/src/config.js @@ -36,8 +36,12 @@ export const appConfig = { : [{ href: "https://github.com/caraml-dev/xp", label: "XP User Guide" }], pagination: { defaultPageSize: 10, + experimentContextPageSize: 50, + }, + listExperimentFields: { + experimentTableFields: ["id", "type", "name", "status_friendly", "tier", "start_time", "end_time", "updated_at"], + experimentContextFields: ["id", "name","status_friendly", "treatments"], }, - experimentsTableColumns: ["id", "type", "name", "status", "tier", "start_time", "end_time", "updated_at"], tables: { defaultTextSize: "s", defaultIconSize: "s", diff --git a/ui/src/experiments/list/ListExperimentsView.js b/ui/src/experiments/list/ListExperimentsView.js index a245ae6d..bbefd766 100644 --- a/ui/src/experiments/list/ListExperimentsView.js +++ b/ui/src/experiments/list/ListExperimentsView.js @@ -28,7 +28,7 @@ const ListExperimentsComponent = ({ projectId, props }) => { appConfig: { pagination: { defaultPageSize }, pageTemplate: { restrictWidth, paddingSize }, - experimentsTableColumns: experimentsTableFields, + listExperimentFields: { experimentTableFields }, }, } = useConfig(); @@ -49,7 +49,7 @@ const ListExperimentsComponent = ({ projectId, props }) => { query: { page: page.index + 1, page_size: page.size, - fields: experimentsTableFields, + fields: experimentTableFields, ...getProcessedFilters(), }, }, diff --git a/ui/src/providers/experiment/context.js b/ui/src/providers/experiment/context.js index 39843a76..061e4824 100644 --- a/ui/src/providers/experiment/context.js +++ b/ui/src/providers/experiment/context.js @@ -30,8 +30,9 @@ export const ExperimentContextProvider = ({ projectId, children }) => { start_time: start_time, end_time: end_time, page: pageIndex + 1, - page_size: appConfig.pagination.defaultPageSize, - status: "active" + page_size: appConfig.pagination.experimentContextPageSize, + fields: appConfig.listExperimentFields.experimentContextFields, + status_friendly: ["running", "scheduled"] }, }, { data: [], paging: { total: 0 } } diff --git a/ui/src/turing/components/form/standard_ensembler/LinkedRoutesTable.js b/ui/src/turing/components/form/standard_ensembler/LinkedRoutesTable.js index d81b4ce3..48cd596b 100644 --- a/ui/src/turing/components/form/standard_ensembler/LinkedRoutesTable.js +++ b/ui/src/turing/components/form/standard_ensembler/LinkedRoutesTable.js @@ -9,7 +9,6 @@ import { EuiTextColor, } from "@elastic/eui"; -import { getExperimentStatus } from "services/experiment/ExperimentStatus"; import { LinkedExperimentsContextMenu } from "./LinkedExperimentsContextMenu"; import ExperimentContext from "providers/experiment/context"; @@ -36,7 +35,7 @@ export const LinkedRoutesTable = ({ for (let treatment of experiment.treatments) { let configRouteName = getRouteName(treatment.configuration, treatmentConfigRouteNamePath); if (typeof configRouteName === 'string' && configRouteName in newRouteToExperimentMappings) { - newRouteToExperimentMappings[configRouteName][getExperimentStatus(experiment).label.toLowerCase()][experiment.id] = experiment; + newRouteToExperimentMappings[configRouteName][experiment.status_friendly][experiment.id] = experiment; } } }