Merge pull request rockstor#2835 from phillxnet/2824-Un-special-case-…

…system-drive-btrfs-in-partition-treatment Un special-case system drive btrfs-in-partition treatment rockstor#2824
phillxnet · Apr 18, 2024 · d53f147 · d53f147
2 parents 6c6acb4 + a91499e
commit d53f147
Show file tree

Hide file tree

Showing 6 changed files with 544 additions and 670 deletions.
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/disk/disks_table.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/disk/disks_table.jst
@@ -29,7 +29,23 @@
                 Click to delete it from the system if it is not to be reattached." rel="tooltip"><i class="glyphicon glyphicon-trash"></i></a>
             {{/if}}
         {{else if (isRootDevice this.role)}}
-              <i class="glyphicon glyphicon-registration-mark" title="Rockstor System Drive." rel="tooltip"></i>
+            <i class="glyphicon glyphicon-registration-mark" title="Rockstor System Drive." rel="tooltip"></i>
+            {{#if this.parted}}
+                <i class="glyphicon glyphicon-tags" title="Btrfs in partition via auto Redirect Role." rel="tooltip"></i>
+                {{#if this.pool_name }}
+                    &nbsp;<i class="glyphicon glyphicon-map-marker" title="OS Drive partition (via auto Redirect Role) is mapped to a Pool" rel="tooltip"></i>
+                {{else}}
+                    &nbsp;<a href="#" class="btrfs_import" data-disk-id="{{this.id}}" title="Click to import System Pool (Advanced Users Only)" rel="tooltip">
+                    <i class="glyphicon glyphicon-circle-arrow-down"></i></a>
+                {{/if}}
+            {{else}}
+                {{#if this.pool_name }}
+                     &nbsp;<i class="glyphicon glyphicon-map-marker" title="OS Drive whole is mapped to a Pool" rel="tooltip"></i>
+                {{else}}
+                    &nbsp;<a href="#" class="btrfs_import" data-disk-id="{{this.id}}" title="Click to import Whole Disk System Pool (Advanced Users Only)" rel="tooltip">
+                    <i class="glyphicon glyphicon-circle-arrow-down"></i></a>
+                {{/if}}
+            {{/if}}
         {{else if (isLuksContainer this.role)}}
             {{#if this.parted}}
                 {{#if (isLuksContainerUnlocked this.role)}}

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/pools_table.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/pools_table.jst
@@ -155,13 +155,18 @@
   </tbody>
 </table>
 {{ else }}
-<h4>No Pools have been created</h4>
+  <h3>No Rockstor managed Pools (btrfs volumes) were found.</h3>
+
+  - A preexisting Pool can be imported via any one of its Disk members:
+  <a href="#disks" class="btn btn-primary"><i class="glyphicon glyphicon-edit "></i> Disks</a>
+  </p>
+
 {{/if}}
 <div>
-    <a {{#if disksAvailable}}
-            href="#add_pool"
+    {{#if disksAvailable}}
+         - <a href="#add_pool"
         {{else}}
-            disabled title="There are no Disks available to create a Pool at this time.
+         - No Disks available to: <a disabled
         {{/if}}
     id="add_pool" class="btn btn-primary"><i class="glyphicon glyphicon-edit"></i>&nbsp;Create Pool</a>
 </div>
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/share/shares_table.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/share/shares_table.jst
@@ -61,9 +61,19 @@
     </tbody>
   </table>
   <a href="#add_share" id="add_share" class="btn btn-primary"><i class="glyphicon glyphicon-edit "></i> Create Share</a>
-{{ else }}
+{{else if poolsNotEmpty}}
       <h4>No shares have been created</h4>
       <a href="#add_share" id="add_share" class="btn btn-primary"><i class="glyphicon glyphicon-edit "></i> Create Share</a>
+{{else}}
+       <h3>A Share (btrfs subvolume) is a portion of a Pool (btrfs volume).</h3>
+       <h4>No Rockstor managed Pools were found.</h4>
+
+       - A preexisting Pool can be imported via any one of its Disk members:
+       <a href="#disks" class="btn btn-primary"><i class="glyphicon glyphicon-edit "></i>&nbsp;Disks</a>
+       </p>
+       - Or a new Pool can be created:
+       <a href="#pools" class="btn btn-primary"><i class="glyphicon glyphicon-edit "></i>&nbsp;Pools</a>
+
 {{/if}}
 
 {{! Todo: maintain a common file and function for all modals? }}