Skip to content

Commit

Permalink
Staging (#448)
Browse files Browse the repository at this point in the history
* disable strict build in github actions for now

* set variable directly in build command

* Automated frontend build

* remove key entries if nil

* auth differently when CI is set

* add libraries required for ssh auth

* removing stale file

* Automated frontend build

* Dev (#442)

* fix: use correct indication attribute name (#408)

* fix: add URL cites back (#409)

* add release information component for footer

* run prettier

* cleanup: make about links consistent (#413)

* make footer no longer sticky

* fix: correct source versioning (#421)

* fix: clean up GtoP import (#419)

* fix: use latest GO address (#424)

* feat: bump drugbank version (#422)

* feat: alphabetize sources

* refactor: alphabetize sources

* style: running prettier to prettify the sort data function

* fix: sort on pmid and source columns

* feat: add sources to interaction page

* feat: reduce precision of interaction score on interaction page to 2 decimal places

---------

Co-authored-by: James Stevenson <[email protected]>
Co-authored-by: Adam Coffman <[email protected]>

* Automated frontend build

* Dev (#447)

* fix: use correct indication attribute name (#408)

* fix: add URL cites back (#409)

* add release information component for footer

* run prettier

* cleanup: make about links consistent (#413)

* make footer no longer sticky

* fix: correct source versioning (#421)

* fix: clean up GtoP import (#419)

* fix: use latest GO address (#424)

* feat: bump drugbank version (#422)

* feat: alphabetize sources

* refactor: alphabetize sources

* style: running prettier to prettify the sort data function

* fix: sort on pmid and source columns

* feat: add sources to interaction page

* feat: reduce precision of interaction score on interaction page to 2 decimal places

* fix: fix typo (#444)

* fix: do not allow search submit if no terms entered (#446)

---------

Co-authored-by: James Stevenson <[email protected]>
Co-authored-by: Adam Coffman <[email protected]>

* Automated frontend build

* Automated frontend build

---------

Co-authored-by: Adam Coffman <[email protected]>
Co-authored-by: acoffman <[email protected]>
Co-authored-by: katiestahl <[email protected]>
Co-authored-by: James Stevenson <[email protected]>
  • Loading branch information
5 people authored Oct 19, 2023
1 parent f2fa4fa commit 20d8e69
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions client/src/components/Shared/SearchBar/SearchBar.tsx
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
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
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
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>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 20d8e69

Please sign in to comment.