Skip to content

Commit e5aecf5

Browse files
philippottofm3
andauthored
Remove isScratch banner (#8296)
* remove isscratch banner * update changelog * remove isScratch from datastore public json * remove isscratch from frontend * update snapshots --------- Co-authored-by: Florian M <[email protected]>
1 parent ccf3a71 commit e5aecf5

File tree

17 files changed

+3
-49
lines changed

17 files changed

+3
-49
lines changed

CHANGELOG.unreleased.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
4343

4444
### Removed
4545
- Removed support for HTTP API versions 3 and 4. [#8075](https://github.com/scalableminds/webknossos/pull/8075)
46+
- 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)
4647

4748
### Breaking Changes

app/models/dataset/DataStore.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class DataStoreService @Inject()(dataStoreDAO: DataStoreDAO, jobService: JobServ
7171
Json.obj(
7272
"name" -> dataStore.name,
7373
"url" -> dataStore.publicUrl,
74-
"isScratch" -> dataStore.isScratch,
7574
"allowsUpload" -> dataStore.allowsUpload,
7675
"jobsSupportedByAvailableWorkers" -> Json.toJson(jobsSupportedByAvailableWorkers),
7776
"jobsEnabled" -> jobsEnabled

frontend/javascripts/oxalis/default_state.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ const defaultState: OxalisState = {
143143
dataStore: {
144144
name: "localhost",
145145
url: "http://localhost:9000",
146-
isScratch: false,
147146
allowsUpload: true,
148147
jobsEnabled: false,
149148
jobsSupportedByAvailableWorkers: [],

frontend/javascripts/oxalis/view/layouting/tracing_layout_view.tsx

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { WarningFilled } from "@ant-design/icons";
2-
import { Alert, Layout, Tooltip } from "antd";
1+
import { Layout } from "antd";
32
import ErrorHandling from "libs/error_handling";
43
import Request from "libs/request";
54
import Toast from "libs/toast";
@@ -256,8 +255,7 @@ class TracingLayoutView extends React.PureComponent<PropsWithRouter, State> {
256255
this.props.is2d,
257256
);
258257
const currentLayoutNames = this.getLayoutNamesFromCurrentView(layoutType);
259-
const { isDatasetOnScratchVolume, isUpdateTracingAllowed, distanceMeasurementTooltipPosition } =
260-
this.props;
258+
const { isUpdateTracingAllowed, distanceMeasurementTooltipPosition } = this.props;
261259

262260
const createNewTracing = async (
263261
files: Array<File>,
@@ -322,31 +320,6 @@ class TracingLayoutView extends React.PureComponent<PropsWithRouter, State> {
322320
autoSaveLayouts: this.props.autoSaveLayouts,
323321
}}
324322
/>
325-
{isDatasetOnScratchVolume ? (
326-
<Tooltip title={messages["dataset.is_scratch"]}>
327-
<Alert
328-
className="hide-on-small-screen"
329-
style={{
330-
height: 30,
331-
paddingTop: 4,
332-
backgroundColor: "var(--ant-color-warning)",
333-
border: "none",
334-
color: "white",
335-
}}
336-
message={
337-
<span>
338-
Dataset is on tmpscratch!{" "}
339-
<WarningFilled
340-
style={{
341-
margin: "0 0 0 6px",
342-
}}
343-
/>
344-
</span>
345-
}
346-
type="error"
347-
/>
348-
</Tooltip>
349-
) : null}
350323
</div>
351324
) : null}
352325
</RenderToPortal>
@@ -401,7 +374,6 @@ function mapStateToProps(state: OxalisState) {
401374
isUpdateTracingAllowed: state.tracing.restrictions.allowUpdate,
402375
showVersionRestore: state.uiInformation.showVersionRestore,
403376
storedLayouts: state.uiInformation.storedLayouts,
404-
isDatasetOnScratchVolume: state.dataset.dataStore.isScratch,
405377
datasetId: state.dataset.id,
406378
is2d: is2dDataset(state.dataset),
407379
displayName: state.tracing.name ? state.tracing.name : state.dataset.name,

frontend/javascripts/test/fixtures/dataset_server_object.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ const apiDataset: APIDataset = {
6666
dataStore: {
6767
name: "localhost",
6868
url: "http://localhost:9000",
69-
isScratch: false,
7069
allowsUpload: true,
7170
jobsSupportedByAvailableWorkers: [],
7271
jobsEnabled: false,

frontend/javascripts/test/fixtures/skeletontracing_server_objects.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ export const annotation: APIAnnotation = {
187187
dataStore: {
188188
name: "localhost",
189189
url: "http://localhost:9000",
190-
isScratch: false,
191190
allowsUpload: true,
192191
jobsEnabled: false,
193192
jobsSupportedByAvailableWorkers: [],

frontend/javascripts/test/fixtures/tasktracing_server_objects.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ export const annotation: APIAnnotation = {
130130
dataStore: {
131131
name: "localhost",
132132
url: "http://localhost:9000",
133-
isScratch: false,
134133
allowsUpload: true,
135134
jobsEnabled: false,
136135
jobsSupportedByAvailableWorkers: [],

frontend/javascripts/test/fixtures/volumetracing_server_objects.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ export const annotation: APIAnnotation = {
9696
dataStore: {
9797
name: "localhost",
9898
url: "http://localhost:9000",
99-
isScratch: false,
10099
allowsUpload: true,
101100
jobsEnabled: false,
102101
jobsSupportedByAvailableWorkers: [],

frontend/javascripts/test/snapshots/public-test/test-bundle/test/backend-snapshot-tests/annotations.e2e.js.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Generated by [AVA](https://avajs.dev).
2626
dataSetName: '2012-06-28_Cortex',
2727
dataStore: {
2828
allowsUpload: true,
29-
isScratch: false,
3029
jobsEnabled: false,
3130
jobsSupportedByAvailableWorkers: [],
3231
name: 'localhost',
@@ -150,7 +149,6 @@ Generated by [AVA](https://avajs.dev).
150149
dataSetName: '2012-06-28_Cortex',
151150
dataStore: {
152151
allowsUpload: true,
153-
isScratch: false,
154152
jobsEnabled: false,
155153
jobsSupportedByAvailableWorkers: [],
156154
name: 'localhost',
@@ -390,7 +388,6 @@ Generated by [AVA](https://avajs.dev).
390388
dataSetName: '2012-06-28_Cortex',
391389
dataStore: {
392390
allowsUpload: true,
393-
isScratch: false,
394391
jobsEnabled: false,
395392
jobsSupportedByAvailableWorkers: [],
396393
name: 'localhost',
@@ -564,7 +561,6 @@ Generated by [AVA](https://avajs.dev).
564561
dataSetName: '2012-06-28_Cortex',
565562
dataStore: {
566563
allowsUpload: true,
567-
isScratch: false,
568564
jobsEnabled: false,
569565
jobsSupportedByAvailableWorkers: [],
570566
name: 'localhost',
@@ -745,7 +741,6 @@ Generated by [AVA](https://avajs.dev).
745741
dataSetName: '2012-06-28_Cortex',
746742
dataStore: {
747743
allowsUpload: true,
748-
isScratch: false,
749744
jobsEnabled: false,
750745
jobsSupportedByAvailableWorkers: [],
751746
name: 'localhost',
@@ -872,7 +867,6 @@ Generated by [AVA](https://avajs.dev).
872867
dataSetName: '2012-06-28_Cortex',
873868
dataStore: {
874869
allowsUpload: true,
875-
isScratch: false,
876870
jobsEnabled: false,
877871
jobsSupportedByAvailableWorkers: [],
878872
name: 'localhost',
@@ -1001,7 +995,6 @@ Generated by [AVA](https://avajs.dev).
1001995
dataSetName: '2012-06-28_Cortex',
1002996
dataStore: {
1003997
allowsUpload: true,
1004-
isScratch: false,
1005998
jobsEnabled: false,
1006999
jobsSupportedByAvailableWorkers: [],
10071000
name: 'localhost',
@@ -1125,7 +1118,6 @@ Generated by [AVA](https://avajs.dev).
11251118
dataSetName: 'confocal-multi_knossos',
11261119
dataStore: {
11271120
allowsUpload: true,
1128-
isScratch: false,
11291121
jobsEnabled: false,
11301122
jobsSupportedByAvailableWorkers: [],
11311123
name: 'localhost',

0 commit comments

Comments
 (0)