Merge pull request #104 from pengz1/Update-framework-changes

Update framework changes

Author: pengz1

config/build-utils.js

@@ -5,7 +5,7 @@ const helpers = require('./helpers');
 
 const DEFAULT_METADATA = {
   title: 'RackHD Web UI 2.0',
-  baseUrl: '/',
+  baseUrl: './',
   isDevServer: helpers.isWebpackDevServer(),
   HMR: helpers.hasProcessFlag('hot'),
   AOT: process.env.BUILD_AOT || helpers.hasNpmFlag('aot'),

config/webpack.dev.js

@@ -46,7 +46,7 @@ module.exports = function (options) {
        *
        * See: http://webpack.github.io/docs/configuration.html#output-path
        */
-      publicPath: './',
+      // publicPath: './',
       path: helpers.root('dist'),
 
       /**

config/webpack.prod.js

@@ -73,7 +73,7 @@ module.exports = function (env) {
        *
        * See: http://webpack.github.io/docs/configuration.html#output-path
        */
-      publicPath: './',
+      // publicPath: './',
       path: helpers.root('dist'),
 
       /**

src/app/app-routing.module.ts

@@ -10,7 +10,8 @@ import { ROUTES } from './app.routes';
 @NgModule({
   imports: [
     RouterModule.forRoot(ROUTES, {
-      useHash: Boolean(history.pushState) === false,
+      //If we don't want to use hash mode, we need to change RackHD
+      useHash: Boolean(history.pushState) === true,
       preloadingStrategy: PreloadAllModules
       // enableTracing: true
     })

src/app/app.routes.ts

@@ -8,28 +8,19 @@ import { NoContentComponent } from './no-content/no-content.component';
  * route after '' will be denied. Cause angular will regard all routes as '' children
  */
 export const ROUTES: Routes = [
-  /**
-   * @description Four first-level routings
-   * @date 2018-02-07 18:52:36
-   * @author xiaoyu.chu@emc.com
-   */
-  {path: '', redirectTo: 'ui/managementCenter', pathMatch: 'full'},
+  {path: '', redirectTo: '/managementCenter/nodes', pathMatch: 'full'},
   {
-    path: 'ui/managementCenter',
+    path: 'managementCenter',
     loadChildren: 'app/management-center/management-center.module#ManagementCenterModule',
   },
   {
-    path: 'ui/operationsCenter',
-    loadChildren: 'app/operations-center/operations-center.module#OperationsCenterModule',
+    path: 'workflowCenter',
+    loadChildren: 'app/workflow-center/workflow-center.module#WorkflowCenterModule',
   },
   {
-    path: 'ui/solutionCenter',
+    path: 'solutionCenter',
     loadChildren: 'app/solution-center/solution-center.module#SolutionCenterModule',
   },
-  {
-    path: 'ui/workflowEditor',
-    loadChildren: 'app/workflow-editor/workflow-editor.module#WorkflowEditorModule',
-  },
   // 404 page, page with ** can not be lazily loaded.
   {path: '**', component: NoContentComponent},
 ];

src/app/header/header.component.html

@@ -6,10 +6,9 @@
     </a>
   </div>
   <div class="header-nav">
-    <a routerLink="/ui/managementCenter" routerLinkActive="active" class="nav-link"><span class="nav-text">Management Center</span></a>
-    <a routerLink="/ui/operationsCenter" routerLinkActive="active" class=" nav-link"><span class="nav-text">Operations Center</span></a>
-    <a routerLink="/ui/workflowEditor" routerLinkActive="active" class=" nav-link"><span class="nav-text">Workflow Editor</span></a>
-    <a routerLink="/ui/solutionCenter" routerLinkActive="active" class="nav-link"><span class="nav-text">Solution Center</span></a>
+    <a routerLink="managementCenter" routerLinkActive="active" class="nav-link"><span class="nav-text">Management Center</span></a>
+    <a routerLink="workflowCenter" routerLinkActive="active" class=" nav-link"><span class="nav-text">Workflow Center</span></a>
+    <a routerLink="solutionCenter" routerLinkActive="active" class="nav-link"><span class="nav-text">Solution Center</span></a>
   </div>
   <div class="header-actions">
     <div class="active nav-link nav-icon" (click)="openSetting=true" style="cursor:pointer" >

src/app/management-center/workflows/workflows.component.ts

@@ -188,7 +188,7 @@ export class WorkflowsComponent implements OnInit {
 
   gotoCanvas(workflow){
     let graphName = workflow.injectableName;
-    let url = "/operationsCenter/workflowViewer?graphName=" + graphName;
+    let url = "/workflowCenter/workflowViewer?graphName=" + graphName;
     this.router.navigateByUrl(url);
   }