32 refatoring structure

citrus-admin-client/src/main/resources/static/src/app/app-routing.module.ts

@@ -6,7 +6,6 @@ import { DashboardComponent }   from './components/dashboard.component';
 import { LogComponent }   from './components/log.component';
 import { ComingComponent }   from './components/coming.component';
 import { ProjectSettingsComponent }   from './components/project.settings.component';
-import { ConfigurationComponent }   from './components/configuration.component';
 import { TestsComponent }   from './components/tests.component';
 import { TestReportComponent } from "./components/test.report.component";
 import {SetupComponent} from "./components/setup.component";
@@ -16,8 +15,6 @@ const routes: Routes = [
     { path: 'project', component: DashboardComponent },
     { path: 'project/settings', component: ProjectSettingsComponent},
     { path: 'project/settings/:activeTab', component: ProjectSettingsComponent},
-    { path: 'configuration', component: ConfigurationComponent},
-    { path: 'configuration/:activeTab', component: ConfigurationComponent},
     { path: 'tests', component: TestsComponent},
     { path: 'tests/:name', component: TestsComponent},
     { path: 'report', component: TestReportComponent},

citrus-admin-client/src/main/resources/static/src/app/app.module.ts

@@ -9,15 +9,6 @@ import { HeaderComponent } from './components/header.component';
 import { LogComponent } from './components/log.component';
 import { ComingComponent } from './components/coming.component';
 
-import { ConfigurationComponent } from './components/configuration.component';
-import { DataDictionaryComponent } from './components/config/data.dictionary.component';
-import { EndpointsComponent } from './components/config/endpoints.component';
-import { FunctionLibraryComponent } from './components/config/function.library.component';
-import { GlobalVariablesComponent } from './components/config/global.variables.component';
-import { NamespaceContextComponent } from './components/config/namespace.context.component';
-import { SchemaRepositoryComponent } from './components/config/schema.repository.component';
-import { ValidationMatcherComponent } from './components/config/validation.matcher.component';
-
 import { SourceCodeComponent } from './components/source.code.component';
 import { TestDetailComponent } from './components/test.detail.component';
 import { TestExecuteComponent } from './components/test.execute.component';
@@ -32,11 +23,6 @@ import { TestDesignerComponent } from './components/design/test.designer.compone
 import { TestTransitionComponent } from './components/design/test.transition.component';
 
 import { ProjectSettingsComponent } from './components/project.settings.component';
-import { AutoComplete } from './components/util/autocomplete';
-import { Dialog } from './components/util/dialog';
-import { Pills, Pill } from './components/util/pills';
-import { SidebarMenu, MenuItem } from './components/util/sidebar';
-import { Tabs, Tab } from './components/util/tabs';
 import { AlertConsole } from './components/alert.console';
 import { AlertDialog } from './components/alert.dialog';
 import { TruncatePipe } from "./util/truncate.pipe";
@@ -50,28 +36,24 @@ import { TestService } from "./service/test.service";
 import {ProjectSetupService} from "./service/project.setup.service";
 import {FileSelectComponent} from "./components/file-select/file-select.component";
 import {SetupComponent} from "./components/setup.component";
+import {ConfigurationModule} from "./components/configuration/configuration.module";
+import {UtilModule} from "./components/util/util.module";
 
 @NgModule({
     imports: [
         BrowserModule,
         HttpModule,
         FormsModule,
-        AppRoutingModule
+        AppRoutingModule,
+        ConfigurationModule,
+        UtilModule
     ],
     declarations: [
         AppComponent,
         DashboardComponent,
         HeaderComponent,
         LogComponent,
         ComingComponent,
-        ConfigurationComponent,
-        DataDictionaryComponent,
-        EndpointsComponent,
-        FunctionLibraryComponent,
-        GlobalVariablesComponent,
-        NamespaceContextComponent,
-        SchemaRepositoryComponent,
-        ValidationMatcherComponent,
         SourceCodeComponent,
         TestDetailComponent,
         TestExecuteComponent,
@@ -85,14 +67,6 @@ import {SetupComponent} from "./components/setup.component";
         TestDesignerComponent,
         TestTransitionComponent,
         ProjectSettingsComponent,
-        AutoComplete,
-        Dialog,
-        Pills,
-        Pill,
-        SidebarMenu,
-        MenuItem,
-        Tabs,
-        Tab,
         AlertConsole,
         AlertDialog,
         TruncatePipe,

citrus-admin-client/src/main/resources/static/src/app/components/config.html → citrus-admin-client/src/main/resources/static/src/app/components/configuration/config.html

@@ -7,6 +7,7 @@ <h1>
 </div>
 
 <div class="container">
+<!--
   <pills justified="true">
     <pill pill-id="endpoints" pill-title="Endpoints" [active]="isActive('endpoints')">
       <endpoints></endpoints>
@@ -30,6 +31,15 @@ <h1>
       <namespace-context></namespace-context>
     </pill>
   </pills>
-
+  -->
+  <div>
+    <ul class="nav nav-pills nav-justified">
+      <li *ngFor="let entry of menuEntries" [class.active]="isActive(entry.link[0])">
+        <a [routerLink]="entry.link">{{entry.name}}</a>
+      </li>
+    </ul>
+  </div>
+  <div [class.clearfix]="navigation && pullRight"></div>
+  <router-outlet></router-outlet>
   <div class="alert-console" type="detailed"></div>
 </div>

citrus-admin-client/src/main/resources/static/src/app/components/configuration/configuration-routing.module.ts

@@ -0,0 +1,36 @@
+import {NgModule} from "@angular/core";
+import {RouterModule, Routes} from "@angular/router";
+import {ConfigurationComponent} from "./configuration.component";
+import {EndpointsComponent} from "./endpoints/endpoints.component";
+import {SchemaRepositoryComponent} from "./schema-repository/schema.repository.component";
+import {FunctionLibraryComponent} from "./function-library/function.library.component";
+import {ValidationMatcherComponent} from "./validation-matcher/validation.matcher.component";
+import {DataDictionaryComponent} from "./data-dictionary/data.dictionary.component";
+import {NamespaceContextComponent} from "./namespace-context/namespace.context.component";
+import {GlobalVariablesComponent} from "./global-variables/global.variables.component";
+
+const configurationRoutes:Routes = [
+    {
+        path: 'configuration',
+        component: ConfigurationComponent,
+        children: [
+            { path: 'endpoints', component: EndpointsComponent},
+            { path: 'schema-definition', component: SchemaRepositoryComponent},
+            { path: 'functions', component: FunctionLibraryComponent},
+            { path: 'validation-matcher', component: ValidationMatcherComponent},
+            { path: 'data-dictionaries', component: DataDictionaryComponent},
+            { path: 'namespaces', component: NamespaceContextComponent},
+            { path: 'global-variables', component: GlobalVariablesComponent}
+        ]
+    },
+]
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(configurationRoutes)
+    ],
+    exports: [
+        RouterModule
+    ]
+})
+export class ConfigurationRoutingModule {}

citrus-admin-client/src/main/resources/static/src/app/components/configuration/configuration.component.ts

@@ -0,0 +1,36 @@
+import {Component, OnInit} from '@angular/core';
+import {ActivatedRoute, Router, NavigationEnd, NavigationStart} from '@angular/router';
+
+const MenuEntry = (name:string, link:string[]) => ({name, link});
+
+@Component({
+    templateUrl: 'config.html'
+})
+export class ConfigurationComponent {
+
+    menuEntries = [
+        MenuEntry('Endpoints', ['endpoints']),
+        MenuEntry('Schema Definitions', ['schema-definition']),
+        MenuEntry('Global Variables', ['global-variables']),
+        MenuEntry('Functions', ['functions']),
+        MenuEntry('Validation Matcher', ['validation-matcher']),
+        MenuEntry('Data dictionaries', ['data-dictionaries']),
+        MenuEntry('Namespaces', ['namespaces'])
+    ]
+
+    constructor(private route: ActivatedRoute,
+        private router:Router
+    ) {
+        router.navigate(['configuration/endpoints'])
+        router.events
+            .filter(e => e instanceof NavigationStart)
+            .filter((e:NavigationStart) => e.url === '/configuration')
+            .subscribe(e => {
+                router.navigate(['configuration/endpoints'])
+            })
+    }
+
+    isActive(name: string) {
+        return this.router.isActive('configuration/' +name, false);
+    }
+}

citrus-admin-client/src/main/resources/static/src/app/components/configuration/configuration.module.ts

@@ -0,0 +1,40 @@
+import {NgModule} from "@angular/core";
+import {ConfigurationComponent} from "./configuration.component";
+import {DataDictionaryComponent} from "./data-dictionary/data.dictionary.component";
+import {EndpointsComponent} from "./endpoints/endpoints.component";
+import {FunctionLibraryComponent} from "./function-library/function.library.component";
+import {GlobalVariablesComponent} from "./global-variables/global.variables.component";
+import {NamespaceContextComponent} from "./namespace-context/namespace.context.component";
+import {SchemaRepositoryComponent} from "./schema-repository/schema.repository.component";
+import {ValidationMatcherComponent} from "./validation-matcher/validation.matcher.component";
+import {UtilModule} from "../util/util.module";
+import {ConfigurationRoutingModule} from "./configuration-routing.module";
+import {FormsModule} from "@angular/forms";
+import {CommonModule} from "@angular/common";
+
+
+
+@NgModule({
+    imports: [
+        UtilModule,
+        FormsModule,
+        CommonModule,
+        ConfigurationRoutingModule
+    ],
+    declarations: [
+        ConfigurationComponent,
+        DataDictionaryComponent,
+        EndpointsComponent,
+        FunctionLibraryComponent,
+        GlobalVariablesComponent,
+        NamespaceContextComponent,
+        SchemaRepositoryComponent,
+        ValidationMatcherComponent
+    ],
+    exports: [
+        ConfigurationComponent
+    ]
+})
+export class ConfigurationModule {
+
+}

citrus-admin-client/src/main/resources/static/src/app/components/config/data.dictionary.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/data-dictionary/data.dictionary.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ConfigService} from '../../service/config.service';
-import {DataDictionary, Mapping} from "../../model/data.dictionary";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {ConfigService} from '../../../service/config.service';
+import {DataDictionary, Mapping} from "../../../model/data.dictionary";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 @Component({
     selector: 'data-dictionary',

citrus-admin-client/src/main/resources/static/src/app/components/config/endpoints.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/endpoints/endpoints.component.ts

@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
-import {EndpointService} from '../../service/endpoint.service';
-import {SpringBeanService} from "../../service/springbean.service";
-import {Endpoint} from "../../model/endpoint";
-import {Property} from "../../model/property";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {EndpointService} from '../../../service/endpoint.service';
+import {SpringBeanService} from "../../../service/springbean.service";
+import {Endpoint} from "../../../model/endpoint";
+import {Property} from "../../../model/property";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 declare var jQuery:any;
 

citrus-admin-client/src/main/resources/static/src/app/components/config/function.library.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/function-library/function.library.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ConfigService} from '../../service/config.service';
-import {FunctionLibrary, Function} from "../../model/function.library";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {ConfigService} from '../../../service/config.service';
+import {FunctionLibrary, Function} from "../../../model/function.library";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 @Component({
     selector: 'function-library',

citrus-admin-client/src/main/resources/static/src/app/components/config/global.variables.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/global-variables/global.variables.component.ts

@@ -1,9 +1,9 @@
 import {Component, OnInit} from '@angular/core';
-import {ConfigService} from '../../service/config.service';
-import {Variable} from "../../model/variable";
-import {GlobalVariables} from "../../model/global.variables";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {ConfigService} from '../../../service/config.service';
+import {Variable} from "../../../model/variable";
+import {GlobalVariables} from "../../../model/global.variables";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 @Component({
     selector: 'global-variables',

citrus-admin-client/src/main/resources/static/src/app/components/config/namespace.context.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/namespace-context/namespace.context.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ConfigService} from '../../service/config.service';
-import {NamespaceContext, Namespace} from "../../model/namespace.context";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {ConfigService} from '../../../service/config.service';
+import {NamespaceContext, Namespace} from "../../../model/namespace.context";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 @Component({
     selector: 'namespace-context',

citrus-admin-client/src/main/resources/static/src/app/components/config/schema.repository.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/schema-repository/schema.repository.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ConfigService} from '../../service/config.service';
-import {SchemaRepository, Schema, SchemaReference} from "../../model/schema.repository";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {ConfigService} from '../../../service/config.service';
+import {SchemaRepository, Schema, SchemaReference} from "../../../model/schema.repository";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 @Component({
     selector: 'schema-repository',

citrus-admin-client/src/main/resources/static/src/app/components/config/validation.matcher.component.ts → citrus-admin-client/src/main/resources/static/src/app/components/configuration/validation-matcher/validation.matcher.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ConfigService} from '../../service/config.service';
-import {ValidationMatcherLibrary, ValidationMatcher} from "../../model/validation.matcher.library";
-import {Alert} from "../../model/alert";
-import {AlertService} from "../../service/alert.service";
+import {ConfigService} from '../../../service/config.service';
+import {ValidationMatcherLibrary, ValidationMatcher} from "../../../model/validation.matcher.library";
+import {Alert} from "../../../model/alert";
+import {AlertService} from "../../../service/alert.service";
 
 @Component({
     selector: 'validation-matcher',

citrus-admin-client/src/main/resources/static/src/app/components/tests.component.ts

@@ -1,6 +1,6 @@
 import {Component, OnInit, HostListener} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
-import {Tab} from "./util/tabs";
+import {TabComponent} from "./util/tabs";
 import {TestGroup, Test} from "../model/tests";
 import {TestService} from "../service/test.service";
 import {Alert} from "../model/alert";
@@ -54,7 +54,7 @@ export class TestsComponent implements OnInit {
                 error => this.notifyError(<any>error));
     }
 
-    onTabClosed(tab: Tab) {
+    onTabClosed(tab: TabComponent) {
         var test = this.openTests.find(test => test.name === tab.id);
         if (test) {
             this.openTests.splice(this.openTests.indexOf(test), 1);
@@ -65,7 +65,7 @@ export class TestsComponent implements OnInit {
         }
     }
 
-    onTabSelected(tab: Tab) {
+    onTabSelected(tab: TabComponent) {
         var test = this.openTests.find(test => test.name === tab.id);
         if (test) {
             this.activeTest = test;

citrus-admin-client/src/main/resources/static/src/app/components/util/autocomplete.ts

@@ -16,7 +16,7 @@ import { Component, Input, Output, EventEmitter, ElementRef } from '@angular/cor
     </li>
 </ul>`
 })
-export class AutoComplete {
+export class AutoCompleteComponent {
     @Output() selected = new EventEmitter(true);
 
     @Input() id: string;