[AMBARI-23006] upgrade admin

ambari-web/app/controllers/main/admin/serviceGroups_controller.js

@@ -18,12 +18,6 @@
 
 var App = require('app');
 
-const VersionType = {
-  HOTFIX: 'hotfix',
-  PATCH: 'patch',
-  RELEASE: 'release'
-}  
-
 App.MainAdminServiceGroupsController = Em.Controller.extend(App.LocalStorage, {
   name: 'mainAdminServiceGroupsController',
 
@@ -162,24 +156,98 @@ App.MainAdminServiceGroupsController = Em.Controller.extend(App.LocalStorage, {
     }
   ],
 
-  // /**
-  //  * data to load from local storage
-  //  */
-  // dbPropsToLoad: [ ],
-
-  // init: function () {
-  //   this.initDBProperties();
-  // },
+  // upgrade: null,
+  upgrade: {
+    id: "upgrade-1",
+    currentStep: "prerequisites", //can be "prerequisites", "install", or "upgrade"
+    //currentStep: "install", //can be "prerequisites", "install", or "upgrade"
+    //currentStep: "upgrade", //can be "prerequisites", "install", or "upgrade"
+    history: [
+      {
+        name: "Event 1",
+        user: "Jason",
+        date: new Date(2018,1,1)
+      },
+      {
+        name: "Event 2",
+        user: "Jason",
+        date: new Date(2018,2,1)
+      },
+      {
+        name: "Event 3",
+        user: "Jason",
+        date: new Date(2017,3,1)
+      },
+      {
+        name: "Event 4",
+        user: "Jason",
+        date: new Date(2017,4,1)
+      },
+      {
+        name: "Event 5",
+        user: "Jason",
+        date: new Date(2017,5,1)
+      }
+    ],
+    mpacks: [
+      {
+        name: "Hortonworks Data Platform Core",
+        currentVersion: "2.6",
+        newVersion: "2.7",
+        services: [
+          {
+            name: "HDFS",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          },
+          {
+            name: "Zookeeper",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          },
+          {
+            name: "Zookeeper Client",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          },
+          {
+            name: "MapReduce",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          }
+        ]
+      },
+      {
+        name: "Data Science and Machine Learning",
+        currentVersion: "2.1",
+        newVersion: "2.2",
+        services: [
+          {
+            name: "HDFS",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          },
+          {
+            name: "Zookeeper",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          },
+          {
+            name: "Zookeeper Client",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          },
+          {
+            name: "MapReduce",
+            currentVersion: "2.6",
+            newVersion: "3.0"
+          }
+        ]
+      }
+    ]
+  },
 
-  // /**
-  //  * restore data from localStorage
-  //  */
-  // initDBProperties: function () {
-  //   var props = this.getDBProperties(this.get('dbPropsToLoad'));
-  //   Em.keys(props).forEach(function (k) {
-  //     if (!Em.isNone(props[k])) {
-  //       this.set(k, props[k]);
-  //     }
-  //   }, this);
-  // },
+  createPlan: function () { },
+  editPlan: function () { },
+  discardPlan: function () {}
 });

ambari-web/app/messages.js

