V1.2.2 release

.vscode/settings.json

@@ -77,5 +77,6 @@
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "python.analysis.extraPaths": ["backend/venv/bin/python"]
+  "python.analysis.extraPaths": ["backend/venv/bin/python"],
+  "editor.formatOnSave": true
 }

backend/config/urls.py

@@ -16,7 +16,6 @@
 from metagrid.api_proxy.views import (
     do_citation,
     do_globus_auth,
-    do_globus_get_endpoint,
     do_globus_logout,
     do_globus_search_endpoints,
     do_search,
@@ -58,11 +57,6 @@ class KeycloakLogin(SocialLoginView):
     path("", include("social_django.urls", namespace="social")),
     path("proxy/globus-logout/", do_globus_logout, name="globus-logout"),
     path("proxy/globus-auth/", do_globus_auth, name="globus-auth"),
-    path(
-        "proxy/globus-get-endpoint/",
-        do_globus_get_endpoint,
-        name="globus-get-endpoint",
-    ),
     path(
         "proxy/globus-search-endpoints/",
         do_globus_search_endpoints,

backend/metagrid/api_proxy/tests/test_views.py

@@ -23,14 +23,6 @@ def test_globus_auth_begin(self):
         )
         self.assertEqual(response.status_code, 302)
 
-    def test_do_globus_get_endpoint(self):
-        url = reverse("globus-get-endpoint")
-
-        data = {"endpoint_id": "0247816e-cc0d-4e03-a509-10903f6dde11"}
-        response = self.client.get(url, data)
-        print(response.status_code)
-        assert response.status_code == status.HTTP_200_OK
-
     def test_do_globus_search_endpoints(self):
         url = reverse("globus-search-endpoints")
 

backend/metagrid/api_proxy/views.py

@@ -51,27 +51,6 @@ def do_globus_logout(request):
     return redirect(homepage_url)
 
 
-@api_view()
-@permission_classes([])
-def do_globus_get_endpoint(request):
-    endpoint_id = request.GET.get("endpoint_id", None)
-    if request.user.is_authenticated:
-        tc = load_transfer_client(request.user)  # pragma: no cover
-    else:
-        client = globus_sdk.ConfidentialAppAuthClient(
-            settings.SOCIAL_AUTH_GLOBUS_KEY, settings.SOCIAL_AUTH_GLOBUS_SECRET
-        )
-        token_response = client.oauth2_client_credentials_tokens()
-        globus_transfer_data = token_response.by_resource_server[
-            "transfer.api.globus.org"
-        ]
-        globus_transfer_token = globus_transfer_data["access_token"]
-        authorizer = globus_sdk.AccessTokenAuthorizer(globus_transfer_token)
-        tc = globus_sdk.TransferClient(authorizer=authorizer)
-    endpoint = tc.get_endpoint(endpoint_id)
-    return Response(endpoint.data)
-
-
 @api_view()
 @permission_classes([])
 def do_globus_search_endpoints(request):

docs/requirements.txt

@@ -1,2 +1,4 @@
 mkdocs==1.4.2  # https://www.mkdocs.org/
 mdx_truly_sane_lists==1.3  # https://github.com/radude/mdx_truly_sane_lists
+sphinx==4.3.2  # https://www.sphinx-doc.org/
+sphinx_rtd_theme==1.0.0  # https://github.com/readthedocs/sphinx_rtd_theme

frontend/.envs/.react

@@ -3,10 +3,6 @@
 # Redirect the frontend to home page when old subdirectory is used (optional)
 REACT_APP_PREVIOUS_URL=metagrid
 
-# MetaGrid API
-# https://github.com/aims-group/metagrid/tree/master/backend
-REACT_APP_METAGRID_API_URL=
-
 # Authentication Method
 REACT_APP_AUTHENTICATION_METHOD=globus
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": true,
   "scripts": {
     "build:local": "env-cmd -f .envs/.react react-scripts build",

frontend/public/changelog/v1.2.2.md

@@ -0,0 +1,4 @@
+## Summary
+
+1. Fixes issue with node status display icons.
+2. Additional bugfixes.

frontend/public/messages/metagrid_messages.md

@@ -1,4 +1,4 @@
-# Welcome to the Metagrid Release v1.2.0
+# Welcome to the Metagrid Release v1.2.x
 
 To view the latest documentation and FAQ, please visit this page:
 [https://esgf.github.io/esgf-user-support/metagrid.html](https://esgf.github.io/esgf-user-support/metagrid.html)