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
3 changes: 0 additions & 3 deletions app/Models/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
* @property bool $showcoveragecode
* @property bool $sharelabelfilters
* @property bool $authenticatesubmissions
* @property bool $viewsubprojectslink
* @property ?string $ldapfilter
* @property ?string $banner
* @property ?string $logoUrl
Expand Down Expand Up @@ -95,7 +94,6 @@ class Project extends Model
'showcoveragecode',
'sharelabelfilters',
'authenticatesubmissions',
'viewsubprojectslink',
'ldapfilter',
'banner',
'cmakeprojectroot',
Expand All @@ -115,7 +113,6 @@ class Project extends Model
'showcoveragecode' => 'boolean',
'sharelabelfilters' => 'boolean',
'authenticatesubmissions' => 'boolean',
'viewsubprojectslink' => 'boolean',
];

public const PROJECT_ADMIN = 2;
Expand Down
3 changes: 0 additions & 3 deletions app/cdash/app/Model/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class Project
public $EmailMaxChars = 255;
public $DisplayLabels = 0;
public $ShareLabelFilters = 0;
public $ViewSubProjectsLink = 0;
public $AuthenticateSubmissions = 0;
public $ShowCoverageCode = 0;
public $AutoremoveTimeframe = 0;
Expand Down Expand Up @@ -131,7 +130,6 @@ public function Save(): bool
'emailredundantfailures' => filter_var($this->EmailRedundantFailures, FILTER_VALIDATE_BOOLEAN),
'displaylabels' => filter_var($this->DisplayLabels, FILTER_VALIDATE_BOOLEAN),
'sharelabelfilters' => filter_var($this->ShareLabelFilters, FILTER_VALIDATE_BOOLEAN),
'viewsubprojectslink' => filter_var($this->ViewSubProjectsLink, FILTER_VALIDATE_BOOLEAN),
'authenticatesubmissions' => filter_var($this->AuthenticateSubmissions, FILTER_VALIDATE_BOOLEAN),
'showcoveragecode' => filter_var($this->ShowCoverageCode, FILTER_VALIDATE_BOOLEAN),
'autoremovetimeframe' => (int) $this->AutoremoveTimeframe,
Expand Down Expand Up @@ -219,7 +217,6 @@ public function Fill(): void
$this->EmailRedundantFailures = (int) $project->emailredundantfailures;
$this->DisplayLabels = $project->displaylabels;
$this->ShareLabelFilters = $project->sharelabelfilters;
$this->ViewSubProjectsLink = $project->viewsubprojectslink;
$this->AuthenticateSubmissions = $project->authenticatesubmissions;
$this->ShowCoverageCode = $project->showcoveragecode;
$this->AutoremoveTimeframe = $project->autoremovetimeframe;
Expand Down
1 change: 0 additions & 1 deletion app/cdash/tests/kwtest/kw_web_tester.php
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ public function createProject($input_settings, $update = false,
'TestTimeStd' => 4,
'TestTimeStdThreshold' => 1,
'UploadQuota' => 1073741824,
'ViewSubProjectsLink' => true,
'WarningsFilter' => '',
'ErrorsFilter' => '',
];
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;

