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

New release to production. #1211

Merged
merged 10 commits into from
Oct 11, 2023
Merged

New release to production. #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac7647b
Merge pull request #1205 from alliance-genome/main
oblodgett Sep 28, 2023
d7a20a7
Merge pull request #1206 from alliance-genome/test
oblodgett Sep 28, 2023
453d69a
Update package.json
scottcain Oct 4, 2023
60d63e9
Merge pull request #1207 from alliance-genome/fix_seqpanel_for_long_g…
scottcain Oct 4, 2023
2d013cd
SCRUM-3305 fix sequencer viewer logic on allele section
cmpich Oct 5, 2023
f5335a0
SCRUM-3305 remove unused argument
cmpich Oct 5, 2023
9f7e8da
Merge branch 'stage' into test
cmpich Oct 5, 2023
beb813f
Merge pull request #1209 from alliance-genome/SCRUM-3305
oblodgett Oct 5, 2023
93d9403
Added more ignores to the robots file
oblodgett Oct 10, 2023
b778e6b
Merge pull request #1210 from alliance-genome/fix_robots
oblodgett Oct 10, 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
7 changes: 2 additions & 5 deletions apps/main-app/src/hooks/useAllVariants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@ function getFullUrl(baseUrl, tableState) {
return baseUrl + separator + buildTableQueryString(tableState);
}

export default function useAllVariants(geneId, tableState, includeHTP = false) {
const nonHTPCategories = ['allele', 'allele with multiple associated variants', 'allele with one associated variant'];
const url = includeHTP ?
`/api/gene/${geneId}/alleles?` :
`/api/gene/${geneId}/alleles?filter.alleleCategory=${encodeURIComponent(nonHTPCategories.join('|'))}`;
export default function useAllVariants(geneId, tableState) {
const url = `/api/gene/${geneId}/alleles?` ;
return useQuery ([url, tableState], () => {
return fetchData(getFullUrl(url, {
...tableState,
Expand Down
2 changes: 1 addition & 1 deletion apps/main-app/webpack.config.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const robotstxtProdOptions = {
{
userAgent: '*',
allow: '/',
disallow: '/search',
disallow: ['/search', '/alliancemine', '/jbrowse'],
},
],
sitemap: [
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"custom-event-polyfill": "^1.0.6",
"d3-selection": "2.0.0",
"document-register-element": "1.13.1",
"generic-sequence-panel": "^1.2.5",
"generic-sequence-panel": "^1.3.0",
scottcain marked this conversation as resolved.
Show resolved Hide resolved
"html-react-parser": "^0.10.0",
"immutable": "^3.8.1",
"js-yaml": "^4.1.0",
Expand Down