From e728f8d60316cb214e0c4b62f4d9a66a722830c4 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Fri, 28 Feb 2025 12:51:56 +0200
Subject: [PATCH 1/2] UIIN-3259: Move `set for deletion` checkbox field to 4th
 space in a row (#2767)

---
 CHANGELOG.md             |  1 +
 src/edit/InstanceForm.js | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 453b8afdc..4b1593302 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 * Adapt settings options for using number gernerator. Refs UIIN-2556.
 * Hide version history icon and settings if audit log feature is disabled. Refs UIIN-3231.
 * Provide ids _and `length` param_ when retrieving job profiles. Refs UIIN-3257.
+* Move ‘Set for deletion’ checkbox field to 4th space in top row of Instance Edit view. Refs UIIN-3259.
 
 ## [12.0.12](https://github.com/folio-org/ui-inventory/tree/v12.0.12) (2025-01-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.11...v12.0.12)
diff --git a/src/edit/InstanceForm.js b/src/edit/InstanceForm.js
index deb243cb4..e8f10ce59 100644
--- a/src/edit/InstanceForm.js
+++ b/src/edit/InstanceForm.js
@@ -536,16 +536,6 @@ class InstanceForm extends React.Component {
                             <this.cViewMetaData metadata={initialValues.metadata} />
                           }
                           <Row>
-                            <Col sm={3}>
-                              <Field
-                                label={<FormattedMessage id="ui-inventory.setForDeletion" />}
-                                name="deleted"
-                                component={Checkbox}
-                                type="checkbox"
-                                disabled={this.isFieldBlocked('deleted')}
-                                onChange={() => this.onSetForDeletionFieldChange()}
-                              />
-                            </Col>
                             <Col sm={3}>
                               <Field
                                 label={<FormattedMessage id="ui-inventory.discoverySuppress" />}
@@ -576,6 +566,16 @@ class InstanceForm extends React.Component {
                                 disabled={this.isFieldBlocked('previouslyHeld')}
                               />
                             </Col>
+                            <Col sm={3}>
+                              <Field
+                                label={<FormattedMessage id="ui-inventory.setForDeletion" />}
+                                name="deleted"
+                                component={Checkbox}
+                                type="checkbox"
+                                disabled={this.isFieldBlocked('deleted')}
+                                onChange={() => this.onSetForDeletionFieldChange()}
+                              />
+                            </Col>
                           </Row>
                           <br />
                           <Row>

From 85cd1f95f6d0ad095119ddf91938c50a6b728e7c Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Fri, 28 Feb 2025 13:47:58 +0200
Subject: [PATCH 2/2] =?UTF-8?q?UIIN-3260:=20Update=20Inventory:=20Set=20re?=
 =?UTF-8?q?cords=20for=20deletion=20permission's=20effect=20on=20=E2=80=98?=
 =?UTF-8?q?Set=20for=20deletion=E2=80=99=20checkbox=20in=20Instance=20Edit?=
 =?UTF-8?q?=20view=20(#2768)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md             | 1 +
 src/edit/InstanceForm.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b1593302..b1bd89a00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 * Hide version history icon and settings if audit log feature is disabled. Refs UIIN-3231.
 * Provide ids _and `length` param_ when retrieving job profiles. Refs UIIN-3257.
 * Move ‘Set for deletion’ checkbox field to 4th space in top row of Instance Edit view. Refs UIIN-3259.
+* Update Inventory: Set records for deletion permission's effect on ‘Set for deletion’ checkbox in Instance Edit view. Refs UIIN-3260.
 
 ## [12.0.12](https://github.com/folio-org/ui-inventory/tree/v12.0.12) (2025-01-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.11...v12.0.12)
diff --git a/src/edit/InstanceForm.js b/src/edit/InstanceForm.js
index e8f10ce59..467a34220 100644
--- a/src/edit/InstanceForm.js
+++ b/src/edit/InstanceForm.js
@@ -198,6 +198,7 @@ class InstanceForm extends React.Component {
       connect: PropTypes.func.isRequired,
       locale: PropTypes.string.isRequired,
       logger: PropTypes.object.isRequired,
+      hasPerm: PropTypes.func.isRequired,
     }).isRequired,
     resources: PropTypes.shape({
       instanceBlockedFields: PropTypes.shape({
@@ -572,7 +573,8 @@ class InstanceForm extends React.Component {
                                 name="deleted"
                                 component={Checkbox}
                                 type="checkbox"
-                                disabled={this.isFieldBlocked('deleted')}
+                                disabled={this.isFieldBlocked('deleted')
+                                  || !this.props.stripes.hasPerm('ui-inventory.instance.set-records-for-deletion.execute')}
                                 onChange={() => this.onSetForDeletionFieldChange()}
                               />
                             </Col>