diff --git a/.circleci/config.yml b/.circleci/config.yml index 162d2db05..7376d695b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -142,7 +142,17 @@ jobs: - ~/.cache/yarn key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }} # Build & Test - - run: yarn build:demo:ci + - run: + name: 'Build Demo Site, Upload SourceMaps, Send Deploy Notification' + command: | + yarn build:demo:ci + export FILE_1=$(find ./build/static/js -type f -name "2.*.js" -exec basename {} \;) + export FILE_MAIN=$(find ./build/static/js -type f -name "main.*.js" -exec basename {} \;) + export FILE_RUNTIME_MAIN=$(find ./build/static/js -type f -name "runtime~main.*.js" -exec basename {} \;) + curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_1.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_1 + curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_MAIN.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_MAIN + curl https://api.rollbar.com/api/1/sourcemap -F source_map=@build/static/js/$FILE_RUNTIME_MAIN.map -F access_token=$ROLLBAR_TOKEN -F version=$CIRCLE_SHA1 -F minified_url=https://$GOOGLE_STORAGE_BUCKET/static/js/$FILE_RUNTIME_MAIN + curl --request POST https://api.rollbar.com/api/1/deploy/ -F access_token=$ROLLBAR_TOKEN -F environment=$GOOGLE_STORAGE_BUCKET -F revision=$CIRCLE_SHA1 -F local_username=CircleCI # Persist :+1: - persist_to_workspace: root: ~/repo diff --git a/netlify.toml b/netlify.toml index 4f53693fc..39a2cf2c8 100644 --- a/netlify.toml +++ b/netlify.toml @@ -14,6 +14,11 @@ YARN_FLAGS = "--no-ignore-optional --pure-lockfile" # COMMENT: This a rule for Single Page Applications +[[redirects]] + from = "/demo/*" + to = "/demo/index.html" + status = 200 + [[redirects]] from = "/*" to = "/index.html" diff --git a/package.json b/package.json index 99e807d32..25d279267 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "hammerjs": "^2.0.8", "lodash.isequal": "4.5.0", "moment": "^2.24.0", - "ohif-core": "0.5.7", + "ohif-core": "0.5.8", "ohif-dicom-html-extension": "^0.0.2", "ohif-dicom-pdf-extension": "^0.0.6", "oidc-client": "1.7.x", @@ -93,7 +93,7 @@ "react-resize-detector": "^3.4.0", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", - "react-viewerbase": "0.7.0", + "react-viewerbase": "0.7.1", "react-vtkjs-viewport": "^0.0.7", "redux": "^4.0.1", "redux-oidc": "3.1.x" diff --git a/src/connectedComponents/FlexboxLayout.css b/src/connectedComponents/FlexboxLayout.css index e84100ddc..b976200f5 100644 --- a/src/connectedComponents/FlexboxLayout.css +++ b/src/connectedComponents/FlexboxLayout.css @@ -10,8 +10,6 @@ .sidebar-menu { height: 100%; - /* required transformation to make inner fixed elements relative to this one*/ - transform: scale(1); transition: var(--sidebar-transition); } diff --git a/yarn.lock b/yarn.lock index 7f5197da6..ea7e2a9cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9702,10 +9702,10 @@ octokit-pagination-methods@^1.1.0: resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== -ohif-core@0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.5.7.tgz#698ddff79f96fec68e4546e0386c850d5dccdd18" - integrity sha512-ymxojfaTQqsRZ5X2T2zWlVlTMUOYAz0V8BFgo6aWyZTEHw2u/3GgKPZiZ/OeRNTQOmam+KQj1jncuYbOecZ4nQ== +ohif-core@0.5.8: + version "0.5.8" + resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.5.8.tgz#d2feab1c2c8440464123318aca8d55e9f228d51e" + integrity sha512-yI4nq1Vxi8CVno6codLJttjiyPkmjjYIl12QcAGDGmpYcLt2LopOCLZ2M2eeJbxt8yfh5nwSYMcjC3cYIr6C9A== dependencies: "@babel/runtime" "^7.2.0" ajv "^6.10.0" @@ -11540,14 +11540,6 @@ react-dev-utils@^8.0.0: strip-ansi "5.0.0" text-table "0.2.0" -react-dnd-html5-backend@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-7.0.2.tgz#f74181ca0ff05be13eb6094629c5ad560f558a7e" - integrity sha512-BPhmHeQjvhPXRykHvFLbM+TJFrrarcuf/mIArNEmXzZuNhLfbOnHtMSzR8lPwodABcDAYj7hEF7vTABXX298vA== - dependencies: - dnd-core "^7.0.2" - lodash "^4.17.11" - react-dnd-html5-backend@^7.0.2: version "7.4.4" resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-7.4.4.tgz#3372e5af4af24f680cd75900c782606539c01220" @@ -11555,6 +11547,14 @@ react-dnd-html5-backend@^7.0.2: dependencies: dnd-core "^7.4.4" +react-dnd-touch-backend@^0.8.3: + version "0.8.3" + resolved "https://registry.yarnpkg.com/react-dnd-touch-backend/-/react-dnd-touch-backend-0.8.3.tgz#85d961ec8578dc9efa5b78000ea904d37e01e60f" + integrity sha512-LLJlpeJftRreP9ixm3yfd1JEXf+6BeKo5dkfJFHvNSOEOu+FDSwNl5l8uAG0FeD4z2ZVi7RDQ/jUxdjkBV3zBg== + dependencies: + dnd-core "^7.4.4" + invariant "^2.2.4" + react-dnd@7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-7.0.2.tgz#8f5611a6e877592932c082d6280c64d1c817f420" @@ -11760,10 +11760,10 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react-viewerbase@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.7.0.tgz#b0f48a0f003b849c280b8ca67927d4780c68b0dc" - integrity sha512-1VQXREKSsqxtOSSHRou0gjBODrSOjE8SBJ6/dHG0gPgdmeotOg68xPMKYf9K7fYyGZ6CDA7oVCAmdTE4SVYP5Q== +react-viewerbase@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.7.1.tgz#5a27f2f7d327dfd8f8dfe26e6d5d3a911deeee85" + integrity sha512-xQVK8s3Etk51zR0mW8eVh49emWM6X8sgwnVO3WXtdWf6rewePYqFcFTZ2n4iV/Ru+NeZHNlC4lpOq9wN8SjcpA== dependencies: "@babel/runtime" "7.2.0" classnames "2.2.6" @@ -11773,7 +11773,7 @@ react-viewerbase@0.7.0: react-bootstrap-modal "4.2.0" react-dates "18.4.1" react-dnd "7.0.2" - react-dnd-html5-backend "7.0.2" + react-dnd-touch-backend "^0.8.3" react-with-direction "1.3.0" react-vtkjs-viewport@^0.0.7: