From 020954b8199c909150837492fb76d8da05a25ca6 Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Thu, 26 Dec 2024 08:14:02 +0530 Subject: [PATCH] [client] Add some conflict resolution constants --- client/lib/libphylum/actions/action_resource_bind.dart | 8 +++++--- client/lib/libphylum/actions/action_resource_copy.dart | 2 +- client/lib/libphylum/actions/action_resource_move.dart | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/lib/libphylum/actions/action_resource_bind.dart b/client/lib/libphylum/actions/action_resource_bind.dart index 42adb76c..7c09f515 100644 --- a/client/lib/libphylum/actions/action_resource_bind.dart +++ b/client/lib/libphylum/actions/action_resource_bind.dart @@ -1,9 +1,11 @@ import 'action_resource.dart'; typedef ResourceBindConflictResolution = int; -const ResourceBindConflictResolution resourceBindConflictResolutionNone = 0; -const ResourceBindConflictResolution resourceBindConflictResolutionOverwrite = 1; +const ResourceBindConflictResolution resourceBindConflictResolutionError = 0; +const ResourceBindConflictResolution resourceBindConflictResolutionEnsure = 1; const ResourceBindConflictResolution resourceBindConflictResolutionRename = 2; +const ResourceBindConflictResolution resourceBindConflictResolutionOverwrite = 3; +const ResourceBindConflictResolution resourceBindConflictResolutionDelete = 4; abstract class ResourceBindAction extends ResourceAction { ResourceBindConflictResolution _conflictResolution; @@ -19,7 +21,7 @@ abstract class ResourceBindAction extends ResourceAction { required super.resourceId, required String parent, required String resourceName, - ResourceBindConflictResolution conflictResolution = resourceBindConflictResolutionNone, + ResourceBindConflictResolution conflictResolution = resourceBindConflictResolutionError, }) : _parent = parent, _resourceName = resourceName, _conflictResolution = conflictResolution; diff --git a/client/lib/libphylum/actions/action_resource_copy.dart b/client/lib/libphylum/actions/action_resource_copy.dart index 81ab6f20..7b7c57f8 100644 --- a/client/lib/libphylum/actions/action_resource_copy.dart +++ b/client/lib/libphylum/actions/action_resource_copy.dart @@ -36,7 +36,7 @@ class ResourceCopyAction extends ResourceCreateAction with JsonApiAction { required String resourceId, required String parent, required String resourceName, - ResourceBindConflictResolution conflictResolution = resourceBindConflictResolutionNone, + ResourceBindConflictResolution conflictResolution = resourceBindConflictResolutionError, }) : this._( srcId: src.id, resourceId: resourceId, diff --git a/client/lib/libphylum/actions/action_resource_move.dart b/client/lib/libphylum/actions/action_resource_move.dart index 703629ff..22aee6e0 100644 --- a/client/lib/libphylum/actions/action_resource_move.dart +++ b/client/lib/libphylum/actions/action_resource_move.dart @@ -34,7 +34,7 @@ class ResourceMoveAction extends ResourceBindAction with JsonApiAction { required Resource r, String? name, String? parent, - ResourceBindConflictResolution conflictResoltion = resourceBindConflictResolutionNone, + ResourceBindConflictResolution conflictResoltion = resourceBindConflictResolutionError, }) : this._( resourceId: r.id, parent: parent ?? r.parent!,