From 1d49eb45ff703448fc652e267ccdcd68d2807c0f Mon Sep 17 00:00:00 2001
From: mathieuRA <contact@mathieu-raisin.fr>
Date: Fri, 20 Oct 2023 17:08:42 +0200
Subject: [PATCH 1/4] feat(xo-web/licenses): display XOSTOR licenses

---
 packages/xo-web/src/common/intl/messages.js   |   2 +
 packages/xo-web/src/common/select-license.js  |   2 +-
 .../xo-web/src/xo-app/xoa/licenses/index.js   |  37 +++--
 .../xo-web/src/xo-app/xoa/licenses/xosan.js   | 134 ------------------
 .../xo-web/src/xo-app/xoa/licenses/xostor.js  | 108 ++++++++++++++
 5 files changed, 134 insertions(+), 149 deletions(-)
 delete mode 100644 packages/xo-web/src/xo-app/xoa/licenses/xosan.js
 create mode 100644 packages/xo-web/src/xo-app/xoa/licenses/xostor.js

diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
index 082defbcdf0..09f4aa63be1 100644
--- a/packages/xo-web/src/common/intl/messages.js
+++ b/packages/xo-web/src/common/intl/messages.js
@@ -2500,11 +2500,13 @@ const messages = {
   storage: 'Storage',
   summary: 'Summary',
   wrongNumberOfHosts: 'Wrong number of hosts',
+
   xostor: 'XOSTOR',
   xostorDiskRequired: 'At least one disk is required',
   xostorDisksDropdownLabel: '({nDisks, number} disk{nDisks, plural, one {} other {s}}) {hostname}',
   xostorFailedVgAlreadyExists:
     "Formatting disks failed because a VG group named 'linstor_group' already exists on the hosts. Do you want to delete these VG groups?",
+  xostorMultipleLicenses: 'This proxy has more than 1 license!',
   xostorPackagesWillBeInstalled: '"xcp-ng-release-linstor" and "xcp-ng-linstor" will be installed on each host',
   xostorReplicationWarning: 'If a disk dies, you will lose data',
 
diff --git a/packages/xo-web/src/common/select-license.js b/packages/xo-web/src/common/select-license.js
index ba8718787ce..f8d49ad1e17 100644
--- a/packages/xo-web/src/common/select-license.js
+++ b/packages/xo-web/src/common/select-license.js
@@ -9,7 +9,7 @@ import map from 'lodash/map.js'
 import { renderXoItemFromId } from './render-xo-item'
 
 const LicenseOptions = ({ license, formatDate }) => {
-  const productId = license.productId.split('-')[1]
+  const productId = license.productId.startsWith('xostor') ? license.productId : license.productId.split('-')[1]
   return (
     <option value={license.id}>
       <span>
diff --git a/packages/xo-web/src/xo-app/xoa/licenses/index.js b/packages/xo-web/src/xo-app/xoa/licenses/index.js
index a7b0b4f767d..4eaa0b4c197 100644
--- a/packages/xo-web/src/xo-app/xoa/licenses/index.js
+++ b/packages/xo-web/src/xo-app/xoa/licenses/index.js
@@ -18,7 +18,7 @@ import { get } from '@xen-orchestra/defined'
 import { getLicenses, selfBindLicense, subscribePlugins, subscribeProxies, subscribeSelfLicenses } from 'xo'
 
 import Proxies from './proxies'
-import Xosan from './xosan'
+import Xostor from './xostor'
 
 // -----------------------------------------------------------------------------
 
@@ -196,7 +196,7 @@ export default class Licenses extends Component {
 
     return getLicenses()
       .then(licenses => {
-        const { proxy, xcpng, xoa, xosan } = groupBy(licenses, license => {
+        const { proxy, xcpng, xoa, xosan, xostor } = groupBy(licenses, license => {
           for (const productType of license.productTypes) {
             if (productType === 'xo') {
               return 'xoa'
@@ -210,6 +210,9 @@ export default class Licenses extends Component {
             if (productType === 'xcpng') {
               return 'xcpng'
             }
+            if (productType === 'xostor') {
+              return 'xostor'
+            }
           }
           return 'other'
         })
@@ -219,6 +222,7 @@ export default class Licenses extends Component {
             xcpng,
             xoa,
             xosan,
+            xostor,
           },
         })
       })
@@ -300,6 +304,21 @@ export default class Licenses extends Component {
         }
       })
 
+      // --- XOSTOR ---
+      forEach(licenses.xostor, license => {
+        // When `expires` is undefined, the license isn't expired
+        if (!(license.expires < now)) {
+          products.push({
+            buyer: license.buyer,
+            expires: license.expires,
+            id: license.id,
+            product: 'XOSTOR',
+            type: 'xostor',
+            srId: license.boundObjectId,
+          })
+        }
+      })
+
       return products
     }
   )
@@ -377,18 +396,8 @@ export default class Licenses extends Component {
         </Row>
         <Row>
           <Col>
-            <h2>
-              XOSAN
-              <a
-                className='btn btn-secondary ml-1'
-                href='https://xen-orchestra.com/#!/xosan-home'
-                target='_blank'
-                rel='noopener noreferrer'
-              >
-                <Icon icon='bug' /> {_('productSupport')}
-              </a>
-            </h2>
-            <Xosan xosanLicenses={this.state.licenses.xosan} updateLicenses={this._updateLicenses} />
+            <h2>XOSTOR</h2>
+            <Xostor xostorLicenses={this.state.licenses.xostor} updateLicenses={this._updateLicenses} />
           </Col>
         </Row>
         <Row>
diff --git a/packages/xo-web/src/xo-app/xoa/licenses/xosan.js b/packages/xo-web/src/xo-app/xoa/licenses/xosan.js
deleted file mode 100644
index b86f4f2aa52..00000000000
--- a/packages/xo-web/src/xo-app/xoa/licenses/xosan.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import _ from 'intl'
-import ActionButton from 'action-button'
-import Component from 'base-component'
-import Link from 'link'
-import React from 'react'
-import renderXoItem, { Pool } from 'render-xo-item'
-import SelectLicense from 'select-license'
-import SortedTable from 'sorted-table'
-import { connectStore } from 'utils'
-import { createSelector, createGetObjectsOfType } from 'selectors'
-import { filter, forEach, includes, map } from 'lodash'
-import { unlockXosan } from 'xo'
-
-class XosanLicensesForm extends Component {
-  state = {
-    licenseId: 'none',
-  }
-
-  onChangeLicense = event => {
-    this.setState({ licenseId: event.target.value })
-  }
-
-  unlockXosan = () => {
-    const { item, userData } = this.props
-    return unlockXosan(this.state.licenseId, item.id).then(userData.updateLicenses)
-  }
-
-  render() {
-    const { item, userData } = this.props
-    const { licenseId } = this.state
-
-    const license = userData.licensesByXosan[item.id]
-    if (license === null) {
-      return (
-        <span className='text-danger'>
-          {_('xosanMultipleLicenses')} <a href='https://xen-orchestra.com/'>{_('contactUs')}</a>
-        </span>
-      )
-    }
-
-    return license?.productId === 'xosan' ? (
-      <span>{license.id.slice(-4)}</span>
-    ) : (
-      <form className='form-inline'>
-        <SelectLicense onChange={this.onChangeLicense} productType='xosan' />
-        <ActionButton
-          btnStyle='primary'
-          className='ml-1'
-          disabled={licenseId === 'none'}
-          handler={this.unlockXosan}
-          handlerParam={licenseId}
-          icon='connect'
-        >
-          {_('bindLicense')}
-        </ActionButton>
-      </form>
-    )
-  }
-}
-
-const XOSAN_COLUMNS = [
-  {
-    name: _('xosanName'),
-    itemRenderer: sr => <Link to={`srs/${sr.id}`}>{renderXoItem(sr)}</Link>,
-    sortCriteria: 'name_label',
-  },
-  {
-    name: _('xosanPool'),
-    itemRenderer: sr => <Pool id={sr.$pool} link />,
-  },
-  {
-    name: _('license'),
-    component: XosanLicensesForm,
-  },
-]
-
-const XOSAN_INDIVIDUAL_ACTIONS = [
-  {
-    label: _('productSupport'),
-    icon: 'support',
-    handler: () => window.open('https://xen-orchestra.com'),
-  },
-]
-
-@connectStore(() => ({
-  xosanSrs: createGetObjectsOfType('SR').filter([
-    ({ SR_type }) => SR_type === 'xosan', // eslint-disable-line camelcase
-  ]),
-}))
-export default class Xosan extends Component {
-  _getLicensesByXosan = createSelector(
-    () => this.props.xosanLicenses,
-    licenses => {
-      const licensesByXosan = {}
-      forEach(licenses, license => {
-        let xosanId
-        if ((xosanId = license.boundObjectId) === undefined) {
-          return
-        }
-        licensesByXosan[xosanId] =
-          licensesByXosan[xosanId] !== undefined
-            ? null // XOSAN bound to multiple licenses!
-            : license
-      })
-
-      return licensesByXosan
-    }
-  )
-
-  _getKnownXosans = createSelector(
-    createSelector(
-      () => this.props.xosanLicenses,
-      (licenses = []) => filter(map(licenses, 'boundObjectId'))
-    ),
-    () => this.props.xosanSrs,
-    (knownXosanIds, xosanSrs) => filter(xosanSrs, ({ id }) => includes(knownXosanIds, id))
-  )
-
-  render() {
-    return (
-      <SortedTable
-        collection={this._getKnownXosans()}
-        columns={XOSAN_COLUMNS}
-        individualActions={XOSAN_INDIVIDUAL_ACTIONS}
-        stateUrlParam='s_xosan'
-        userData={{
-          licensesByXosan: this._getLicensesByXosan(),
-          xosanSrs: this.props.xosanSrs,
-          updateLicenses: this.props.updateLicenses,
-        }}
-      />
-    )
-  }
-}
diff --git a/packages/xo-web/src/xo-app/xoa/licenses/xostor.js b/packages/xo-web/src/xo-app/xoa/licenses/xostor.js
new file mode 100644
index 00000000000..1d4e461960a
--- /dev/null
+++ b/packages/xo-web/src/xo-app/xoa/licenses/xostor.js
@@ -0,0 +1,108 @@
+import _ from 'intl'
+import ActionButton from 'action-button'
+import Component from 'base-component'
+import decorate from 'apply-decorators'
+import Icon from 'icon'
+import React from 'react'
+import SelectLicense from 'select-license'
+import SortedTable from 'sorted-table'
+import Tooltip from 'tooltip'
+import { bindLicense } from 'xo'
+import { connectStore } from 'utils'
+import { createGetObjectsOfType } from 'selectors'
+import { groupBy } from 'lodash'
+import { injectState, provideState } from 'reaclette'
+import { Pool, Sr } from 'render-xo-item'
+
+class XostorLicensesForm extends Component {
+  state = {
+    licenseId: 'none',
+  }
+
+  onChangeLicense = event => {
+    this.setState({ licenseId: event.target.value })
+  }
+
+  bind = () => {
+    const { item, userData } = this.props
+    return bindLicense(this.state.licenseId, item.uuid).then(userData.updateLicenses)
+  }
+
+  render() {
+    const { item, userData } = this.props
+    const { licenseId } = this.state
+    const licenses = userData.licensesByXostorUuid[item.id]
+
+    // Xostor bound to multiple licenses
+    if (licenses?.length > 1) {
+      return (
+        <div>
+          <span>{licenses.map(license => license.id.slice(-4)).join(',')}</span>{' '}
+          <Tooltip content={_('xostorMultipleLicenses')}>
+            <Icon color='text-danger' icon='alarm' />
+          </Tooltip>
+        </div>
+      )
+    }
+
+    const license = licenses?.[0]
+    return license !== undefined ? (
+      <span>{license.id.slice(-4)}</span>
+    ) : (
+      <form className='form-inline'>
+        <SelectLicense onChange={this.onChangeLicense} productType='xostor' />
+        <ActionButton
+          btnStyle='primary'
+          className='ml-1'
+          disabled={licenseId === 'none'}
+          handler={this.bind}
+          handlerParam={licenseId}
+          icon='connect'
+        >
+          {_('bindLicense')}
+        </ActionButton>
+      </form>
+    )
+  }
+}
+
+const INDIVIDUAL_ACTIONS = [
+  {
+    label: _('productSupport'),
+    icon: 'support',
+    handler: () => window.open('https://xen-orchestra.com'),
+  },
+]
+
+const COLUMNS = [
+  {
+    default: true,
+    name: _('name'),
+    itemRenderer: sr => <Sr id={sr.id} link container={false} />,
+    sortCriteria: 'name_label',
+  },
+  { name: _('pool'), itemRenderer: sr => <Pool id={sr.$pool} link /> },
+  { name: _('license'), component: XostorLicensesForm },
+]
+const Xostor = decorate([
+  connectStore(() => ({
+    xostorSrs: createGetObjectsOfType('SR').filter([({ SR_type }) => SR_type === 'linstor']),
+  })),
+  provideState({
+    computed: {
+      licensesByXostorUuid: (state, { xostorLicenses }) => groupBy(xostorLicenses, 'boundObjectId'),
+    },
+  }),
+  injectState,
+  ({ state, xostorSrs, updateLicenses }) => (
+    <SortedTable
+      collection={xostorSrs}
+      columns={COLUMNS}
+      data-updateLicenses={updateLicenses}
+      data-licensesByXostorUuid={state.licensesByXostorUuid}
+      individualActions={INDIVIDUAL_ACTIONS}
+    />
+  ),
+])
+
+export default Xostor

From 1213d3bd54372562d222c97d7b8ada587e139f89 Mon Sep 17 00:00:00 2001
From: mathieuRA <contact@mathieu-raisin.fr>
Date: Fri, 20 Oct 2023 17:15:11 +0200
Subject: [PATCH 2/4] remove unused space

---
 packages/xo-web/src/common/intl/messages.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
index 09f4aa63be1..f1dab1ef3c2 100644
--- a/packages/xo-web/src/common/intl/messages.js
+++ b/packages/xo-web/src/common/intl/messages.js
@@ -2500,7 +2500,6 @@ const messages = {
   storage: 'Storage',
   summary: 'Summary',
   wrongNumberOfHosts: 'Wrong number of hosts',
-
   xostor: 'XOSTOR',
   xostorDiskRequired: 'At least one disk is required',
   xostorDisksDropdownLabel: '({nDisks, number} disk{nDisks, plural, one {} other {s}}) {hostname}',

From f31a774e483fc5c1649b87cd08f2fa1ffac50bb5 Mon Sep 17 00:00:00 2001
From: Mathieu <70369997+MathieuRA@users.noreply.github.com>
Date: Mon, 23 Oct 2023 10:20:52 +0200
Subject: [PATCH 3/4] Update packages/xo-web/src/xo-app/xoa/licenses/index.js

---
 packages/xo-web/src/xo-app/xoa/licenses/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xo-web/src/xo-app/xoa/licenses/index.js b/packages/xo-web/src/xo-app/xoa/licenses/index.js
index 4eaa0b4c197..738ac21dbeb 100644
--- a/packages/xo-web/src/xo-app/xoa/licenses/index.js
+++ b/packages/xo-web/src/xo-app/xoa/licenses/index.js
@@ -396,7 +396,7 @@ export default class Licenses extends Component {
         </Row>
         <Row>
           <Col>
-            <h2>XOSTOR</h2>
+            <h2>{_('xostor')}</h2>
             <Xostor xostorLicenses={this.state.licenses.xostor} updateLicenses={this._updateLicenses} />
           </Col>
         </Row>

From 5d8180c9ba00809337fa7f0331e8b6f13130df84 Mon Sep 17 00:00:00 2001
From: mathieuRA <contact@mathieu-raisin.fr>
Date: Mon, 23 Oct 2023 15:26:16 +0200
Subject: [PATCH 4/4] Pierre's feedback

---
 packages/xo-web/src/common/intl/messages.js       | 2 +-
 packages/xo-web/src/common/select-license.js      | 8 ++++++++
 packages/xo-web/src/xo-app/xoa/licenses/xostor.js | 6 +-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
index f1dab1ef3c2..0324da60334 100644
--- a/packages/xo-web/src/common/intl/messages.js
+++ b/packages/xo-web/src/common/intl/messages.js
@@ -2505,7 +2505,7 @@ const messages = {
   xostorDisksDropdownLabel: '({nDisks, number} disk{nDisks, plural, one {} other {s}}) {hostname}',
   xostorFailedVgAlreadyExists:
     "Formatting disks failed because a VG group named 'linstor_group' already exists on the hosts. Do you want to delete these VG groups?",
-  xostorMultipleLicenses: 'This proxy has more than 1 license!',
+  xostorMultipleLicenses: 'This XOSTOR has more than 1 license!',
   xostorPackagesWillBeInstalled: '"xcp-ng-release-linstor" and "xcp-ng-linstor" will be installed on each host',
   xostorReplicationWarning: 'If a disk dies, you will lose data',
 
diff --git a/packages/xo-web/src/common/select-license.js b/packages/xo-web/src/common/select-license.js
index f8d49ad1e17..a149e28d127 100644
--- a/packages/xo-web/src/common/select-license.js
+++ b/packages/xo-web/src/common/select-license.js
@@ -9,6 +9,14 @@ import map from 'lodash/map.js'
 import { renderXoItemFromId } from './render-xo-item'
 
 const LicenseOptions = ({ license, formatDate }) => {
+  /**
+   * license.productId can be:
+   * - xcpng-enterprise
+   * - xcpng-standard
+   * - xo-proxy
+   * - xostor
+   * - xostor.trial
+   */
   const productId = license.productId.startsWith('xostor') ? license.productId : license.productId.split('-')[1]
   return (
     <option value={license.id}>
diff --git a/packages/xo-web/src/xo-app/xoa/licenses/xostor.js b/packages/xo-web/src/xo-app/xoa/licenses/xostor.js
index 1d4e461960a..d403e907a52 100644
--- a/packages/xo-web/src/xo-app/xoa/licenses/xostor.js
+++ b/packages/xo-web/src/xo-app/xoa/licenses/xostor.js
@@ -19,10 +19,6 @@ class XostorLicensesForm extends Component {
     licenseId: 'none',
   }
 
-  onChangeLicense = event => {
-    this.setState({ licenseId: event.target.value })
-  }
-
   bind = () => {
     const { item, userData } = this.props
     return bindLicense(this.state.licenseId, item.uuid).then(userData.updateLicenses)
@@ -50,7 +46,7 @@ class XostorLicensesForm extends Component {
       <span>{license.id.slice(-4)}</span>
     ) : (
       <form className='form-inline'>
-        <SelectLicense onChange={this.onChangeLicense} productType='xostor' />
+        <SelectLicense onChange={this.linkState('licenseId')} productType='xostor' />
         <ActionButton
           btnStyle='primary'
           className='ml-1'