Skip to content

improve workspace suspension code and update workspace modal UI #76

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

Merged
nadirhamid merged 1 commit into from
Jun 6, 2026
Merged

improve workspace suspension code and update workspace modal UI #76

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
25 changes: 8 additions & 17 deletions app/app/Helpers/MainHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use App\ApiCredential;
use App\ApiCredentialKVStore;
use App\SupportTicket;
use App\WorkspaceSuspension;
use App\Helpersa\WebSvcHelper;
use Config;
use Auth;
Expand Down Expand Up @@ -1302,23 +1303,13 @@ public static function numTicketsOpen() {
}

public static function isWorkspaceSuspended($workspaceId) {
$gracePeriod = 7 * 24 * 3600; // 7 days in seconds

$suspensions = \App\WorkspaceSuspension::where('workspace_id', $workspaceId)->get();

$now = new \DateTime();

foreach ($suspensions as $suspension) {
$suspendedAt = $suspension->suspended_at;
$gracePeriodExtension = $suspension->grace_period_extension ?? 0;

$totalGracePeriod = $gracePeriod + ($gracePeriodExtension * 3600);

$suspensionDeadline = (new \DateTime($suspendedAt->format('Y-m-d H:i:s')))->modify("+{$totalGracePeriod} seconds");

if ($now > $suspensionDeadline) {
return true;
}
$suspensions = WorkspaceSuspension::where('workspace_id', $workspaceId)
->where('status', 'SUSPENDED')
->orderBy('suspended_at', 'desc')
->count();

if ($suspensions > 0) {
return true;
}

return false;
Expand Down
14 changes: 8 additions & 6 deletions app/app/Http/Controllers/Admin/WorkspaceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ public function index()
public function create()
{
$gracePeriodExtension = null;
$activeSuspension = null;
$isWorkspaceSuspended = false;
return view('admin.workspace.create_edit', compact('gracePeriodExtension', 'activeSuspension', 'isWorkspaceSuspended'));
$isSuspended = null;
return view('admin.workspace.create_edit', compact('gracePeriodExtension', 'isSuspended'));
}

/**
Expand Down Expand Up @@ -89,9 +88,12 @@ public function edit(Workspace $workspace)
$routingACLs = WorkspaceHelper::getACLs($workspace);
$planHistory = PlanUsagePeriod::where("workspace_id", $workspace->id)->get();
$gracePeriodExtension = WorkspaceSuspensionHelper::getGracePeriodExtension($workspace->id);
$activeSuspension = WorkspaceSuspensionHelper::getActiveSuspension($workspace->id);
$isWorkspaceSuspended = !empty($activeSuspension);
return view('admin.workspace.create_edit', compact('workspace', 'users', 'billingHistory', 'billingInfo', 'usageTriggers', 'routingACLs', 'planHistory', 'invoices', 'gracePeriodExtension', 'activeSuspension', 'isWorkspaceSuspended'));
$isSuspended = NULL;
if (MainHelper::isWorkspaceSuspended($workspace->id)) {
$isSuspended = TRUE;
}

return view('admin.workspace.create_edit', compact('workspace', 'users', 'billingHistory', 'billingInfo', 'usageTriggers', 'routingACLs', 'planHistory', 'invoices', 'gracePeriodExtension', 'isSuspended'));
}

/**
Expand Down
28 changes: 10 additions & 18 deletions app/resources/views/admin/workspace/create_edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
<span class="help-block">{{ $errors->first('name', ':message') }}</span>
</div>
</div>
@if (isset($workspace))
<div class="form-group">
<div class="controls">
@if (!empty($isSuspended))
<span class="label label-danger" style="font-size: 13px; display: inline-block; padding: 6px 10px;">Suspended</span>
@endif
</div>
</div>
@endif
<div class="form-group {{ $errors->has('active') ? 'has-error' : '' }}">
{!! Form::label('active', trans("admin/workspaces.active"), array('class' => 'control-label')) !!}
<div class="controls">
Expand All @@ -46,24 +55,7 @@
<span class="help-block">{{ $errors->first('confirmed', ':message') }}</span>
</div>
</div>
@if (isset($workspace))
<div class="form-group">
{!! Form::label('workspace_status', 'Status', array('class' => 'control-label')) !!}
<div class="controls">
@if (!empty($activeSuspension))
<span class="label label-danger" style="font-size: 13px; display: inline-block; padding: 6px 10px;">Suspended</span>
<span class="help-block">
Reason: {{ $activeSuspension->reason }}.
Suspended at: {{ $activeSuspension->suspended_at }}.
</span>
@elseif (!empty($workspace->active))
<span class="label label-success" style="font-size: 13px; display: inline-block; padding: 6px 10px;">Active</span>
@else
<span class="label label-default" style="font-size: 13px; display: inline-block; padding: 6px 10px;">Inactive</span>
@endif
</div>
</div>
@endif

<div class="form-group">
<button type="submit" class="btn btn-sm btn-success">
<span class="glyphicon glyphicon-ok-circle"></span>
Expand Down
Loading