Skip to content

Commit c2f2ba4

Browse files
author
Thomas Desveaux
committed
gridview: filterout old builders
1 parent 684f30c commit c2f2ba4

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/views/GridView/DNEGridView.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ function resolvedDataMultiCollection<ParentDataType extends BaseClass, DataType
9898
return new DataMultiCollection<ParentDataType, DataType>(accessor, observable([]), null, null, () => resolvedDataCollection<DataType>());
9999
}
100100

101-
function getDatas(viewTag: string, buildFetchLimit: number) {
101+
function getDatas(viewTag: string, buildFetchLimit: number, show_old_builders: boolean) {
102102
const accessor = useDataAccessor([]);
103103

104104
const buildersQuery = useDataApiQuery(() => Builder.getAll(accessor, {query: {order: 'name'}}));
105105
const builders: Builder[] = buildersQuery
106106
.array
107-
.filter((b: Builder) => b.tags.indexOf(viewTag) >= 0);
107+
.filter((b: Builder) => b.tags.indexOf(viewTag) >= 0 && (show_old_builders || b.masterids.length > 0));
108108

109109
const builderIds = observable(builders.map((b: Builder) => b.id));
110110

@@ -314,6 +314,7 @@ export const DNEGridView = observer(() => {
314314
const config: DNEConfig = getConfig();
315315
const settings = buildbotGetSettings();
316316
const buildFetchLimitSetting = settings.getIntegerSetting("DNEGrid.buildFetchLimit");
317+
const showOldBuilders = buildbotGetSettings().getBooleanSetting("Builders.show_old_builders");
317318
const {form: viewSelectForm, viewTag, length: buildFetchLimit} = getViewSelectForm(config, buildFetchLimitSetting);
318319
const {
319320
queriesResolved,
@@ -322,7 +323,7 @@ export const DNEGridView = observer(() => {
322323
buildsQuery,
323324
buildChangeMap,
324325
revisionChangeMap,
325-
} = getDatas(viewTag, buildFetchLimit);
326+
} = getDatas(viewTag, buildFetchLimit, showOldBuilders);
326327

327328
const changeIsExpandedByChangeId = useLocalObservable(() => new ObservableMap<number, boolean>());
328329

0 commit comments

Comments
 (0)