code cleanup after review and It trad

vatesfr · Apr 22, 2022 · 0279dbd · 0279dbd
1 parent 3e82ed6
commit 0279dbd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/xo-web/src/common/dropzone/index.js b/packages/xo-web/src/common/dropzone/index.js
@@ -18,11 +18,11 @@ export default class Dropzone extends Component {
 
     return (
       <ReactDropzone
+        accept={accept}
         activeClassName={styles.activeDropzone}
         className={styles.dropzone}
         multiple={multiple}
         onDrop={onDrop}
-        accept={accept}
       >
         <div className={styles.dropzoneText}>{message}</div>
       </ReactDropzone>

diff --git a/packages/xo-web/src/common/intl/locales/it.js b/packages/xo-web/src/common/intl/locales/it.js
@@ -3819,7 +3819,7 @@ export default {
   diskImportSuccess: 'Importazione del disco riuscita',
 
   // Original text: 'Drop VMDK or VHD files here to import disks.'
-  dropDisksFiles: 'Rilascia qui i file VMDK o VHD per importare i dischi.',
+  dropDisksFiles: 'Rilascia qui i file ISO, VMDK o VHD per importare i dischi.',
 
   // Original text: 'To SR'
   importToSr: 'A SR',

diff --git a/packages/xo-web/src/common/select-objects.js b/packages/xo-web/src/common/select-objects.js
@@ -41,7 +41,6 @@ import {
 import { addSubscriptions, connectStore, resolveResourceSets } from './utils'
 import {
   isSrWritable,
-  isSrWritableOrIso,
   subscribeCloudConfigs,
   subscribeCurrentUser,
   subscribeGroups,
@@ -377,12 +376,12 @@ export const SelectPool = makeStoreSelect(
 // ===================================================================
 
 export const SelectSr = makeStoreSelect(
-  (_, { allowIsoSr } = {}) => {
+  () => {
     const getPools = createGetObjectsOfType('pool')
     const getHosts = createGetObjectsOfType('host')
 
     const getSrsByContainer = createGetObjectsOfType('SR')
-      .filter((_, { predicate }) => predicate || (allowIsoSr ? isSrWritableOrIso : isSrWritable))
+      .filter((_, { predicate }) => predicate || isSrWritable)
       .sort()
       .groupBy('$container')
 

diff --git a/packages/xo-web/src/xo-app/disk-import/index.js b/packages/xo-web/src/xo-app/disk-import/index.js
@@ -17,6 +17,7 @@ import { InputCol, LabelCol, Row } from 'form-grid'
 import { map } from 'lodash'
 import { readCapacityAndGrainTable } from 'xo-vmdk-to-vhd'
 import { SelectSr } from 'select-objects'
+import { isSrWritableOrIso } from '../../common/xo'
 
 const getInitialState = () => ({
   disks: [],
@@ -108,7 +109,7 @@ const DiskImport = decorate([
         <Row>
           <LabelCol>{_('importToSr')}</LabelCol>
           <InputCol>
-            <SelectSr onChange={effects.onChangeSr} required value={sr} allowIsoSr />
+            <SelectSr onChange={effects.onChangeSr} required value={sr} predicate={isSrWritableOrIso} />
           </InputCol>
         </Row>
         {sr !== undefined && (