Welcome to Dashboard!
+
+
+
+
+
+
+ DASHBOARD
+ + {/* Recent Jobs */} +
+ setShowJobs(!showJobs)}
+ >
+ {showJobs ?
+ {showJobs &&
+
+ {/* Allocations */}
+ setShowJobs(!showJobs)}
+ >
+ {showJobs ?
+ {showJobs &&
+ setShowAllocations(!showAllocations)}
+ >
+ {showAllocations ?
+ {showAllocations &&
+ setShowAllocations(!showAllocations)}
+ >
+ {showAllocations ?
+ {showAllocations &&
+
+ ({
+ key: sys.hostname,
+ ...sys,
+ }))}
+ loading={isLoading}
+ size="small"
+ pagination={false}
+ />
+
+
System Status
+| Project Code | +Awarded | +Remaining | +Expiration | +
|---|---|---|---|
| {alloc.project_code} | +{alloc.awarded} | +{alloc.remaining} | +{alloc.expiration} | +
+
+ );
+};
+
+export default UserGuides;
diff --git a/client/modules/dashboard/src/index.ts b/client/modules/dashboard/src/index.ts
index 8da971af85..63298d4a27 100644
--- a/client/modules/dashboard/src/index.ts
+++ b/client/modules/dashboard/src/index.ts
@@ -1 +1,4 @@
export * from './Dashboard/Dashboard';
+export * from './Dashboard/JobsListingWrapper';
+export * from './Dashboard/JobDetailModalWrapper';
+export * from './Dashboard/Jobstatus';
diff --git a/client/modules/workspace/src/Toast/index.tsx b/client/modules/workspace/src/Toast/index.ts
similarity index 100%
rename from client/modules/workspace/src/Toast/index.tsx
rename to client/modules/workspace/src/Toast/index.ts
diff --git a/client/modules/workspace/src/index.ts b/client/modules/workspace/src/index.ts
index fb6f0a6939..0eb693725b 100644
--- a/client/modules/workspace/src/index.ts
+++ b/client/modules/workspace/src/index.ts
@@ -12,3 +12,4 @@ export * from './utils';
export * from './constants';
export * from './InteractiveSessionModal';
export * from './components/SystemStatusModal/SystemStatusModal';
+export * from './JobsListing/JobsListingTable/JobsListingTable';
diff --git a/client/src/main.tsx b/client/src/main.tsx
index bb8e6b55e3..9e696d9e3a 100644
--- a/client/src/main.tsx
+++ b/client/src/main.tsx
@@ -9,6 +9,8 @@ import onboardingRouter from './onboarding/onboardingRouter';
import { Dashboard } from '@client/dashboard';
import { ConfigProvider, ThemeConfig } from 'antd';
+/**removed unrequired imports */
+
console.log(Dashboard);
const queryClient = new QueryClient();
diff --git a/designsafe/apps/api/users/urls.py b/designsafe/apps/api/users/urls.py
index 6cd6bccaae..899caa57d2 100644
--- a/designsafe/apps/api/users/urls.py
+++ b/designsafe/apps/api/users/urls.py
@@ -1,10 +1,11 @@
from django.urls import path, re_path as url
-from designsafe.apps.api.users.views import SearchView, AuthenticatedView, UsageView, ProjectUserView, PublicView
+from designsafe.apps.api.users.views import SearchView, AuthenticatedView, UsageView, ProjectUserView, PublicView, SUAllocationsView
urlpatterns = [
path("project-lookup/", ProjectUserView.as_view()),
url(r'^$', SearchView.as_view(), name='user_search'),
url(r'^auth/$', AuthenticatedView.as_view(), name='user_authenticated'),
url(r'^usage/$', UsageView.as_view(), name='user_usage'),
- url(r'^public/$', PublicView.as_view(), name='user_public')
+ url(r'^public/$', PublicView.as_view(), name='user_public'),
+ path('allocations/', SUAllocationsView.as_view(), name='su_allocations'),
]
diff --git a/designsafe/apps/api/users/utils.py b/designsafe/apps/api/users/utils.py
index 3d93baa099..793da15f59 100644
--- a/designsafe/apps/api/users/utils.py
+++ b/designsafe/apps/api/users/utils.py
@@ -9,9 +9,46 @@
from django.contrib.auth import get_user_model
from designsafe.apps.workspace.models.allocations import UserAllocations
-
logger = logging.getLogger(__name__)
+def _get_tas_allocations(username):
+ tas_client = TASClient(
+ baseURL=settings.TAS_URL,
+ credentials={
+ "username": settings.TAS_CLIENT_KEY,
+ "password": settings.TAS_CLIENT_SECRET,
+ },
+ )
+ tas_projects = tas_client.projects_for_user(username)
+
+ with open("designsafe/apps/api/users/tas_to_tacc_resources.json", encoding="utf-8") as file:
+ tas_to_tacc_resources = json.load(file)
+
+ allocation_table = []
+
+ for proj in tas_projects:
+ charge_code = proj.get("chargeCode", "N/A")
+ for alloc in proj.get("allocations", []):
+ resource_name = alloc.get("resource", "UNKNOWN")
+ status = alloc.get("status", "UNKNOWN")
+
+ # Proceed anyway regardless of status or missing mapping
+ resource_info = tas_to_tacc_resources.get(resource_name, {"host": "unknown"})
+
+ awarded = alloc.get("computeAllocated", 0)
+ used = alloc.get("computeUsed", 0.0)
+ remaining = round(awarded - used, 3)
+
+ allocation_table.append({
+ "system": resource_name,
+ "host": resource_info["host"],
+ "project_code": charge_code,
+ "awarded": awarded,
+ "remaining": remaining,
+ "expiration": alloc.get("end", "N/A")[:10]
+ })
+
+ return {"detailed_allocations": allocation_table}
def get_user_data(username):
"""Returns user contact information
@@ -23,7 +60,6 @@ def get_user_data(username):
user_data = tas_client.get_user(username=username)
return user_data
-
def list_to_model_queries(q_comps):
query = None
if len(q_comps) > 2:
@@ -36,7 +72,6 @@ def list_to_model_queries(q_comps):
query |= Q(last_name__icontains=q_comps[1])
return query
-
def q_to_model_queries(q):
if not q:
return None
@@ -54,51 +89,6 @@ def q_to_model_queries(q):
return query
-def _get_tas_allocations(username):
- """Returns user allocations on TACC resources
-
- : returns: allocations
- : rtype: dict
- """
-
- tas_client = TASClient(
- baseURL=settings.TAS_URL,
- credentials={
- "username": settings.TAS_CLIENT_KEY,
- "password": settings.TAS_CLIENT_SECRET,
- },
- )
- tas_projects = tas_client.projects_for_user(username)
-
- with open(
- "designsafe/apps/api/users/tas_to_tacc_resources.json", encoding="utf-8"
- ) as file:
- tas_to_tacc_resources = json.load(file)
-
- hosts = {}
-
- for tas_proj in tas_projects:
- # Each project from tas has an array of length 1 for its allocations
- alloc = tas_proj["allocations"][0]
- charge_code = tas_proj["chargeCode"]
- if alloc["resource"] in tas_to_tacc_resources:
- resource = dict(tas_to_tacc_resources[alloc["resource"]])
- resource["allocation"] = dict(alloc)
-
- # Separate active and inactive allocations and make single entry for each project
- if resource["allocation"]["status"] == "Active":
- if (
- resource["host"] in hosts
- and charge_code not in hosts[resource["host"]]
- ):
- hosts[resource["host"]].append(charge_code)
- elif resource["host"] not in hosts:
- hosts[resource["host"]] = [charge_code]
- return {
- "hosts": hosts,
- }
-
-
def _get_latest_allocations(username):
"""
Creates or updates allocations cache for a given user and returns new allocations
diff --git a/designsafe/apps/api/users/views.py b/designsafe/apps/api/users/views.py
index 39a0a646f5..5713a2db57 100644
--- a/designsafe/apps/api/users/views.py
+++ b/designsafe/apps/api/users/views.py
@@ -192,3 +192,19 @@ def get(self, request):
res_dict = {"userData": res_list}
return JsonResponse(res_dict)
+
+
+class SUAllocationsView(SecureMixin, View):
+ """API View for fetching SU allocations for the authenticated user"""
+
+ def get(self, request):
+ if not request.user.is_authenticated:
+ return JsonResponse({"message": "Unauthorized"}, status=401)
+
+ try:
+ username = request.user.username
+ allocations = users_utils.get_allocations(request.user, force=True)
+ return JsonResponse({"allocations": allocations.get("detailed_allocations", [])})
+ except Exception as e:
+ logger.exception(f"Error fetching SU allocations: {str(e)}")
+ return JsonResponse({"error": "Failed to fetch SU allocations."}, status=500)
diff --git a/designsafe/apps/workspace/api/views.py b/designsafe/apps/workspace/api/views.py
index 67b60b5685..3d45ebe262 100644
--- a/designsafe/apps/workspace/api/views.py
+++ b/designsafe/apps/workspace/api/views.py
@@ -2,7 +2,6 @@
.. :module:: apps.workspace.api.views
:synopsys: Views to handle Workspace API
"""
-
import logging
import json
from urllib.parse import urlparse
@@ -29,7 +28,6 @@
from designsafe.apps.workspace.api.utils import check_job_for_timeout
from designsafe.apps.onboarding.steps.system_access_v3 import create_system_credentials
-
logger = logging.getLogger(__name__)
METRICS = logging.getLogger(f"metrics.{__name__}")
@@ -56,7 +54,6 @@
},
}
-
def _app_license_type(app_def):
"""Gets an app's license type, if any."""
@@ -64,7 +61,6 @@ def _app_license_type(app_def):
lic_type = app_lic_type if app_lic_type in LICENSE_TYPES else None
return lic_type
-
def _get_user_app_license(license_type, user):
"""Gets a user's app license from the database."""
@@ -77,7 +73,6 @@ def _get_user_app_license(license_type, user):
lic = license_model.objects.filter(user=user).first()
return lic
-
def _get_systems(
user: object, can_exec: bool, systems: list = None, list_type: str = "ALL"
) -> list:
@@ -93,7 +88,6 @@ def _get_systems(
listType=list_type, select="allAttributes", search=search_string
)
-
def _get_app(app_id, app_version, user):
"""Gets an app from Tapis, and includes license and execution system info in response."""
@@ -113,7 +107,6 @@ def _get_app(app_id, app_version, user):
return data
-
def test_system_access_ok(
tapis: object, username: str, system_id: str, path: str = "/"
) -> bool:
@@ -131,7 +124,6 @@ def test_system_access_ok(
)
raise
-
def test_system_needs_keys(
tapis: object, username: str, system_id: str, path: str = "/"
) -> bool:
@@ -177,7 +169,6 @@ def test_system_needs_keys(
f"User {username} does not have system credentials and cannot push keys or create credentials for system {system_id}."
) from exc
-
class SystemListingView(AuthenticatedApiView):
"""System Listing View"""
@@ -215,7 +206,6 @@ def get(self, request, system_id):
{"status": 200, "response": system_def}, encoder=BaseTapisResultSerializer
)
-
class AppsView(AuthenticatedApiView):
"""View for Tapis app listings."""
@@ -262,7 +252,6 @@ def get(self, request, *args, **kwargs):
encoder=BaseTapisResultSerializer,
)
-
class AppsTrayView(AuthenticatedApiView):
"""Views for Workspace Apps Tray listings."""
@@ -451,6 +440,7 @@ def _get_public_apps(self, user, verbose):
categories.append(category_result)
return categories, html_definitions
+
def get(self, request, *args, **kwargs):
"""
@@ -523,7 +513,6 @@ def get(self, request, *args, **kwargs):
encoder=BaseTapisResultSerializer,
)
-
class AppDescriptionView(AuthenticatedApiView):
"""Views for retreiving AppDescription objects."""
@@ -536,7 +525,6 @@ def get(self, request, *args, **kwargs):
return JsonResponse({"message": f"No description found for {app_id}"})
return JsonResponse({"response": data})
-
class JobHistoryView(AuthenticatedApiView):
"""View for returning job history"""
@@ -893,13 +881,10 @@ def post(self, request, *args, **kwargs):
encoder=BaseTapisResultSerializer,
)
-
class AllocationsView(AuthenticatedApiView):
"""Allocations API View"""
-
def get(self, request):
"""Returns active user allocations on TACC resources
-
: returns: {'response': {'active': allocations, 'portal_alloc': settings.PORTAL_ALLOCATION, 'inactive': inactive, 'hosts': hosts}}
: rtype: dict
"""
@@ -911,7 +896,6 @@ def get(self, request):
for allocation in allocations
if allocation not in settings.ALLOCATIONS_TO_EXCLUDE
]
-
return JsonResponse(
{
"status": 200,
+
+
+ User Guides & Tutorials
+ + More Videos → + +
+ {videos.slice(0, 2).map((video) => (
+
+
+
+
+ 
+
+
+ 
+ {video.title}
+
+
+ ))}
+
+
+
+
+ {video.title}
+
+
+
+ ![{videos[2].title}]({`https://img.youtube.com/vi/${videos[2].id}/0.jpg`})
+
+
+
+ {videos[2].title}
+
+
+
+
+
+
+ {videos[2].title}
+
+