return new class extends Migration {
public function up(): void
{
DB::statement('ALTER TABLE project DROP COLUMN viewsubprojectslink');
}

public function down(): void
{
}
};
1 change: 0 additions & 1 deletion database/seeders/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ private function createTrilinosProject(): void
{
$project = $this->makePublicProject('Trilinos');
$project->description = 'Submission files donated by the Trilinos project.';
$project->viewsubprojectslink = true;
$project->save();

$files_to_submit = file_get_contents(app_path('/cdash/tests/data/ActualTrilinosSubmission/orderedFileList.txt'));
Expand Down
8 changes: 0 additions & 8 deletions graphql/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,6 @@ type Project {
"Forward label filters from index.php to queryTests.php and viewTest.php."
shareLabelFilters: Boolean! @rename(attribute: "sharelabelfilters")

"""
If true and this Project uses SubProjects, show a per-SubProject breakdown by default. If false,
CDash will show per-build results instead.
"""
showViewSubProjectsLink: Boolean! @rename(attribute: "viewsubprojectslink")

"Custom text displayed at the top of a project's dashboard."
banner: String

Expand Down Expand Up @@ -477,8 +471,6 @@ input UpdateProjectInput @validator {

shareLabelFilters: Boolean @rename(attribute: "sharelabelfilters")

showViewSubProjectsLink: Boolean @rename(attribute: "viewsubprojectslink")

banner: String
}

Expand Down
14 changes: 4 additions & 10 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -10338,12 +10338,6 @@ parameters:
count: 1
path: app/cdash/app/Model/Project.php

-
rawMessage: Property CDash\Model\Project::$ViewSubProjectsLink has no type specified.
identifier: missingType.property
count: 1
path: app/cdash/app/Model/Project.php

-
rawMessage: Property CDash\Model\Project::$WarningsFilter has no type specified.
identifier: missingType.property
Expand Down Expand Up @@ -16147,19 +16141,19 @@ parameters:
path: app/cdash/tests/kwtest/kw_web_tester.php

-
rawMessage: 'Method class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:803::__construct() has parameter $response with no type specified.'
rawMessage: 'Method class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:802::__construct() has parameter $response with no type specified.'
identifier: missingType.parameter
count: 1
path: app/cdash/tests/kwtest/kw_web_tester.php

-
rawMessage: 'Method class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:803::getSent() has no return type specified.'
rawMessage: 'Method class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:802::getSent() has no return type specified.'
identifier: missingType.return
count: 1
path: app/cdash/tests/kwtest/kw_web_tester.php

-
rawMessage: 'Method class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:803::read() has no return type specified.'
rawMessage: 'Method class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:802::read() has no return type specified.'
identifier: missingType.return
count: 1
path: app/cdash/tests/kwtest/kw_web_tester.php
Expand Down Expand Up @@ -16387,7 +16381,7 @@ parameters:
path: app/cdash/tests/kwtest/kw_web_tester.php

-
rawMessage: Property class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:803::$read has no type specified.
rawMessage: Property class@anonymous/app/cdash/tests/kwtest/kw_web_tester.php:802::$read has no type specified.
identifier: missingType.property
count: 1
path: app/cdash/tests/kwtest/kw_web_tester.php
Expand Down
11 changes: 0 additions & 11 deletions resources/js/vue/components/ProjectSettings/GeneralTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,6 @@
label="Display Labels"
test-id="display-labels-input"
/>

<CheckboxField
v-model="form.showViewSubProjectsLink"
:validation-error="validationErrors?.showViewSubProjectsLink?.[0]"
label="Show View SubProjects Link"
description="If this Project uses SubProjects, show a per-SubProject breakdown by default.
If unchecked, CDash will show per-build results instead."
test-id="view-subprojects-link-input"
/>
</FormSection>

<FormSection
Expand Down Expand Up @@ -552,7 +543,6 @@ export default {
fileUploadLimit: 50,
showCoverageCode: true,
shareLabelFilters: false,
showViewSubProjectsLink: true,
banner: '',
},
validationErrors: {},
Expand Down Expand Up @@ -598,7 +588,6 @@ export default {
fileUploadLimit
showCoverageCode
shareLabelFilters
showViewSubProjectsLink
banner
}
}
Expand Down
2 changes: 0 additions & 2 deletions tests/Browser/Pages/ProjectSettingsPageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ public static function canChangeGeneralTabFieldCases(): array
['@banner-input', '', 'banner', null, 'string'],
['@display-labels-input', true, 'displaylabels', true, 'checkbox'],
['@display-labels-input', false, 'displaylabels', false, 'checkbox'],
['@view-subprojects-link-input', true, 'viewsubprojectslink', true, 'checkbox'],
['@view-subprojects-link-input', false, 'viewsubprojectslink', false, 'checkbox'],
['@nightly-time-input', '23:01:01', 'nightlytime', '23:01:01', 'string'],
['@autoremove-time-frame-input', 7, 'autoremovetimeframe', 7, 'string'],
['@autoremove-max-builds-input', 100, 'autoremovemaxbuilds', 100, 'string'],
Expand Down
1 change: 0 additions & 1 deletion tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ public static function fieldValues(): array
['fileUploadLimit', 50, 'uploadquota', 53687091200],
['showCoverageCode', false, 'showcoveragecode', false],
['shareLabelFilters', false, 'sharelabelfilters', false],
['showViewSubProjectsLink', false, 'viewsubprojectslink', false],
['banner', 'new banner', 'banner', 'new banner'],
];
}
Expand Down
2 changes: 0 additions & 2 deletions tests/Feature/GraphQL/ProjectTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ public static function fieldValues(): array
['showcoveragecode', false, 'showCoverageCode', false],
['sharelabelfilters', true, 'shareLabelFilters', true],
['sharelabelfilters', false, 'shareLabelFilters', false],
['viewsubprojectslink', true, 'showViewSubProjectsLink', true],
['viewsubprojectslink', false, 'showViewSubProjectsLink', false],
['banner', 'test', 'banner', 'test'],
['banner', null, 'banner', null],
];
Expand Down