Skip to content

Commit

Permalink
Merge pull request #122 from hms-dbmi/aim-ahead-dbmi-dev
Browse files Browse the repository at this point in the history
Push out SWB 1.1.1 to AA Non-Fisma Prod
  • Loading branch information
srpiatt authored Aug 28, 2023
2 parents 340681c + 0ff14c6 commit b263955
Show file tree
Hide file tree
Showing 197 changed files with 9,162 additions and 8,932 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@

All notable changes to this project will be documented in this file. As our fork has diverged from AWS SWB mainline branch, we are noting the SWB version and the lab version together, as <swb version>\_<lab version>, starting from SWB mainline, 5.0.0.

## [5.0.0_1.1.1](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.1.0...v5.0.0_1.1.1) (08/10/2023)
- Update serverless templates to use an empty string for aws profile.
- Update nodejs and aws-sdk versions.
- Cherry pick [a0c7eeed34eea02ec56f49411cf499d1c59f0d3a](https://github.com/awslabs/service-workbench-on-aws/commit/a0c7eeed34eea02ec56f49411cf499d1c59f0d3a) to upgrade nodejs version and dependencies for lambda runtimes.
- Update ci/cd pipeline
- Cherry pick [62d35f4e58a2a2d92a74a427548a721bc1c22114](https://github.com/awslabs/service-workbench-on-aws/commit/62d35f4e58a2a2d92a74a427548a721bc1c22114)
- Cherry pick [3e9d28ac355acff1909ebf6e6de39c22fda7e6b0](https://github.com/awslabs/service-workbench-on-aws/commit/3e9d28ac355acff1909ebf6e6de39c22fda7e6b0)

## [5.0.0_1.1.0](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.0.3...v5.0.0_1.1.0) (07/21/2023)
- Add S3 GetObject and List permission to access embed data for workspaces.
- Add logos to workspace types on user creation step so it's easier to visually find the types they want.
- Add new notice on revoked workspace types, but continue to load the env detail card to allow users to start/stop/terminate revoked workspace types. (Does not give users access to make new workspaces based on the revoked type, only allows them to access already launched ones.)
- Add custom kernel install and load script in Sagemaker onCreate and onStart lifecycles. Saved in /home/ec2-user/Sagemaker persistent folder for fast start/stop kernel loading.
- Add volume size parameter to SageMaker persistent folder/drive.
- Remove old cft templates that are not needed.
- Add current RStudio template.
- Add search field to normal workspace view.
- Add an advanced workspace table view with sorting & filtering.
- Set workspace CFT info as default tab on workspace detail page.
- Hide termination toggle on detail view for workspaces that can't be terminated.

## [5.0.0_1.0.3](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.0.2...v5.0.0_1.0.3) (04/17/2023)

- Implement new setting `useCustomAmi` to bypass SWB AMI permisson checking
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
"@aws-ee/base-api-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/base-services-container": "workspace:*",
"aws-sdk": "^2.1000.0",
"generate-password": "^1.5.0",
"aws-sdk": "^2.1228.0",
"generate-password": "^1.7.0",
"lodash": "^4.17.21"
},
"devDependencies": {
"aws-sdk-mock": "^5.1.0",
"aws-sdk-mock": "^5.7.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
"@aws-ee/base-api-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/base-services-container": "workspace:*",
"aws-sdk": "^2.1000.0",
"generate-password": "^1.5.0",
"aws-sdk": "^2.1228.0",
"generate-password": "^1.7.0",
"lodash": "^4.17.21"
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"test": "NODE_ENV=test jest --config jest.config.js --passWithNoTests",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
"uuid": "^3.4.0"
},
"devDependencies": {
"aws-sdk-mock": "^5.1.0",
"aws-sdk-mock": "^5.7.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"react/jsx-props-no-spreading": 0,
"react/jsx-one-expression-per-line": 0,
"react/jsx-filename-extension": 0,
"react/jsx-pascal-case": 0,
"react/destructuring-assignment": 0,
"react/sort-comp": 0,
"react/prop-types": 0,
Expand Down
80 changes: 40 additions & 40 deletions addons/addon-base-raas-ui/packages/base-raas-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@
"author": "Amazon Web Services",
"license": "Apache-2.0",
"dependencies": {
"@auth0/auth0-spa-js": "^1.2.3",
"@auth0/auth0-spa-js": "^1.22.4",
"@aws-ee/base-ui": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/key-pair-mgmt-ui": "workspace:*",
"aws-sdk": "^2.1000.0",
"aws-sdk": "^2.1228.0",
"chart.js": "^2.9.4",
"classnames": "^2.2.6",
"classnames": "^2.3.2",
"crypto-browserify": "^3.12.0",
"csvtojson": "^2.0.10",
"is-cidr": "^3.1.0",
"is-cidr": "^3.1.1",
"jwt-decode": "^2.2.0",
"lodash": "^4.17.21",
"mobx": "^5.15.4",
"mobx-react": "^6.1.7",
"mobx-react-form": "^2.0.8",
"mobx-state-tree": "^3.15.0",
"mobx": "^5.15.7",
"mobx-react": "^6.3.1",
"mobx-react-form": "^2.0.9",
"mobx-state-tree": "^3.17.3",
"numeral": "^2.0.6",
"pretty-bytes": "^5.3.0",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-avatar": "^3.9.0",
"react-chartjs-2": "^2.9.0",
"react-copy-to-clipboard": "^5.0.2",
"react-dom": "^16.12.0",
"pretty-bytes": "^5.6.0",
"prop-types": "^15.8.1",
"react": "^16.14.0",
"react-avatar": "^3.10.0",
"react-chartjs-2": "^2.11.2",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^16.14.0",
"react-dotdotdot": "^1.3.1",
"react-dropzone": "^10.1.9",
"react-router-dom": "^5.1.2",
"react-select": "^3.0.8",
"react-dropzone": "^10.2.2",
"react-router-dom": "^5.3.4",
"react-select": "^3.2.0",
"react-sparklines": "^1.7.0",
"react-syntax-highlighter": "^15.4.4",
"react-syntax-highlighter": "^15.5.0",
"react-table": "^6.11.5",
"react-timeago": "^4.4.0",
"request": "^2.34",
Expand All @@ -43,41 +43,41 @@
"toastr": "^2.1.4",
"typeface-lato": "0.0.75",
"uuid": "^3.4.0",
"validatorjs": "^3.18.1"
"validatorjs": "^3.22.1"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7.8.6",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-transform-react-jsx": "^7.8.3",
"@babel/preset-env": "^7.8.6",
"@babel/preset-react": "^7.8.3",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.19.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-transform-react-jsx": "^7.19.0",
"@babel/preset-env": "^7.19.3",
"@babel/preset-react": "^7.18.6",
"babel-jest": "^24.9.0",
"babel-loader": "^8.0.6",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.2.5",
"babel-eslint": "^10.1.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-react": "^7.31.8",
"eslint-plugin-react-hooks": "^1.7.0",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"prop-types": "^15.7.2",
"serverless": "^1.63.0",
"serverless-deployment-bucket": "^1.1.0",
"typescript": "^3.7.5",
"serverless": "^3.22.0",
"serverless-deployment-bucket": "^1.6.0",
"typescript": "^3.9.10",
"webpack": "4.41.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"regenerator-runtime": "^0.13.5"
"enzyme-adapter-react-16": "^1.15.6",
"regenerator-runtime": "^0.13.9"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
import { types } from 'mobx-state-tree';
import { cloneDeep } from 'lodash';

const ORDER = { DESC: 'desc', ASC: 'asc' };
const VIEW = { ADVANCED: 'Advanced', NORMAL: 'Normal' };

const Filter = types.model({
key: types.string,
value: types.array(types.string),
icon: types.string,
match: types.string,
});

const Sort = types.model({
key: types.string,
order: types.enumeration('order', [ORDER.DESC, ORDER.ASC]),
});

const ScEnvView = types
.model('ScEnvView', {
activeFilters: types.optional(types.array(Filter), []),
activeMode: types.optional(types.string, 'and'),
sort: types.optional(Sort, { key: 'createdAt', order: ORDER.DESC }),
view: types.optional(types.enumeration('view', [VIEW.ADVANCED, VIEW.NORMAL]), VIEW.NORMAL),
})
.actions(self => ({
setFilters(filters = [], mode = 'or') {
self.activeFilters = cloneDeep(filters);
self.activeMode = mode;
},
setSort(key) {
if (key === self.sort.key) {
self.sort.order = self.sort.order === ORDER.ASC ? ORDER.DESC : ORDER.ASC;
} else {
self.sort.key = key;
self.sort.order = ORDER.ASC;
}
},
toggleView() {
self.view = self.view === VIEW.ADVANCED ? VIEW.NORMAL : VIEW.ADVANCED;
},
}))
.views(self => ({
get filters() {
return self.activeFilters;
},
get mode() {
return self.activeMode;
},
}));

function registerContextItems(appContext) {
appContext.ScEnvView = ScEnvView.create({}, appContext);
}

export { ScEnvView, registerContextItems, ORDER, VIEW };
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* permissions and limitations under the License.
*/

import crypto from 'crypto';
import _ from 'lodash';
import React from 'react';
import { observer, inject, Observer } from 'mobx-react';
Expand All @@ -36,8 +37,6 @@ import {
} from 'semantic-ui-react';
import { CopyToClipboard } from 'react-copy-to-clipboard';

import crypto from 'crypto';

import { gotoFn } from '@aws-ee/base-ui/dist/helpers/routing';
import { swallowError } from '@aws-ee/base-ui/dist/helpers/utils';
import { displayError } from '@aws-ee/base-ui/dist/helpers/notification';
Expand Down
Loading

0 comments on commit b263955

Please sign in to comment.