Skip to content

Commit 01d3021

Browse files
downiecsashakames
andauthored
V1.2.2 release (#716)
* Update version number, add version changelog (to be updated with the changes that will be included in this update) * Updated documentation references to config variables (#706) * Updated documentation, specifically references to the configuration parameters which have changed over time, to use the latest variable names currently used in configuration. Updated requirements to use the latest readthedocs them of Sphinx * Update version number, add version changelog (to be updated with the changes that will be included in this update) * fixed the pagination so that it will reset to page one when doing a new search (#705) * update for obs4MIPs (#711) Co-authored-by: Sasha Ames <[email protected]> * Updated the settings file to autoformat on save to hopefully reduce linting errors. Fixed linting errors for the initial_projects_data update. Fixed the status tooltip to correctly display the node's status. Updated test fixtures to accurately reflect the node status response (the node names included the https:// in front and thats why status tooltip wasn't finding them. (#714) * Added alert for the case that a collection search fails in the manage collections popup (#710) * Added alert for the case that a collection search fails in the collection management popup. Added a test to bring the coverage up to 100% for the search table component. Removed some unused code, the get endpoint function is not used. * Minor linting error fixes. * Fixed some backend tests based on the removed/unused functions * Small fix to test. * Minor update to update summary. --------- Co-authored-by: Sasha Ames <[email protected]>
1 parent ee28ed0 commit 01d3021

File tree

17 files changed

+213
-629
lines changed

17 files changed

+213
-629
lines changed

.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@
7777
"[jsonc]": {
7878
"editor.defaultFormatter": "esbenp.prettier-vscode"
7979
},
80-
"python.analysis.extraPaths": ["backend/venv/bin/python"]
80+
"python.analysis.extraPaths": ["backend/venv/bin/python"],
81+
"editor.formatOnSave": true
8182
}

backend/config/urls.py

-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from metagrid.api_proxy.views import (
1717
do_citation,
1818
do_globus_auth,
19-
do_globus_get_endpoint,
2019
do_globus_logout,
2120
do_globus_search_endpoints,
2221
do_search,
@@ -58,11 +57,6 @@ class KeycloakLogin(SocialLoginView):
5857
path("", include("social_django.urls", namespace="social")),
5958
path("proxy/globus-logout/", do_globus_logout, name="globus-logout"),
6059
path("proxy/globus-auth/", do_globus_auth, name="globus-auth"),
61-
path(
62-
"proxy/globus-get-endpoint/",
63-
do_globus_get_endpoint,
64-
name="globus-get-endpoint",
65-
),
6660
path(
6761
"proxy/globus-search-endpoints/",
6862
do_globus_search_endpoints,

backend/metagrid/api_proxy/tests/test_views.py

-8
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ def test_globus_auth_begin(self):
2323
)
2424
self.assertEqual(response.status_code, 302)
2525

26-
def test_do_globus_get_endpoint(self):
27-
url = reverse("globus-get-endpoint")
28-
29-
data = {"endpoint_id": "0247816e-cc0d-4e03-a509-10903f6dde11"}
30-
response = self.client.get(url, data)
31-
print(response.status_code)
32-
assert response.status_code == status.HTTP_200_OK
33-
3426
def test_do_globus_search_endpoints(self):
3527
url = reverse("globus-search-endpoints")
3628

backend/metagrid/api_proxy/views.py

-21
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,6 @@ def do_globus_logout(request):
5151
return redirect(homepage_url)
5252

5353

54-
@api_view()
55-
@permission_classes([])
56-
def do_globus_get_endpoint(request):
57-
endpoint_id = request.GET.get("endpoint_id", None)
58-
if request.user.is_authenticated:
59-
tc = load_transfer_client(request.user) # pragma: no cover
60-
else:
61-
client = globus_sdk.ConfidentialAppAuthClient(
62-
settings.SOCIAL_AUTH_GLOBUS_KEY, settings.SOCIAL_AUTH_GLOBUS_SECRET
63-
)
64-
token_response = client.oauth2_client_credentials_tokens()
65-
globus_transfer_data = token_response.by_resource_server[
66-
"transfer.api.globus.org"
67-
]
68-
globus_transfer_token = globus_transfer_data["access_token"]
69-
authorizer = globus_sdk.AccessTokenAuthorizer(globus_transfer_token)
70-
tc = globus_sdk.TransferClient(authorizer=authorizer)
71-
endpoint = tc.get_endpoint(endpoint_id)
72-
return Response(endpoint.data)
73-
74-
7554
@api_view()
7655
@permission_classes([])
7756
def do_globus_search_endpoints(request):

backend/metagrid/initial_projects_data.py

+99-60
Large diffs are not rendered by default.

docs/docs/contributors/getting_started_production.md

+11-20
Large diffs are not rendered by default.

docs/requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
mkdocs==1.4.2 # https://www.mkdocs.org/
22
mdx_truly_sane_lists==1.3 # https://github.com/radude/mdx_truly_sane_lists
3+
sphinx==4.3.2 # https://www.sphinx-doc.org/
4+
sphinx_rtd_theme==1.0.0 # https://github.com/readthedocs/sphinx_rtd_theme

frontend/.envs/.react

-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
# Redirect the frontend to home page when old subdirectory is used (optional)
44
REACT_APP_PREVIOUS_URL=metagrid
55

6-
# MetaGrid API
7-
# https://github.com/aims-group/metagrid/tree/master/backend
8-
REACT_APP_METAGRID_API_URL=
9-
106
# Authentication Method
117
REACT_APP_AUTHENTICATION_METHOD=globus
128

frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "frontend",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"private": true,
55
"scripts": {
66
"build:local": "env-cmd -f .envs/.react react-scripts build",

frontend/public/changelog/v1.2.2.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## Summary
2+
3+
1. Fixes issue with node status display icons.
4+
2. Additional bugfixes.

frontend/public/messages/metagrid_messages.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Welcome to the Metagrid Release v1.2.0
1+
# Welcome to the Metagrid Release v1.2.x
22

33
To view the latest documentation and FAQ, please visit this page:
44
[https://esgf.github.io/esgf-user-support/metagrid.html](https://esgf.github.io/esgf-user-support/metagrid.html)

0 commit comments

Comments
 (0)