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

Remove isScratch banner #8296

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released

### Removed
- Removed support for HTTP API versions 3 and 4. [#8075](https://github.com/scalableminds/webknossos/pull/8075)
- Removed that a warning is shown when a dataset is served from a datastore that was marked with isScratch=true. [#8296](https://github.com/scalableminds/webknossos/pull/8296)

### Breaking Changes
32 changes: 2 additions & 30 deletions frontend/javascripts/oxalis/view/layouting/tracing_layout_view.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { WarningFilled } from "@ant-design/icons";
import { Alert, Layout, Tooltip } from "antd";
import { Layout } from "antd";
import ErrorHandling from "libs/error_handling";
import Request from "libs/request";
import Toast from "libs/toast";
Expand Down Expand Up @@ -256,8 +255,7 @@ class TracingLayoutView extends React.PureComponent<PropsWithRouter, State> {
this.props.is2d,
);
const currentLayoutNames = this.getLayoutNamesFromCurrentView(layoutType);
const { isDatasetOnScratchVolume, isUpdateTracingAllowed, distanceMeasurementTooltipPosition } =
this.props;
const { isUpdateTracingAllowed, distanceMeasurementTooltipPosition } = this.props;

const createNewTracing = async (
files: Array<File>,
Expand Down Expand Up @@ -322,31 +320,6 @@ class TracingLayoutView extends React.PureComponent<PropsWithRouter, State> {
autoSaveLayouts: this.props.autoSaveLayouts,
}}
/>
{isDatasetOnScratchVolume ? (
<Tooltip title={messages["dataset.is_scratch"]}>
<Alert
className="hide-on-small-screen"
style={{
height: 30,
paddingTop: 4,
backgroundColor: "var(--ant-color-warning)",
border: "none",
color: "white",
}}
message={
<span>
Dataset is on tmpscratch!{" "}
<WarningFilled
style={{
margin: "0 0 0 6px",
}}
/>
</span>
}
type="error"
/>
</Tooltip>
) : null}
</div>
) : null}
</RenderToPortal>
Expand Down Expand Up @@ -401,7 +374,6 @@ function mapStateToProps(state: OxalisState) {
isUpdateTracingAllowed: state.tracing.restrictions.allowUpdate,
showVersionRestore: state.uiInformation.showVersionRestore,
storedLayouts: state.uiInformation.storedLayouts,
isDatasetOnScratchVolume: state.dataset.dataStore.isScratch,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also remove the property from the frontend as this is the onliest place where it is actively used?

datasetId: state.dataset.id,
is2d: is2dDataset(state.dataset),
displayName: state.tracing.name ? state.tracing.name : state.dataset.name,
Expand Down