From fe3bb49eb6263c166635d9efc5a1e28a872a21b0 Mon Sep 17 00:00:00 2001
From: mathieuRA <contact@mathieu-raisin.fr>
Date: Fri, 1 Mar 2024 14:51:29 +0100
Subject: [PATCH 1/2] fix(xo-web/XOSTOR): move 'ignore file sytems' outside of
 advanced settings

---
 CHANGELOG.unreleased.md                       |  3 ++-
 .../src/xo-app/xostor/new-xostor-form.js      | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index b1093322cd7..84301519582 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -12,6 +12,7 @@
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
 - [Jobs] Fix `t.value is undefined` when saving a new job (broken in XO 5.91)
+- [XOSTOR] Move `ignore file sytems` outside of advanced settings
 
 ### Packages to release
 
@@ -29,6 +30,6 @@
 
 <!--packages-start-->
 
-- xo-web patch
+- xo-web minor
 
 <!--packages-end-->
diff --git a/packages/xo-web/src/xo-app/xostor/new-xostor-form.js b/packages/xo-web/src/xo-app/xostor/new-xostor-form.js
index 6d724b62450..0e9e9506d21 100644
--- a/packages/xo-web/src/xo-app/xostor/new-xostor-form.js
+++ b/packages/xo-web/src/xo-app/xostor/new-xostor-form.js
@@ -111,7 +111,8 @@ const SettingsCard = decorate([
     <Card>
       <CardHeader>
         {_('settings')}
-        <ActionButton
+        {/* Uncomment when some advanced settings need to be added  */}
+        {/* <ActionButton
           className='pull-right'
           data-mode='_displayAdvancedSettings'
           handler={effects.toggleDisplayAdvancedSettings}
@@ -120,7 +121,7 @@ const SettingsCard = decorate([
           size='small'
         >
           {_('advancedSettings')}
-        </ActionButton>
+        </ActionButton> */}
       </CardHeader>
       <CardBlock>
         <Row>
@@ -140,14 +141,13 @@ const SettingsCard = decorate([
             <Select onChange={effects.onProvisioningChange} options={PROVISIONING_OPTIONS} value={state.provisioning} />
           </Col>
         </Row>
-        {state.displayAdvancedSettings && (
-          <Row>
-            <Col style={SPACE_BETWEEN}>
-              <label>{_('ignoreFileSystems')}</label>
-              <Toggle value={state.ignoreFileSystems} onChange={effects.onIgnoreFileSystemsChange} size='small' />
-            </Col>
-          </Row>
-        )}
+        <Row className='form-group mt-1'>
+          <Col style={SPACE_BETWEEN}>
+            <label>{_('ignoreFileSystems')}</label>
+            <Toggle value={state.ignoreFileSystems} onChange={effects.onIgnoreFileSystemsChange} size='small' />
+          </Col>
+        </Row>
+        {/* {state.displayAdvancedSettings && ( Advanced settings section )} */}
       </CardBlock>
     </Card>
   ),

From b89870abbcbafdcdb3cae82b313a2e093b7fb7ba Mon Sep 17 00:00:00 2001
From: mathieuRA <contact@mathieu-raisin.fr>
Date: Fri, 1 Mar 2024 14:55:27 +0100
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.unreleased.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 84301519582..22bed31078d 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -12,7 +12,7 @@
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
 - [Jobs] Fix `t.value is undefined` when saving a new job (broken in XO 5.91)
-- [XOSTOR] Move `ignore file sytems` outside of advanced settings
+- [XOSTOR] Move `ignore file sytems` outside of advanced settings (PR [#7429](https://github.com/vatesfr/xen-orchestra/pull/7429))
 
 ### Packages to release