Skip to content
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.

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

V1.1.0 #592

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d82d702
Bump @adobe/css-tools from 4.2.0 to 4.3.2 in /frontend (#586)
dependabot[bot] Jan 10, 2024
a942f88
Temp updates for 1.0.11 (#585)
downiec Jan 10, 2024
0a4db2f
Bump postcss from 8.4.21 to 8.4.31 in /frontend (#565)
dependabot[bot] Jan 10, 2024
f7a9b13
Updated the version number in package.json and for the app. Updated v…
downiec Jan 12, 2024
302d4e4
Updating codecov action to version 3 to see if github actions codecov…
downiec Jan 12, 2024
feeff02
Created a codecov token to see if codecov issue would be resolved.
downiec Jan 12, 2024
fa03de6
Map data_node, legacy Globus endpoint, handle multiple endpoints (cre…
sashakames Jan 23, 2024
7505ac3
fix whitespace
sashakames Jan 23, 2024
e96ad5f
fix trailing...
sashakames Jan 23, 2024
4d31464
Feature/591 copy facets to clipboard (#593)
downiec Jan 24, 2024
dfe1aa6
Ignoring flake 8 error for get_files complexity, can fix later.
downiec Jan 24, 2024
644bbb1
Fixed minor formatting with Black formatter
downiec Jan 24, 2024
f4d864f
one line change to add subprojects (#599)
sashakames Feb 2, 2024
ec78791
Feature/558 transfer logging (#590)
sashakames Feb 3, 2024
136126b
Added the facet count to the copy facet list button. Also updated tes…
downiec Feb 6, 2024
ce41a00
resolve message
sashakames Feb 7, 2024
c9d3888
Updated some black formatting to remove precommit error
downiec Feb 7, 2024
6aadecb
V1.1.0 container update (#608)
jasonb5 Feb 22, 2024
caa6aec
Feature/504 project selected on dropdown (#600)
downiec Feb 27, 2024
8adde79
Fixes local container (#616)
jasonb5 Mar 8, 2024
b5dced7
Fixed black formatting issue.
downiec Mar 12, 2024
b172ace
Support custom Solr port (#607)
sashakames Mar 12, 2024
a11160a
Fixed another black formatting issue.
downiec Mar 12, 2024
aca5ad8
Change transfer from get to post (#618)
sashakames Mar 18, 2024
a93ec06
Fixes creating files templated/generated by entrypoint (#622)
jasonb5 Apr 5, 2024
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
Prev Previous commit
Next Next commit
Support custom Solr port (#607)
* parse the port and use for the shard

* whitespace fix
sashakames authored Mar 12, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit b172ace79564708e7ad07a9b2927eff180babcbb
11 changes: 8 additions & 3 deletions backend/metagrid/api_globus/views.py
Original file line number Diff line number Diff line change
@@ -138,15 +138,20 @@ def get_files(url_params): # pragma: no cover
file_offset = 0
use_distrib = True

port = "80"

try:
hostname = urllib.parse.urlparse(
res = urllib.parse.urlparse(
query_url
).hostname # TODO need to populate the sharts based on the Solr URL
)
hostname = res.hostname # TODO need to populate the shards based on the Solr URL
if res.port:
port = res.port
except RuntimeError as e:
return HttpResponseServerError(f"Malformed URL in search results {e}")
if hostname in TEST_SHARDS_MAP:
hostname = TEST_SHARDS_MAP[hostname]
xml_shards = [f"{hostname}:80/solr"]
xml_shards = [f"{hostname}:{port}/solr"]
querys = []
file_query = ["type:File"]


Unchanged files with check annotations Beta

})
.catch(async (error: ResponseError) => {
if (error.message !== '') {
messageContent = `Globus transfer task failed. ${error.message} is your error code. Please contact ESGF support.`;
durationVal = 60;

Check warning on line 321 in frontend/src/components/Globus/DatasetDownload.tsx

Codecov / codecov/patch

frontend/src/components/Globus/DatasetDownload.tsx#L320-L321

Added lines #L320 - L321 were not covered by tests
} else {
messageContent = `Globus transfer task failed. Resetting tokens.`;
// eslint-disable-next-line no-console