Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
8a1ca02
feat: explorer state encoded in URL
ZakirG Feb 18, 2021
7afde8b
Merge branch 'master' of https://github.com/uc-cdis/data-portal into …
ZakirG Mar 2, 2021
1f0957c
encoding works, decoding in progress
ZakirG Mar 4, 2021
2d9b952
Merge branch 'master' of https://github.com/uc-cdis/data-portal into …
ZakirG Mar 4, 2021
4aac94b
loading url filter into UI is working
ZakirG Mar 15, 2021
fba3398
fix eslint
ZakirG Mar 16, 2021
83f93ba
Merge branch 'master' of https://github.com/uc-cdis/data-portal into …
ZakirG Mar 22, 2021
5b78220
cleaning up
ZakirG Mar 26, 2021
c6af6c9
feature flag
ZakirG Mar 26, 2021
1902666
Merge branch 'master' of https://github.com/uc-cdis/data-portal into …
ZakirG Mar 26, 2021
3376515
portal config docs
ZakirG Mar 26, 2021
87a5652
cleaning up
ZakirG Mar 26, 2021
d7108ea
cleaning up
ZakirG Mar 26, 2021
bdfb2c1
update package
ZakirG Mar 26, 2021
41fabbd
update to npm 7
ZakirG Mar 26, 2021
925a980
Merge branch 'master' of https://github.com/uc-cdis/data-portal into …
ZakirG Mar 29, 2021
d35d95e
test
ZakirG Mar 29, 2021
a6d7148
fix secrets
ZakirG Mar 29, 2021
165c79f
simplifying logic
ZakirG Mar 29, 2021
50a7246
eslint
ZakirG Mar 29, 2021
284c451
simplify logic
ZakirG Mar 29, 2021
ff981d6
update package
ZakirG Mar 30, 2021
b622fca
cleaning up
ZakirG Apr 2, 2021
7e9140c
cleaning up
ZakirG Apr 2, 2021
ea3a5d8
cleaning up
ZakirG Apr 2, 2021
7c7b758
update from master
ZakirG Apr 2, 2021
e9c3f68
change Dockerfile
ZakirG Apr 2, 2021
f220ec4
debugging quay problems
ZakirG Apr 2, 2021
ff1b23c
local install npm 7.8
ZakirG Apr 2, 2021
8066301
DOckerfile to 7.8
ZakirG Apr 2, 2021
75b0a83
add maxsockets command
ZakirG Apr 2, 2021
a623420
edit comments
ZakirG Apr 3, 2021
e74f0a4
PR feedbacks
ZakirG Apr 8, 2021
66a6ad2
fix eslint
ZakirG Apr 8, 2021
0b16381
update doc
ZakirG Apr 9, 2021
ee9b17b
eslint
ZakirG Apr 9, 2021
3e20b50
update package lock
ZakirG Apr 9, 2021
eea940c
PR feedback
ZakirG Apr 12, 2021
48c7896
update ui-component version
ZakirG Apr 12, 2021
756b7ab
Merge branch 'master' of https://github.com/uc-cdis/data-portal into …
ZakirG Apr 13, 2021
172c55f
update package-lock
ZakirG Apr 13, 2021
6fb24d3
update guppy version
ZakirG Apr 14, 2021
6a78a35
install again
ZakirG Apr 14, 2021
5c30e19
install again
ZakirG Apr 14, 2021
2fca7f0
legacy-peer-deps
ZakirG Apr 14, 2021
31f0bd3
fix: docker build
mfshao Apr 15, 2021
e073ec1
more fix
mfshao Apr 15, 2021
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
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
],
"@babel/preset-react",
"@babel/preset-typescript",
"@babel/preset-typescript"
],
"plugins": [
"dev-expression",
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ services:
- docker

before_install:
- npm install -g [email protected]
- npm install -g [email protected]
- npm config set maxsockets 5

install:
- npm install --force
- npm install --force --legacy-peer-deps

script:
- npm run relay
Expand Down
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
&& npm install -g [email protected]
&& npm install -g [email protected] \
&& npm config set maxsockets 5

ARG APP=dev
ARG BASENAME
Expand All @@ -32,14 +33,14 @@ WORKDIR /data-portal
RUN COMMIT=`git rev-parse HEAD` && echo "export const portalCommit = \"${COMMIT}\";" >src/versions.js \
&& VERSION=`git describe --always --tags` && echo "export const portalVersion =\"${VERSION}\";" >>src/versions.js \
&& /bin/rm -rf .git \
&& /bin/rm -rf node_modules \
&& npm config set unsafe-perm=true \
&& npm ci \
&& /bin/rm -rf node_modules
RUN npm config set unsafe-perm=true \
&& npm ci --legacy-peer-deps \
&& npm run relay \
&& npm run params \
&& npm run params
# see https://stackoverflow.com/questions/48387040/nodejs-recommended-max-old-space-size
&& NODE_OPTIONS=--max-old-space-size=2048 NODE_ENV=production time ./node_modules/.bin/webpack --bail \
&& cp nginx.conf /etc/nginx/conf.d/nginx.conf \
RUN NODE_OPTIONS=--max-old-space-size=3584 NODE_ENV=production time ./node_modules/.bin/webpack --bail
RUN cp nginx.conf /etc/nginx/conf.d/nginx.conf \
&& rm /etc/nginx/sites-enabled/default

# In standard prod these will be overwritten by volume mounts
Expand Down
5 changes: 4 additions & 1 deletion docs/portal_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,11 @@ Below is an example, with inline comments describing what each JSON block config
"requiredCerts": [], // optional; do users need to take a quiz or agree to something before they can access the site?
"featureFlags": { // optional; will hide certain parts of the site if needed
"explorer": true, // required; indicates the flag and whether to hide it or not
"explorerPublic": true // optional; If set to true, the data explorer page would be treated as a public component and can be accessed without login. Data explorer page would be public accessible if 1. tiered access level is set to libre OR 2. this explorerPublic flag is set to true.
"explorerPublic": true // optional; If set to true, the data explorer page would be treated as a public component and can be accessed without login. The Data Explorer page would be publicly accessible if 1. tiered access level is set to libre OR 2. this explorerPublic flag is set to true.
"discovery": true, // optional; whether to enable the Discovery page. If true, `discoveryConfig` must be present as well.
"explorerStoreFilterInURL": true, // optional; whether to store/load applied filters in the URL during Data Explorer use.
This feature currently supports single select filters and range filters; it
lacks support for search filter state, accessibility state, table state.
"explorerHideEmptyFilterSection": false, // optional, when filtering data hide FilterSection when they are empty.
},
"dataExplorerConfig": { // required; configuration for the Data Explorer (/explorer)
Expand Down
Loading