Skip to content

Commit

Permalink
MC-9840 Display async jobs for a user
Browse files Browse the repository at this point in the history 
* New page added to user profile area
* Supports filtering, sorting and pagination
* View and cancel async jobs
  • Loading branch information
@pjmonks
pjmonks committed Jun 17, 2022
1 parent b6041cd commit 40e7c5a
Show file tree
Hide file tree
Showing 15 changed files with 1,338 additions and 213 deletions.
278 changes: 185 additions & 93 deletions src/app/admin/app-container/app-container.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,99 +16,191 @@
SPDX-License-Identifier: Apache-2.0
-->
<!-- Main container for the Admin section -->
<div class="container settings-container">
<div flex fxLayout="row" fxLayout.md="row" fxLayout.sm="column" fxLayout.xs="column" fxLayoutAlign="space-between" fxLayoutGap="16px">
<aside role="menu" class="menu" fxFlex="18" fxFlex.md="18" fxHide.sm fxHide.xs>
<ul class="menu-list">
<p class="marginless pl-2 text-muted">Account settings</p>
<li>
<a role="menuitem" uiSref="appContainer.userArea.profile" uiSrefActive="active">
<span class="fas fa-id-card"></span>
<span>My profile</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.userArea.settings" uiSrefActive="active">
<span class="fas fa-sliders-h"></span>
<span>Preferences</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.userArea.changePassword" uiSrefActive="active">
<span class="fas fa-unlock-alt"></span>
<span>Change password</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.userArea.apiKeys" uiSrefActive="active">
<span class="fas fa-key"></span>
<span>API keys</span>
</a>
</li>
</ul>
<!-- Main container for the Admin section -->
<div class="container settings-container">
<div
flex
fxLayout="row"
fxLayout.md="row"
fxLayout.sm="column"
fxLayout.xs="column"
fxLayoutAlign="space-between"
fxLayoutGap="16px"
>
<aside
role="menu"
class="menu"
fxFlex="18"
fxFlex.md="18"
fxHide.sm
fxHide.xs
>
<ul class="menu-list">
<p class="marginless pl-2 text-muted">Account settings</p>
<li>
<a
role="menuitem"
uiSref="appContainer.userArea.profile"
uiSrefActive="active"
>
<span class="fas fa-id-card"></span>
<span>My profile</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.userArea.settings"
uiSrefActive="active"
>
<span class="fas fa-sliders-h"></span>
<span>Preferences</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.userArea.changePassword"
uiSrefActive="active"
>
<span class="fas fa-unlock-alt"></span>
<span>Change password</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.userArea.apiKeys"
uiSrefActive="active"
>
<span class="fas fa-key"></span>
<span>API keys</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.userArea.asyncJobs"
uiSrefActive="active"
>
<span class="fas fa-tasks"></span>
<span>Jobs</span>
</a>
</li>
</ul>

<ul class="menu-list" *ngIf="isAdministrator">
<p class="marginless pl-2 text-muted">Admin settings</p>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.home" uiSrefActive="active">
<span class="fas fa-tachometer-alt"></span>
<span>Dashboard</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.modelManagement" uiSrefActive="active">
<span class="fas fa-list" aria-hidden="true"></span>
<span>Model management</span>
</a>
</li>
<li>
<a role="menuitem" *ngIf="features.useSubscribedCatalogues" uiSref="appContainer.adminArea.subscribedCatalogues" uiSrefActive="active">
<span class="fas fa-rss" aria-hidden="true"></span>
<span>Subscribed catalogues</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.emails" uiSrefActive="active">
<span class="fas fa-envelope" aria-hidden="true"></span>
<span>Emails</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.users" uiSrefActive="active">
<span class="fas fa-user" aria-hidden="true"></span>
<span>Manage users</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.pendingUsers" uiSrefActive="active">
<span class="fas fa-user-clock"></span>
<span>Pending users</span>
<span class="badge pill-card--red" aria-hidden="false" *ngIf="pendingUsersCount > 0" style="margin-left: 6px;"> {{pendingUsersCount}} </span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.groups" uiSrefActive="active">
<span class="fas fa-users" aria-hidden="true"></span>
<span>Manage groups</span>
</a>
</li>
<li>
<a role="menuitem" *ngIf="features.useOpenIdConnect" uiSref="appContainer.adminArea.openIdConnectProviders" uiSrefActive="active">
<span class="fab fa-openid" aria-hidden="true"></span>
<span>OpenID Connect</span>
</a>
</li>
<li>
<a role="menuitem" uiSref="appContainer.adminArea.configuration" uiSrefActive="active">
<span class="fas fa-cog" aria-hidden="true"></span>
<span>Configuration</span>
</a>
</li>
</ul>
</aside>
<div id="settings-content" fxFlex="82" fxFlex.md="100" fxFlex.sm="100" fxFlex.xs="100">
<div ui-view></div>
</div>
<ul class="menu-list" *ngIf="isAdministrator">
<p class="marginless pl-2 text-muted">Admin settings</p>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.home"
uiSrefActive="active"
>
<span class="fas fa-tachometer-alt"></span>
<span>Dashboard</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.modelManagement"
uiSrefActive="active"
>
<span class="fas fa-list" aria-hidden="true"></span>
<span>Model management</span>
</a>
</li>
<li>
<a
role="menuitem"
*ngIf="features.useSubscribedCatalogues"
uiSref="appContainer.adminArea.subscribedCatalogues"
uiSrefActive="active"
>
<span class="fas fa-rss" aria-hidden="true"></span>
<span>Subscribed catalogues</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.emails"
uiSrefActive="active"
>
<span class="fas fa-envelope" aria-hidden="true"></span>
<span>Emails</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.users"
uiSrefActive="active"
>
<span class="fas fa-user" aria-hidden="true"></span>
<span>Manage users</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.pendingUsers"
uiSrefActive="active"
>
<span class="fas fa-user-clock"></span>
<span>Pending users</span>
<span
class="badge pill-card--red"
aria-hidden="false"
*ngIf="pendingUsersCount > 0"
style="margin-left: 6px"
>
{{ pendingUsersCount }}
</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.groups"
uiSrefActive="active"
>
<span class="fas fa-users" aria-hidden="true"></span>
<span>Manage groups</span>
</a>
</li>
<li>
<a
role="menuitem"
*ngIf="features.useOpenIdConnect"
uiSref="appContainer.adminArea.openIdConnectProviders"
uiSrefActive="active"
>
<span class="fab fa-openid" aria-hidden="true"></span>
<span>OpenID Connect</span>
</a>
</li>
<li>
<a
role="menuitem"
uiSref="appContainer.adminArea.configuration"
uiSrefActive="active"
>
<span class="fas fa-cog" aria-hidden="true"></span>
<span>Configuration</span>
</a>
</li>
</ul>
</aside>
<div
id="settings-content"
fxFlex="82"
fxFlex.md="100"
fxFlex.sm="100"
fxFlex.xs="100"
>
<div ui-view></div>
</div>
</div>
</div>
Loading

0 comments on commit 40e7c5a

Please sign in to comment.