Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/BuildController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ public function build(Request $request, int $build_id): View
return $this->vue('build-build-page', 'Build', $params);
}

public function commands(int $build_id): View
public function instrumentation(int $build_id): View
{
$this->setBuildById($build_id);

$filters = json_decode(request()->query('filters')) ?? ['all' => []];

return $this->vue('build-commands-page', 'Commands', [
return $this->vue('build-instrumentation-page', 'Instrumentation', [
'build-id' => $this->build->Id,
'initial-filters' => $filters,
]);
Expand Down
2 changes: 1 addition & 1 deletion resources/js/vue/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const app = Vue.createApp({
UsersPage: Vue.defineAsyncComponent(() => import('./components/UsersPage.vue')),
BuildFilesPage: Vue.defineAsyncComponent(() => import('./components/BuildFilesPage.vue')),
BuildTargetsPage: Vue.defineAsyncComponent(() => import('./components/BuildTargetsPage.vue')),
BuildCommandsPage: Vue.defineAsyncComponent(() => import('./components/BuildCommandsPage.vue')),
BuildInstrumentationPage: Vue.defineAsyncComponent(() => import('./components/BuildInstrumentationPage.vue')),
BuildBuildPage: Vue.defineAsyncComponent(() => import('./components/BuildBuildPage.vue')),
CoverageFilePage: Vue.defineAsyncComponent(() => import('./components/CoverageFilePage.vue')),
BuildCoveragePage: Vue.defineAsyncComponent(() => import('./components/BuildCoveragePage.vue')),
Expand Down
6 changes: 3 additions & 3 deletions resources/js/vue/components/shared/BuildSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
data-test="sidebar-notes"
/>
<build-sidebar-item
:href="`${$baseURL}/builds/${buildId}/commands`"
:href="`${$baseURL}/builds/${buildId}/instrumentation`"
title="Instrumentation"
:icon="FA.faGaugeHigh"
:selected="activeTab === 'instrumentation'"
:disabled="commandsDisabled"
:disabled="instrumentationDisabled"
data-test="sidebar-instrumentation"
/>
<build-sidebar-item
Expand Down Expand Up @@ -255,7 +255,7 @@ export default {
notesDisabled() {
return !this.build || !this.build.notes || this.build.notes.pageInfo.total === 0;
},
commandsDisabled() {
instrumentationDisabled() {
return !this.build || !this.build.commands || this.build.commands.pageInfo.total === 0;
},
targetsDisabled() {
Expand Down
3 changes: 2 additions & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@
Route::get('/builds/{build_id}/targets', 'BuildController@targets')
->whereNumber('build_id');

Route::get('/builds/{build_id}/commands', 'BuildController@commands')
Route::get('/builds/{build_id}/instrumentation', 'BuildController@instrumentation')
->whereNumber('build_id');
Route::permanentRedirect('/build/{build_id}/commands', url('/builds/{build_id}/instrumentation'));

Route::get('/builds/{build_id}/files', 'BuildController@files')
->whereNumber('build_id');
Expand Down
2 changes: 1 addition & 1 deletion tests/Browser/Pages/BuildSidebarComponentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public function testInstrumentationItem(): void
'workingdirectory' => Str::uuid()->toString(),
]);

$this->assertNotDisabled($browser, "/builds/{$build->id}", '@sidebar-instrumentation', "/builds/{$build->id}/commands");
$this->assertNotDisabled($browser, "/builds/{$build->id}", '@sidebar-instrumentation', "/builds/{$build->id}/instrumentation");
});
}

Expand Down