Add Instane Upgrade eligibility UI indicator

exoplatform · Dec 25, 2020 · be5a07a · be5a07a
1 parent 87c8ab9
commit be5a07a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/var/www/company.php b/var/www/company.php
@@ -58,6 +58,7 @@
         <td class="col-center"><?= componentStatusIcon($descriptor_array); ?></td>
         <td>
           <?= componentProductInfoIcon($descriptor_array) ?>&nbsp;
+          <?= componentUpgradeEligibility($descriptor_array); ?>
           <?= componentVisibilityIcon($descriptor_array, empty($descriptor_array->DEPLOYMENT_APACHE_VHOST_ALIAS) ? '' : 'green'); ?>&nbsp;
           <?= componentProductOpenLink($descriptor_array, "", true) ?>
           <span class="pull-right">

diff --git a/var/www/customers.php b/var/www/customers.php
@@ -46,7 +46,8 @@
             <td class="col-center"><?= componentStatusIcon($descriptor_array); ?></td>
             <td>
               <?= componentProductOpenLink($descriptor_array); ?>
-              <br/><?= componentAddonsTags($descriptor_array); ?>
+              <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+              <?= componentAddonsTags($descriptor_array); ?>
               <span class="pull-right">
               <?php 
                 if(isset($descriptor_array->DEPLOYMENT_BUILD_URL)) {

diff --git a/var/www/index.php b/var/www/index.php
@@ -125,7 +125,8 @@
             }
           ?>
         </span>
-        <br/><?= componentAddonsTags($descriptor_array); ?>
+        <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+        <?= componentAddonsTags($descriptor_array); ?>
         <br/><?= componentLabels($descriptor_array); ?>
       </td>
       <td class="col-left"><?= componentDownloadIcon($descriptor_array); ?>&nbsp;<?= componentProductVersion($descriptor_array); ?></td>

diff --git a/var/www/lib/functions-ui.php b/var/www/lib/functions-ui.php
@@ -218,6 +218,21 @@ function componentAddonsDistributionTags ($deployment_descriptor) {
   return $content;
 }
 
+/**
+ * Return the markup for instance upgrades eligiblity
+ *
+ * @param $deployment_descriptor
+ *
+ * @return string html markup
+ */
+function componentUpgradeEligibility($deployment_descriptor) {
+  if (property_exists($deployment_descriptor, 'INSTANCE_TOKEN') && $deployment_descriptor->INSTANCE_TOKEN) {
+    $content='<span class="label label-addon" rel="tooltip" data-original-title="This instance is eligible for upgrades."><i class="icon-flag"></i></span>';
+    return $content;
+  }
+  return '';
+}
+
 /**
  * Return the markup for the Deployment Status
  *

diff --git a/var/www/qa.php b/var/www/qa.php
@@ -61,7 +61,8 @@
                   <i class="icon-refresh"></i>
                 </a>
                 </span>
-                <br/><?= componentAddonsTags($descriptor_array); ?>
+                <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+                <?= componentAddonsTags($descriptor_array); ?>
             </td>
             <td class="col-center">
                 <?= componentDownloadIcon($descriptor_array); ?>&nbsp;
@@ -126,7 +127,8 @@
                   <i class="icon-refresh"></i>
                 </a>
                 </span>
-                <br/><?= componentAddonsTags($descriptor_array); ?>
+                <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+                <?= componentAddonsTags($descriptor_array); ?>
             </td>
             <td class="col-center">
                 <?= componentDownloadIcon($descriptor_array); ?>&nbsp;

diff --git a/var/www/sales.php b/var/www/sales.php
@@ -60,7 +60,8 @@
                 </a> - 
                 <?= componentEditNoteIcon($descriptor_array) ?>
               </span>
-              <br/><?= componentAddonsTags($descriptor_array); ?>
+              <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+              <?= componentAddonsTags($descriptor_array); ?>
             </td>
             <td class="col-center">
                 <?= componentProductInfoIcon($descriptor_array); ?>&nbsp;
@@ -121,7 +122,8 @@
             </a> - 
             <?= componentEditNoteIcon($descriptor_array) ?>
           </span>
-          <br/><?= componentAddonsTags($descriptor_array); ?>
+          <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+          <?= componentAddonsTags($descriptor_array); ?>
         </td>
         <td class="col-center">
           <?= componentProductInfoIcon($descriptor_array); ?>&nbsp;
@@ -169,7 +171,8 @@
           <span class="pull-right">
             <?= componentEditNoteIcon($descriptor_array) ?>
           </span>
-          <br/><?= componentAddonsTags($descriptor_array); ?>
+          <br/><?= componentUpgradeEligibility($descriptor_array); ?>
+          <?= componentAddonsTags($descriptor_array); ?>
         </td>
         <td class="col-center">
           <?= componentProductInfoIcon($descriptor_array); ?>&nbsp;