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.

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

[ALS-5081] Update to fix button not being present #125

Merged
merged 2 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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.2](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.1.1...v5.0.0_1.1.2) (08/10/2023)

- Fix bug introduced in 5.0.0_1.1.0 where create workspace button does not display if user does not have any exisitng workspaces.
- Remove inline python libraries from infrastructure proxy lambda handler.
- Update to use newer python version for proy handler.
- Update to build proxy lambda layer and with requirements.

## [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.
Expand All @@ -11,6 +18,7 @@ All notable changes to this project will be documented in this file. As our fork
- 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.)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ class ScEnvironmentsList extends React.Component {
const store = this.envsStore;
let content = null;
let list = [];
let total = 0;

const projects = this.getProjects();
const appStreamProjectIds = _.map(
_.filter(projects, proj => proj.isAppStreamConfigured),
Expand All @@ -153,24 +155,21 @@ class ScEnvironmentsList extends React.Component {
content = this.renderEmpty();
} else if (isStoreNotEmpty(store)) {
list = this.searchAndFilter();
content = (
<>
<EnvsHeader
current={list.length}
total={store.total}
isAdmin={this.isAdmin}
provisionDisabled={this.provisionDisabled}
onViewToggle={this.handleViewToggle()}
onEnvCreate={this.handleCreateEnvironment}
/>
{this.renderMain(list)}
</>
);
content = this.renderMain(list);
total = store.total;
}

return (
<Container className="mt3 animated fadeIn">
{this.provisionDisabled && this.renderMissingAppStreamConfig()}
<EnvsHeader
current={list.length}
total={total}
isAdmin={this.isAdmin}
provisionDisabled={this.provisionDisabled}
onViewToggle={this.handleViewToggle()}
onEnvCreate={this.handleCreateEnvironment}
/>
{content}
</Container>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ class ScEnvAdvancedList extends React.Component {

render() {
let content = null;
let list = [];
let total = 0;

if (isStoreError(this.envsStore)) {
content = <ErrorBox error={this.envsStore.error} className="p0" />;
Expand All @@ -211,30 +213,40 @@ class ScEnvAdvancedList extends React.Component {
} else if (isStoreNotEmpty(this.envsStore)) {
const fields = this.getEnvFields(this.envsStore.list);
const tableColumns = fields.map(column => _.pick(column, ['key', 'label', 'sortable', 'type']));
const tableRows = this.getEnvs(this.envsStore.list, this.viewStore.filters, this.viewStore.sort);
list = this.getEnvs(this.envsStore.list, this.viewStore.filters, this.viewStore.sort);
total = this.envsStore.total;

content = (
<>
<EnvsHeader
current={tableRows.length}
total={this.envsStore.total}
view={this.viewStore.view}
isAdmin // We only get to this view if we're an admin, so this must be true
onViewToggle={this.handleViewToggle()}
onEnvCreate={this.handleCreateEnvironment()}
/>
<FilterBox
mode={this.viewStore.mode}
filters={this.viewStore.filters}
fields={fields}
onFilter={this.handleFilter()}
/>
<CompactTable sort={this.viewStore.sort} columns={tableColumns} rows={tableRows} onSort={this.handleSort()} />
<CompactTable
sort={this.viewStore.sort}
columns={tableColumns}
rows={list}
onSort={this.handleSort()}
/>
</>
);
}

return <Container className="mt3 animated fadeIn">{content}</Container>;
return (
<Container className="mt3 animated fadeIn">
<EnvsHeader
current={list.length}
total={total}
view={this.viewStore.view}
isAdmin // We only get to this view if we're an admin, so this must be true
onViewToggle={this.handleViewToggle()}
onEnvCreate={this.handleCreateEnvironment()}
/>
{content}
</Container>
);
}
}

Expand Down
Loading