Preserves widget references on screen config delete if flag is set

pixlise · Oct 30, 2024 · 9e3181f · 9e3181f
1 parent 8d68e54
commit 9e3181f
Show file tree

Hide file tree

Showing 89 changed files with 205 additions and 190 deletions.
diff --git a/api/ws/handlers/screen-configuration.go b/api/ws/handlers/screen-configuration.go
@@ -399,14 +399,16 @@ func HandleScreenConfigurationDeleteReq(req *protos.ScreenConfigurationDeleteReq
 	callback := func(sessCtx mongo.SessionContext) (interface{}, error) {
 		var err error
 
-		for _, layout := range screenConfig.Layouts {
-			for _, widget := range layout.Widgets {
-				if widget.Id != "" {
-					_, err = hctx.Svcs.MongoDB.Collection(dbCollections.WidgetDataName).DeleteOne(sessCtx, bson.M{
-						"_id": widget.Id,
-					})
-					if err != nil {
-						return nil, err
+		if !req.PreserveDanglingWidgetReferences {
+			for _, layout := range screenConfig.Layouts {
+				for _, widget := range layout.Widgets {
+					if widget.Id != "" {
+						_, err = hctx.Svcs.MongoDB.Collection(dbCollections.WidgetDataName).DeleteOne(sessCtx, bson.M{
+							"_id": widget.Id,
+						})
+						if err != nil {
+							return nil, err
+						}
 					}
 				}
 			}

diff --git a/data-formats b/data-formats
diff --git a/generated-protos/detector-config-msgs.pb.go b/generated-protos/detector-config-msgs.pb.go
diff --git a/generated-protos/detector-config.pb.go b/generated-protos/detector-config.pb.go
diff --git a/generated-protos/diffraction-data.pb.go b/generated-protos/diffraction-data.pb.go
diff --git a/generated-protos/diffraction-detected-peak-msgs.pb.go b/generated-protos/diffraction-detected-peak-msgs.pb.go
diff --git a/generated-protos/diffraction-manual-msgs.pb.go b/generated-protos/diffraction-manual-msgs.pb.go
diff --git a/generated-protos/diffraction-status-msgs.pb.go b/generated-protos/diffraction-status-msgs.pb.go
diff --git a/generated-protos/diffraction.pb.go b/generated-protos/diffraction.pb.go
diff --git a/generated-protos/doi-msgs.pb.go b/generated-protos/doi-msgs.pb.go
diff --git a/generated-protos/doi.pb.go b/generated-protos/doi.pb.go
diff --git a/generated-protos/element-set-msgs.pb.go b/generated-protos/element-set-msgs.pb.go
diff --git a/generated-protos/element-set.pb.go b/generated-protos/element-set.pb.go
diff --git a/generated-protos/experiment.pb.go b/generated-protos/experiment.pb.go
diff --git a/generated-protos/export-msgs.pb.go b/generated-protos/export-msgs.pb.go
diff --git a/generated-protos/export.pb.go b/generated-protos/export.pb.go
diff --git a/generated-protos/expression-group-msgs.pb.go b/generated-protos/expression-group-msgs.pb.go
diff --git a/generated-protos/expression-group.pb.go b/generated-protos/expression-group.pb.go
diff --git a/generated-protos/expression-msgs.pb.go b/generated-protos/expression-msgs.pb.go
diff --git a/generated-protos/expressions.pb.go b/generated-protos/expressions.pb.go
diff --git a/generated-protos/image-beam-location-msgs.pb.go b/generated-protos/image-beam-location-msgs.pb.go
diff --git a/generated-protos/image-beam-location.pb.go b/generated-protos/image-beam-location.pb.go
diff --git a/generated-protos/image-coreg-msgs.pb.go b/generated-protos/image-coreg-msgs.pb.go
diff --git a/generated-protos/image-coreg.pb.go b/generated-protos/image-coreg.pb.go
diff --git a/generated-protos/image-msgs.pb.go b/generated-protos/image-msgs.pb.go
diff --git a/generated-protos/image.pb.go b/generated-protos/image.pb.go
diff --git a/generated-protos/job-msgs.pb.go b/generated-protos/job-msgs.pb.go
diff --git a/generated-protos/job.pb.go b/generated-protos/job.pb.go
diff --git a/generated-protos/log-msgs.pb.go b/generated-protos/log-msgs.pb.go
diff --git a/generated-protos/log.pb.go b/generated-protos/log.pb.go
diff --git a/generated-protos/memoisation-msgs.pb.go b/generated-protos/memoisation-msgs.pb.go
diff --git a/generated-protos/memoisation.pb.go b/generated-protos/memoisation.pb.go
diff --git a/generated-protos/module-msgs.pb.go b/generated-protos/module-msgs.pb.go
diff --git a/generated-protos/modules.pb.go b/generated-protos/modules.pb.go
diff --git a/generated-protos/notification-msgs.pb.go b/generated-protos/notification-msgs.pb.go
diff --git a/generated-protos/notification.pb.go b/generated-protos/notification.pb.go
diff --git a/generated-protos/ownership-access-msgs.pb.go b/generated-protos/ownership-access-msgs.pb.go
diff --git a/generated-protos/ownership-access.pb.go b/generated-protos/ownership-access.pb.go
diff --git a/generated-protos/permissions.pb.go b/generated-protos/permissions.pb.go