1. Change lognhorn ico file.

2. When the volume has been bound to PVC, the optation of create PVC is disabled. 3. Fix bug that backup does not load 4. Disable recovery when the latest backup field is empty Signed-off-by: Siye Wang <siye@rancher.com>
longhorn · May 2, 2020 · c4d5f19 · c4d5f19
1 parent 34cbbc3
commit c4d5f19
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/models/backup.js b/src/models/backup.js
@@ -41,9 +41,10 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(() => {
-        let search = history.location.search ? queryString.parse(history.location.search) : {}
-
-        if (history.location.state || search.state) {
+        let search = history.location && history.location.search ? queryString.parse(history.location.search) : {}
+        // This code may cause confusion. React router does not pass parameters when right-clicking on Link,
+        // resulting in no request for the page, so an Undefined judgment is added.
+        if (history.location && (search.state || history.location.state || typeof (history.location.state) === 'undefined')) {
           dispatch({
             type: 'query',
             payload: search,

diff --git a/src/models/engineimage.js b/src/models/engineimage.js
@@ -27,7 +27,7 @@ export default {
       payload,
     }, { call, put }) {
       const data = yield call(query, parse(payload))
-      if (payload && payload.field && payload.keyword) {
+      if (payload && payload.field && payload.keyword && data.data) {
         data.data = data.data.filter(item => item[payload.field] && item[payload.field].indexOf(payload.keyword.trim()) > -1)
       }
       if (data.data) {

diff --git a/src/models/volume.js b/src/models/volume.js
@@ -468,7 +468,7 @@ export default {
       return { ...state, createPVAndPVCSingleVisible: false, pvNameDisabled: false, previousChecked: false, createPVAndPVCModalSingleKey: Math.random() }
     },
     hideCreatePVAndPVCModal(state) {
-      return { ...state, createPVAndPVCVisible: false, previousChecked: false, createPVAndPVCModalKey: Math.random() }
+      return { ...state, createPVAndPVCVisible: false, nameSpaceDisabled: false, previousChecked: false, createPVAndPVCModalKey: Math.random() }
     },
     hideCreatePVCAllModal(state) {
       return { ...state, createPVCAllModalVisible: false, createPVCAllModalKey: Math.random() }

diff --git a/src/routes/backup/BackupBulkActions.js b/src/routes/backup/BackupBulkActions.js
@@ -17,7 +17,7 @@ function bulkActions({ selectedRows, restoreLatestBackup, showBulkCreateDisaster
   }
 
   const allActions = [
-    { key: 'restoreLatestBackup', name: 'Restore Latest Backup', disabled() { return selectedRows.length === 0 } },
+    { key: 'restoreLatestBackup', name: 'Restore Latest Backup', disabled() { return selectedRows.length === 0 || selectedRows.some(record => !record.lastBackupName) } },
     { key: 'bulkCreateDisasterRecoveryVolume', name: 'Create Disaster Recovery Volume', disabled() { return selectedRows.length === 0 || selectedRows.some(record => !record.lastBackupName) } },
   ]
 

diff --git a/src/routes/backup/BackupVolumeList.js b/src/routes/backup/BackupVolumeList.js
@@ -144,7 +144,7 @@ class List extends React.Component {
           return (
             <DropOption menuOptions={[
               { key: 'recovery', name: !record.lastBackupName ? 'No last backup' : 'Create Disaster Recovery Volume', disabled: !record.lastBackupName },
-              { key: 'restoreLatestBackup', name: 'Restore Latest Backup' },
+              { key: 'restoreLatestBackup', name: 'Restore Latest Backup', disabled: !record.lastBackupName },
               { key: 'deleteAll', name: 'Delete All Backups' },
             ]}
               onMenuClick={e => this.handleMenuClick(record, e)}

diff --git a/src/routes/volume/VolumeBulkActions.js b/src/routes/volume/VolumeBulkActions.js
@@ -60,6 +60,7 @@ function bulkActions({ selectedRows, engineImages, bulkDeleteVolume, showBulkEng
   const hasDoingState = (exclusions = []) => selectedRows.some(item => (item.state.endsWith('ing') && !exclusions.includes(item.state)) || item.currentImage !== item.engineImage)
   const isSnapshotDisabled = () => selectedRows.every(item => !item.actions || !item.actions.snapshotCreate)
   const isHasStandy = () => selectedRows.some(item => item.standby)
+  const isHasPVC = () => selectedRows.some(item => item.kubernetesStatus && item.kubernetesStatus.pvStatus && item.kubernetesStatus.pvStatus === 'Bound')
   // const isAttached = () => selectedRows.some(item => item.state === 'attached')
   const isRestoring = () => selectedRows.some((selected) => {
     if (selected.restoreStatus && selected.restoreStatus.length > 0) {
@@ -86,7 +87,7 @@ function bulkActions({ selectedRows, engineImages, bulkDeleteVolume, showBulkEng
     { key: 'upgrade', name: 'Upgrade Engine', disabled() { return selectedRows.length === 0 || !hasAction('engineUpgrade') || hasDoingState() || hasMoreOptions() || isRestoring() } },
     { key: 'expandVolume', name: 'Expand Volume', disabled() { return selectedRows.length === 0 || !hasAction('attach') } },
     { key: 'createSchedule', name: 'Update Schedule', disabled() { return selectedRows.length === 0 } },
-    { key: 'createPVAndPVC', name: 'Create PV/PVC', disabled() { return selectedRows.length === 0 || isHasStandy() || isRestoring() } },
+    { key: 'createPVAndPVC', name: 'Create PV/PVC', disabled() { return selectedRows.length === 0 || isHasStandy() || isRestoring() || isHasPVC() } },
     { key: 'bulkChangeVolume', name: 'Activate Disaster Recovery Volume', disabled() { return selectedRows.length === 0 || selectedRows.some((item) => !item.standby) } },
   ]