Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit site description directly from /sites/<id> #2701

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Edit site description directly from /sites/<id> #2701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 43 additions & 0 deletions app/GraphQL/Mutations/UpdateSiteDescription.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

declare(strict_types=1);

namespace App\GraphQL\Mutations;

use App\Models\Site;
use App\Models\User;

final class UpdateSiteDescription extends AbstractMutation
{
public ?Site $site = null;

/** @param array{
* siteId: int,
* description: string
* } $args
*/
protected function mutate(array $args): void
{
/** @var ?User $user */
$user = auth()->user();

if ($user === null) {
abort(401, 'Authentication required to edit site descriptions.');
}

$site = Site::find((int) $args['siteId']);

if ($site === null) {
abort(404, 'Requested site not found.');
}

$newSiteInformation = $site->mostRecentInformation?->getAttributes() ?? [];
unset($newSiteInformation['id']);
unset($newSiteInformation['siteid']);
unset($newSiteInformation['timestamp']);
$newSiteInformation['description'] = $args['description'];
$site->information()->create($newSiteInformation);

$this->site = $site;
}
}
273 changes: 0 additions & 273 deletions app/Http/Controllers/SiteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
namespace App\Http\Controllers;

use App\Models\Site;
use App\Models\User;
use CDash\Database;
use CDash\Model\Project;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\View\View;

Expand Down Expand Up @@ -96,278 +92,9 @@ public function siteStatistics(): View|RedirectResponse
->with('sites', $sites);
}

