diff --git a/app/cdash/public/js/controllers/viewProjects.js b/app/cdash/public/js/controllers/viewProjects.js deleted file mode 100644 index 38dcfd474f..0000000000 --- a/app/cdash/public/js/controllers/viewProjects.js +++ /dev/null @@ -1,6 +0,0 @@ -CDash.controller('ViewProjectsController', - ["$scope", "apiLoader", function ViewProjectsController($scope, apiLoader) { - // Hide filters by default. - $scope.showfilters = false; - apiLoader.loadPageData($scope, 'api/v1/viewProjects.php'); -}]); diff --git a/resources/js/app.js b/resources/js/app.js index 6eaac34c5c..09f81e7cd6 100755 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -19,6 +19,7 @@ import HeaderNav from "./components/page-header/HeaderNav.vue"; import HeaderMenu from "./components/page-header/HeaderMenu.vue"; import HeaderLogo from "./components/page-header/HeaderLogo.vue"; import ViewDynamicAnalysis from "./components/ViewDynamicAnalysis.vue"; +import AllProjects from "./components/AllProjects.vue"; const cdash_components = { BuildConfigure, @@ -35,6 +36,7 @@ const cdash_components = { HeaderMenu, HeaderLogo, ViewDynamicAnalysis, + AllProjects, }; /** diff --git a/resources/js/components/AllProjects.vue b/resources/js/components/AllProjects.vue new file mode 100644 index 0000000000..ef0d4473d4 --- /dev/null +++ b/resources/js/components/AllProjects.vue @@ -0,0 +1,162 @@ + + + diff --git a/resources/views/project/view-all-projects.blade.php b/resources/views/project/view-all-projects.blade.php index 51c3892245..5d3edb1464 100644 --- a/resources/views/project/view-all-projects.blade.php +++ b/resources/views/project/view-all-projects.blade.php @@ -1,78 +1,8 @@ @extends('cdash', [ - 'angular' => true, - 'angular_controller' => 'ViewProjectsController' + 'vue' => true, + 'title' => 'Projects', ]) @section('main_content') - @verbatim -

- - The current database schema doesn't match the version of CDash - you are running, upgrade your database structure in the - - Administration/CDash maintenance panel of CDash - - -

- -

- No Projects Found -

- - - - - - - - - - - - - - - - - - - - - - -

Dashboards

ProjectDescriptionLast activity
- - {{project.name}} - - {{project.description}} - - - {{project.lastbuild_elapsed}} - - -
- - - - - - - - -
- -
- @endverbatim + @endsection diff --git a/tests/Feature/CDashTest.php b/tests/Feature/CDashTest.php index 5585a01783..094d76d829 100755 --- a/tests/Feature/CDashTest.php +++ b/tests/Feature/CDashTest.php @@ -98,7 +98,7 @@ public function testViewProjectsRedirectNoPublicProjects(): void $this->get('/projects')->assertRedirect('/login'); $normal_user = $this->makeNormalUser(); - $this->actingAs($normal_user)->get('/projects')->assertOk()->assertSeeText('No Projects Found'); + $this->actingAs($normal_user)->get('/projects')->assertOk()->assertViewIs('project.view-all-projects'); $normal_user->delete(); } }