diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 77ab5de5a..c99bc1879 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -7,6 +7,8 @@ > Users must be able to say: “Nice enhancement, I'm eager to test it” +- [Import/Disk] Enhance clarity for importing ISO files [Forum#7243](https://xcp-ng.org/forum/topic/7243/can-t-import-iso-through-ova-not-a-supported-filetype?_=1685710667937) (PR [#6874](https://github.com/vatesfr/xen-orchestra/pull/6874)) + ### Bug fixes > Users must be able to say: “I had this issue, happy to know it's fixed” @@ -27,4 +29,6 @@ +- xo-web minor + diff --git a/packages/xo-web/src/common/intl/locales/it.js b/packages/xo-web/src/common/intl/locales/it.js index fc07fb17f..43146a814 100644 --- a/packages/xo-web/src/common/intl/locales/it.js +++ b/packages/xo-web/src/common/intl/locales/it.js @@ -3836,8 +3836,8 @@ export default { // Original text: 'Disk import success' diskImportSuccess: 'Importazione del disco riuscita', - // Original text: 'Drop VMDK or VHD files here to import disks.' - dropDisksFiles: 'Rilascia qui i file ISO, VMDK o VHD per importare i dischi.', + // Original text: 'Drop {types} files here to import disks.' + dropDisksFiles: 'Rilascia qui i file {types} per importare i dischi.', // Original text: 'To SR' importToSr: 'A SR', diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index 975974a76..ede4273de 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -1685,8 +1685,9 @@ const messages = { // ---- Disk import --- diskImportFailed: 'Disk import failed', diskImportSuccess: 'Disk import success', - dropDisksFiles: 'Drop ISO, VMDK or VHD files here to import disks.', + dropDisksFiles: 'Drop {types} files here to import disks.', importToSr: 'To SR', + isoImportRequirement: 'To import ISO files, an ISO repository is required', // ---- Tasks --- poolTasks: 'Pool tasks', diff --git a/packages/xo-web/src/xo-app/disk-import/index.js b/packages/xo-web/src/xo-app/disk-import/index.js index 63ecbbd1f..cea010ba7 100644 --- a/packages/xo-web/src/xo-app/disk-import/index.js +++ b/packages/xo-web/src/xo-app/disk-import/index.js @@ -100,12 +100,25 @@ const DiskImport = decorate([ onChangeSr: (_, sr) => ({ sr }), reset: getInitialState, }, + computed: { + isSrIso: ({ sr }) => sr.content_type === 'iso', + }, }), injectIntl, injectState, - ({ effects, state: { disks, loadingDisks, mapDescriptions, mapNames, sr } }) => ( + ({ effects, state: { disks, loadingDisks, mapDescriptions, mapNames, sr, isSrIso } }) => (
+
+ + {_('isoImportRequirement')} + +
{_('importToSr')} @@ -116,8 +129,8 @@ const DiskImport = decorate([
{loadingDisks && } {disks.length > 0 && (