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.

Sign up for GitHub

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

Jump to bottom

Staging #448

Merged
merged 20 commits into from
Oct 19, 2023
Merged

Staging #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d08eae8
Merge branch 'staging' of github.com:dgidb/dgidb-v5 into staging
acoffman Jun 20, 2023
7a0e38f
Merge branch 'dev' into staging
acoffman Jun 21, 2023
89afb24
disable strict build in github actions for now
acoffman Jun 21, 2023
48c9694
set variable directly in build command
acoffman Jun 21, 2023
8365db9
Automated frontend build
acoffman Jun 21, 2023
25c8d7b
remove key entries if nil
acoffman Jun 21, 2023
0b04dba
Merge branch 'staging' of github.com:dgidb/dgidb-v5 into staging
acoffman Jun 21, 2023
f2cd8fa
auth differently when CI is set
acoffman Jun 21, 2023
8b0aa4b
add libraries required for ssh auth
acoffman Jun 21, 2023
e95623a
fixing merge conflicts from main to staging
katiestahl Oct 9, 2023
0a8a1a2
Fix merge conflicts of main to staging
katiestahl Oct 9, 2023
c683f46
removing stale file
katiestahl Oct 9, 2023
777b337
removing stale file
katiestahl Oct 9, 2023
b00b120
Automated frontend build
katiestahl Oct 9, 2023
ace432d
Dev (#442)
katiestahl Oct 10, 2023
4489794
Automated frontend build
katiestahl Oct 10, 2023
0899569
Dev (#447)
katiestahl Oct 19, 2023
2992c97
Automated frontend build
katiestahl Oct 19, 2023
c96e796
Merge branch 'main' into staging
katiestahl Oct 19, 2023
af9ffda
Automated frontend build
katiestahl Oct 19, 2023
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
3 changes: 3 additions & 0 deletions client/src/components/Shared/SearchBar/SearchBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ const SearchBar: React.FC<SearchBarProps> = ({ handleSubmit }) => {
}
};
const handleSearchClick = () => {
if (selectedOptions?.length === 0) {
return;
}
state.searchTerms = selectedOptions.map((option) => option.suggestion);
handleSubmit();
};
Expand Down
4 changes: 2 additions & 2 deletions server/app/graphql/resolvers/genes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class Resolvers::Genes < GraphQL::Schema::Resolver

# TODO: search filters (Clinically Actionable, Druggable Genome, Drug Resistance)

# gene claim catagory by name
option(:gene_claim_catagory, type: [String], description: "Filtering on gene claim catagory name.") do |scope, values|
# gene claim category by name
option(:gene_claim_category, type: [String], description: "Filtering on gene claim category name.") do |scope, values|
scope.joins(gene_claims: :gene_claim_categories).where('gene_claim_categories.name IN (?)', values)
end

Expand Down
6 changes: 3 additions & 3 deletions server/public/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.67042d2f.css",
"main.js": "/static/js/main.df50a2b3.js",
"main.js": "/static/js/main.3fbfceb6.js",
"static/js/461.86214142.chunk.js": "/static/js/461.86214142.chunk.js",
"static/js/80.a852d8b5.chunk.js": "/static/js/80.a852d8b5.chunk.js",
"static/js/990.d59bee53.chunk.js": "/static/js/990.d59bee53.chunk.js",
Expand All @@ -28,7 +28,7 @@
"static/js/925.a41f4405.chunk.js": "/static/js/925.a41f4405.chunk.js",
"index.html": "/index.html",
"main.67042d2f.css.map": "/static/css/main.67042d2f.css.map",
"main.df50a2b3.js.map": "/static/js/main.df50a2b3.js.map",
"main.3fbfceb6.js.map": "/static/js/main.3fbfceb6.js.map",
"461.86214142.chunk.js.map": "/static/js/461.86214142.chunk.js.map",
"80.a852d8b5.chunk.js.map": "/static/js/80.a852d8b5.chunk.js.map",
"990.d59bee53.chunk.js.map": "/static/js/990.d59bee53.chunk.js.map",
Expand Down Expand Up @@ -56,6 +56,6 @@
},
"entrypoints": [
"static/css/main.67042d2f.css",
"static/js/main.df50a2b3.js"
"static/js/main.3fbfceb6.js"
]
}
2 changes: 1 addition & 1 deletion server/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="DGIdb, The Drug Gene Interaction Database, is a research resource that can be used to search candidate genes or drugs against the known and potentially druggable genome."/><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@300;350;400;500;700;800&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Lato:wght@100;300;350;400;700&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Work+Sans:wght@200;300;350;400;500;600&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/dgidb-icon_48.png"/><link rel="manifest" href="/manifest.json"/><title>DGIdb</title><script defer="defer" src="/static/js/main.df50a2b3.js"></script><link href="/static/css/main.67042d2f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="DGIdb, The Drug Gene Interaction Database, is a research resource that can be used to search candidate genes or drugs against the known and potentially druggable genome."/><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@300;350;400;500;700;800&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Lato:wght@100;300;350;400;700&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Work+Sans:wght@200;300;350;400;500;600&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/dgidb-icon_48.png"/><link rel="manifest" href="/manifest.json"/><title>DGIdb</title><script defer="defer" src="/static/js/main.3fbfceb6.js"></script><link href="/static/css/main.67042d2f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
6 changes: 3 additions & 3 deletions server/public/static/js/main.df50a2b3.js → server/public/static/js/main.3fbfceb6.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ic/static/js/main.df50a2b3.js.LICENSE.txt → ...ic/static/js/main.3fbfceb6.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion server/public/static/js/main.df50a2b3.js.map → server/public/static/js/main.3fbfceb6.js.map
View file
Open in desktop

Large diffs are not rendered by default.