public function editSite(): View|RedirectResponse
{
$userid = Auth::id();

$xml = begin_XML_for_XSLT();
$xml .= '<menutitle>CDash</menutitle>';
$xml .= '<menusubtitle>Claim sites</menusubtitle>';

// Post
@$claimsites = $_POST['claimsites'];
$availablesites = $_POST['availablesites'] ?? [];
$checkedsites = $_POST['checkedsites'] ?? [];
if ($claimsites) {
foreach ($availablesites as $siteid) {
if (array_key_exists($siteid, $checkedsites)) {
self::add_site2user(intval($siteid), intval($userid));
} else {
self::remove_site2user(intval($siteid), intval($userid));
}
}
$xml .= add_XML_value('warning', 'Claimed sites updated.');
}

@$claimsite = $_POST['claimsite'];
$claimsiteid = intval($_POST['claimsiteid'] ?? -1);
if ($claimsite) {
self::add_site2user(intval($claimsiteid), intval($userid));
}

@$updatesite = $_POST['updatesite'];
@$geolocation = $_POST['geolocation'];

$db = Database::getInstance();

if (isset($_POST['unclaimsite']) && isset($_GET['siteid'])) {
DB::delete('
DELETE FROM site2user
WHERE siteid=? AND userid=?
', [intval($_GET['siteid']), $userid]);
return redirect('/user');
}

if ($updatesite || $geolocation) {
$site_name = request()->string('site_name');
$site_description = request()->post('site_description');
$site_processoris64bits = request()->post('site_processoris64bits');
$site_processorvendor = request()->post('site_processorvendor');
$site_processorvendorid = request()->post('site_processorvendorid');
$site_processorfamilyid = request()->post('site_processorfamilyid');
$site_processormodelid = request()->post('site_processormodelid');
$site_processorcachesize = request()->post('site_processorcachesize');
$site_numberlogicalcpus = request()->post('site_numberlogicalcpus');
$site_numberphysicalcpus = request()->post('site_numberphysicalcpus');
$site_totalvirtualmemory = request()->post('site_totalvirtualmemory');
$site_totalphysicalmemory = request()->post('site_totalphysicalmemory');
$site_logicalprocessorsperphysical = request()->post('site_logicalprocessorsperphysical');
$site_processorclockfrequency = request()->post('site_processorclockfrequency');
$site_ip = $_POST['site_ip'];
$site_longitude = $_POST['site_longitude'];
$site_latitude = $_POST['site_latitude'];

if (isset($_POST['outoforder'])) {
$outoforder = true;
} else {
$outoforder = false;
}
}

if ($updatesite) {
self::update_site(
$claimsiteid,
$site_name,
[
'processoris64bits' => $site_processoris64bits,
'processorvendor' => $site_processorvendor,
'processorvendorid' => $site_processorvendorid,
'processorfamilyid' => $site_processorfamilyid,
'processormodelid' => $site_processormodelid,
'processorcachesize' => $site_processorcachesize,
'numberlogicalcpus' => $site_numberlogicalcpus,
'numberphysicalcpus' => $site_numberphysicalcpus,
'totalvirtualmemory' => $site_totalvirtualmemory,
'totalphysicalmemory' => $site_totalphysicalmemory,
'logicalprocessorsperphysical' => $site_logicalprocessorsperphysical,
'processorclockfrequency' => $site_processorclockfrequency,
'description' => $site_description,
],
$site_ip,
$site_latitude,
$site_longitude,
$outoforder
);
}

// If we should retrieve the geolocation
if ($geolocation) {
$location = get_geolocation($site_ip);
self::update_site(
$claimsiteid,
$site_name,
[
'processoris64bits' => $site_processoris64bits,
'processorvendor' => $site_processorvendor,
'processorvendorid' => $site_processorvendorid,
'processorfamilyid' => $site_processorfamilyid,
'processormodelid' => $site_processormodelid,
'processorcachesize' => $site_processorcachesize,
'numberlogicalcpus' => $site_numberlogicalcpus,
'numberphysicalcpus' => $site_numberphysicalcpus,
'totalvirtualmemory' => $site_totalvirtualmemory,
'totalphysicalmemory' => $site_totalphysicalmemory,
'logicalprocessorsperphysical' => $site_logicalprocessorsperphysical,
'processorclockfrequency' => $site_processorclockfrequency,
'description' => $site_description,
],
$site_ip,
$location['latitude'],
$location['longitude'],
$outoforder
);
}

// If we have a projectid that means we should list all the sites
$projectid = $_GET['projectid'] ?? null;
if ($projectid !== null) {
$projectid = (int) $projectid;
}
if ($projectid !== null) {
$project_array = $db->executePreparedSingleRow('SELECT name FROM project WHERE id=?', [$projectid]);
$xml .= '<project>';
$xml .= add_XML_value('id', $projectid);
$xml .= add_XML_value('name', $project_array['name']);
$xml .= '</project>';

// Select sites that belong to this project
$beginUTCTime = gmdate(FMT_DATETIME, time() - 3600 * 7 * 24); // 7 days
$site2project = $db->executePrepared('
SELECT DISTINCT site.id, site.name
FROM build, site
WHERE
build.projectid=?
AND build.starttime>?
AND site.id=build.siteid
ORDER BY site.name ASC
', [$projectid, $beginUTCTime]);

foreach ($site2project as $site2project_array) {
$siteid = intval($site2project_array['id']);
$xml .= '<site>';
$xml .= add_XML_value('id', $siteid);
$xml .= add_XML_value('name', $site2project_array['name']);
$user2site = $db->executePreparedSingleRow('
SELECT COUNT(*) AS c
FROM site2user
WHERE siteid=? AND userid=?
', [$siteid, intval($userid)]);
if (intval($user2site['c']) === 0) {
$xml .= add_XML_value('claimed', '0');
} else {
$xml .= add_XML_value('claimed', '1');
}
$xml .= '</site>';
}
}

// If we have a siteid we look if the user has claimed the site or not
$siteid = $_GET['siteid'] ?? null;
if ($siteid !== null) {
$xml .= '<user>';
$xml .= '<site>';
$site = Site::findOrFail((int) $siteid);

$xml .= add_XML_value('id', $site->id);
$xml .= add_XML_value('name', $site->name);
$xml .= add_XML_value('description', stripslashes($site->mostRecentInformation->description ?? ''));
$xml .= add_XML_value('processoris64bits', $site->mostRecentInformation?->processoris64bits);
$xml .= add_XML_value('processorvendor', $site->mostRecentInformation?->processorvendor);
$xml .= add_XML_value('processorvendorid', $site->mostRecentInformation?->processorvendorid);
$xml .= add_XML_value('processorfamilyid', $site->mostRecentInformation?->processorfamilyid);
$xml .= add_XML_value('processormodelid', $site->mostRecentInformation?->processormodelid);
$xml .= add_XML_value('processorcachesize', $site->mostRecentInformation?->processorcachesize);
$xml .= add_XML_value('numberlogicalcpus', $site->mostRecentInformation?->numberlogicalcpus);
$xml .= add_XML_value('numberphysicalcpus', $site->mostRecentInformation?->numberphysicalcpus);
$xml .= add_XML_value('totalvirtualmemory', $site->mostRecentInformation?->totalvirtualmemory);
$xml .= add_XML_value('totalphysicalmemory', $site->mostRecentInformation?->totalphysicalmemory);
$xml .= add_XML_value('logicalprocessorsperphysical', $site->mostRecentInformation?->logicalprocessorsperphysical);
$xml .= add_XML_value('processorclockfrequency', $site->mostRecentInformation?->processorclockfrequency);
$xml .= add_XML_value('ip', $site->ip);
$xml .= add_XML_value('latitude', $site->latitude);
$xml .= add_XML_value('longitude', $site->longitude);
$xml .= add_XML_value('outoforder', $site->outoforder);
$xml .= '</site>';

$user2site = $db->executePreparedSingleRow('
SELECT su.userid
FROM
site2user AS su,
user2project AS up
WHERE
su.userid=up.userid
AND up.role>0
AND su.siteid=?
AND su.userid=?
', [$siteid, $userid]);
echo pdo_error();
if (!empty($user2site)) {
$xml .= add_XML_value('siteclaimed', '0');
} else {
$xml .= add_XML_value('siteclaimed', '1');
}

$xml .= '</user>';
}

$xml .= '</cdash>';

return $this->view('cdash', 'Edit Site')
->with('xsl', true)
->with('xsl_content', generate_XSLT($xml, base_path() . '/app/cdash/public/editSite', true));
}

public function viewSite(Site $site): View
{
return $this->view('site.view-site', $site->name)
->with('site', $site);
}

/**
* add a user to a site
*/
private static function add_site2user(int $siteid, int $userid): void
{
$db = Database::getInstance();
$site2user = $db->executePrepared('SELECT * FROM site2user WHERE siteid=? AND userid=?', [intval($siteid), intval($userid)]);
if (!empty($site2user)) {
DB::insert('INSERT INTO site2user (siteid, userid) VALUES (?, ?)', [$siteid, $userid]);
}
}

/**
* remove a user from a site
*/
private static function remove_site2user(int $siteid, int $userid): void
{
DB::delete('DELETE FROM site2user WHERE siteid=? AND userid=?', [$siteid, $userid]);
}

/**
* Update a site
*
* @param array<string,mixed> $information
*/
private static function update_site(
int $siteid,
string $name,
array $information,
$ip,
$latitude,
$longitude,
bool $outoforder = false,
): void {
// Update the basic information first
$site = Site::findOrFail($siteid);
$site->updateOrFail([
'name' => $name,
'ip' => $ip,
'latitude' => $latitude,
'longitude' => $longitude,
'outoforder' => $outoforder,
]);

// Create a new information row if something has changed since the most recent update
$site->mostRecentInformation()->firstOrCreate($information);
}
}
3 changes: 2 additions & 1 deletion app/Models/SiteInformation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;

/**
* @property string $timestamp
* @property Carbon $timestamp
* @property bool|null $processoris64bits
* @property string|null $processorvendor
* @property string|null $processorvendorid
Expand Down
Loading