@@ -90,6 +90,7 @@ Em.I18n.translations = {
   'common.access':'Access',
   'common.action':'Action',
   'common.actions': 'Actions',
+  'common.activity': 'Activity',
   'common.add': 'Add',
   'common.additional': 'Additional',
   'common.advanced': 'Advanced',
@@ -129,6 +130,7 @@ Em.I18n.translations = {
   'common.custom': 'Custom',
   'common.dataNode':'DataNode',
   'common.dataSet': 'Data Set',
+  'common.date': 'Date',
   'common.days': "Days",
   'common.decommission':'Decommission',
   'common.default':'Default',
@@ -235,7 +237,8 @@ Em.I18n.translations = {
   'common.noHostsFound': 'No Hosts found.',
   'common.na': 'n/a',
   'common.name':'Name',
-  'common.next':'Next',
+  'common.new': 'New',
+  'common.next': 'Next',
   'common.noData': 'No Data',
   'common.noLink': 'No Links',
   'common.notAvailable': 'Not Available',
@@ -1977,16 +1980,16 @@ Em.I18n.translations = {
   'admin.serviceGroups.removeOldVersions': "Remove Old Versions",
   'admin.serviceGroups.startUpgradePlan.title': "Upgrade Process",
   'admin.serviceGroups.startUpgradePlan.description': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris.",
-  'admin.serviceGroups.startUpgradePlan.step1Title': "Upgrade Plan",
-  'admin.serviceGroups.startUpgradePlan.step1Description': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
-  'admin.serviceGroups.startUpgradePlan.step2Title': "Prerequisites",
-  'admin.serviceGroups.startUpgradePlan.step2Description': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
-  'admin.serviceGroups.startUpgradePlan.step3Title': "Install",
-  'admin.serviceGroups.startUpgradePlan.step3Description': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
-  'admin.serviceGroups.startUpgradePlan.step4Title': "Upgrade",
-  'admin.serviceGroups.startUpgradePlan.step4Description': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
+  'admin.serviceGroups.upgradePlan': "Upgrade Plan",
+  'admin.serviceGroups.startUpgradePlan.upgradePlanDescription': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
+  'admin.serviceGroups.startUpgradePlan.prerequisitesDescription': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
+  'admin.serviceGroups.startUpgradePlan.installDescription': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
+  'admin.serviceGroups.startUpgradePlan.upgradeDescription': "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.",
   'admin.serviceGroups.startUpgradePlan.buttonLabel': 'Create Upgrade Plan',
-
+  'admin.serviceGroups.upgradeStatus.button.prerequisites': 'Review Prerequisites',
+  'admin.serviceGroups.upgradeStatus.button.install': 'Install Products',
+  'admin.serviceGroups.upgradeStatus.button.upgrade': 'Perform Upgrade',
+
   'admin.stackUpgrade.downgrade.proceed': "Proceed with Downgrade",
   'admin.stackUpgrade.downgrade.body': "Are you sure you wish to abort the upgrade process and downgrade to <b>{0}</b>?",
   'admin.stackUpgrade.downgrade.retry.body': "Are you sure you wish to retry downgrade to <b>{0}</b>?",

ambari-web/app/styles/application.less

@@ -2573,6 +2573,7 @@ a.abort-icon:hover {
   border-radius: 12px;
   border: none;
   outline: none;
+  white-space: nowrap;
 
   &:hover {
     background-color: #ccc;
@@ -2699,6 +2700,15 @@ td .no-data {
   }
 }
 
+.doc-icon {
+  padding-left: 5px;
+  &:after {
+    content: '\f02d';
+    font-family: 'FontAwesome';
+    color: #666;
+  }
+}
+
 .tooltip {
   font-family: 'Roboto';
   font-size: 10px;
@@ -2912,54 +2922,144 @@ td .no-data {
     margin-right: auto;
     color: #999;
   }
+}
 
-  ol {
-    display: flex;
-    justify-content: space-around;
-    margin: 40px auto;
-    counter-reset: items;
-
-    li {
-      list-style-type: none;
-      width: 225px;
-      margin: 20px 15px;
-      margin-bottom: 0;
-      color: #999;
+.upgrade-steps {
+  display: flex;
+  justify-content: space-around;
+  margin: 40px auto;
+  counter-reset: items;
+
+  li {
+    list-style-type: none;
+    width: 225px;
+    margin: 20px 15px;
+    margin-bottom: 0;
+    color: #999;
+    text-align: center;
+    border-color: #999;
+
+    h4 {
+      color: inherit;
+    }
+
+    &:before {
+      display: block;
+      position: relative;
+      left: 50%;
+      transform: translateX(-50%);
+      bottom: 20px;
+      height: 30px;
+      width: 30px;
+      counter-increment: items;
+      content: counter(items);
+      border-color: inherit;
+      border-width: 1px;
+      border-style: solid;
+      border-radius: 100%;
+      font-size: 20px;
+      line-height: 28px;
+    }
+
+    &:not(:last-child):after {
+      width: ~"calc(100% + 1px)";
+      height: 1px;
+      background-color: #999;
+      content: "";
+      position: relative;
+      display: block;
+      bottom: 138px;
+      left: 123px;
+    }
+
+    &.active {
+      color: #3fae2a;
+      border-color: #3fae2a;
+
+      &:before {
+        color: #fff;
+        background-color: #3fae2a;
+      }
+    }
+
+    &.complete {
+      color: #3fae2a;
+      border-color: #3fae2a;
 
       h4 {
         color: #333;
       }
 
       &:before {
-        display: block;
-        position: relative;
-        left: 50%;
-        transform: translateX(-50%);
-        bottom: 20px;
-        height: 30px;
-        width: 30px;
-        counter-increment: items;
-        content: counter(items);
-        border: #999 1px solid;
-        border-radius: 100%;
-        font-size: 20px;
-        line-height: 28px;
+        color: inherit;
+        font-family: "Glyphicons Halflings";
+        content: "\e013";
+        font-size: 18px;
       }
 
-      &:not(:last-child):after {
-        width: ~"calc(100% + 1px)";
-        height: 1px;
-        background-color: #999;
-        content: "";
-        position: relative;
-        display: block;
-        bottom: 138px;
-        left: 123px;
+      &:after {
+        background-color: #3fae2a;
       }
     }
   }
 }
 
+#upgrade-status {
+  .upgrade-steps {
+    margin: 0 -45px;
+    padding: 0;
+
+    li {
+      margin: 0 15px;
+
+      h4 {
+        margin-bottom: 0;
+      }
+
+      &:before {
+        bottom: 0;
+      }
+
+      &:not(:last-child):after {
+        bottom: 44px;
+        left: 127px;
+      }
+    }  
+  }
+}
+
+#upgrade-status-header {
+  display: flex;
+  align-items: center;
+
+  button {
+    width: 200px;
+  }
+}
+
+#upgrade-status-body {
+  margin: 0 -15px;
+  display: flex;
+
+  > * {
+    //width: ~"calc(50% - 32px)";
+    margin: 0 15px;
+    //float: left;
+  }
+
+  #plan-history {
+    flex: 2 1 60%;
+  }
+
+  #plan-mpacks {
+    flex-grow: 1 1 40%;
+  }
+
+  table {
+    background: inherit;
+  }
+}
+
 .btn-lg {
   text-transform: uppercase;
   outline: none;

ambari-web/app/templates.js

@@ -22,6 +22,7 @@
 
 require('templates/main/service/info/summary/base');
 require('templates/common/progress');
+require('templates/common/mpackComparison');
 require('templates/main/alerts/alert_instance/status');
 require("templates/main/service/widgets/create/step2_number");
 require("templates/main/service/widgets/create/step2_template");