Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
587 changes: 0 additions & 587 deletions Tryouts/Plugins/ApplicationPlugins/chart/package-lock.json

This file was deleted.

4 changes: 2 additions & 2 deletions Tryouts/Plugins/ApplicationPlugins/chart/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@morgan-stanley/compose-example-chart",
"name": "@morgan-stanley/composeui-example-chart",
"version": "0.1.0",
"description": "Example Web Application",
"main": "chat.js",
Expand All @@ -8,7 +8,7 @@
"clean": "rimraf dist",
"bundle": "rollup -c",
"build": "npm run clean && npm run bundle",
"serve": "http-server"
"start": "http-server"
},
"dependencies": {
"@morgan-stanley/compose-messaging-client": "*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@morgan-stanley/compose-process-explorer-frontend",
"name": "@morgan-stanley/composeui-process-explorer-frontend",
"version": "0.1.0",

"scripts": {
Expand All @@ -21,7 +21,6 @@
"@angular/router": "^15.1.0",
"core-js": "^3.6.5",
"hammerjs": "^2.0.8",

"igniteui-angular": "^15.0.9",
"igniteui-angular-charts": "^15.0.0",
"igniteui-angular-core": "^15.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { UncaughtErrorComponent } from './error-routing/error/uncaught-error.com
import { ErrorRoutingModule } from './error-routing/error-routing.module';

export const routes: Routes = [
{ path: '', redirectTo: 'master-view/processes', pathMatch: 'full' },
{ path: '', redirectTo: 'main-view/processes', pathMatch: 'full' },
{ path: 'error', component: UncaughtErrorComponent },
{ path: 'master-view', loadChildren: () => import('./master-view/master-view.module').then(m => m.MasterViewModule) },
{ path: 'main-view', loadChildren: () => import('./main-view/main-view.module').then(m => m.MainViewModule) },
{ path: '**', component: PageNotFoundComponent } // must always be last
];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Morgan Stanley makes this available to you under the Apache License, Version 2.0 (the "License"). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. See the NOTICE file distributed with this work for additional information regarding copyright ownership. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { MasterViewComponent } from './master-view.component';
import { MainViewComponent } from './main-view.component';
import { ConnectionsComponent } from './connections/connections.component';
import { ProcessesComponent } from './processes/processes.component';
//import { MemoryChartComponent } from './memory-chart/memory-chart.component';
Expand All @@ -10,7 +10,7 @@ import { SubsystemComponent } from './subsystems/subsystem.component';
const routes: Routes = [
{
path: '',
component: MasterViewComponent,
component: MainViewComponent,
children: [
{
path: '',
Expand Down Expand Up @@ -38,5 +38,5 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class MasterViewRoutingModule {
export class MainViewRoutingModule {
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<span [isHeader]="true" igxDrawerItem>
<span class="navigation-drawer_1">Views in this app</span>
</span>
<span [isHeader]="false" igxDrawerItem routerLink="/master-view/processes">
<span [isHeader]="false" igxDrawerItem routerLink="/main-view/processes">
<igx-icon font="material" [active]="true">home</igx-icon>
<span class="navigation-drawer_1">Processes</span>
</span>
<span [isHeader]="false" igxDrawerItem routerLink="/master-view/connections">
<span [isHeader]="false" igxDrawerItem routerLink="/main-view/connections">
<igx-icon font="material" [active]="true">dns</igx-icon>
<span class="navigation-drawer_1">Connections</span>
</span>
<span [isHeader]="false" igxDrawerItem routerLink="/master-view/subsystems">
<span [isHeader]="false" igxDrawerItem routerLink="/main-view/subsystems">
<igx-icon font="material" [active]="true">dns</igx-icon>
<span class="navigation-drawer_1">Subsystems</span>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';

import { IgxNavbarModule, IgxButtonModule, IgxToggleModule, IgxIconModule, IgxNavigationDrawerModule, IgxListModule } from 'igniteui-angular';
import { MasterViewComponent } from './master-view.component';
import { MainViewComponent } from './main-view.component';

describe('MasterViewComponent', () => {
let component: MasterViewComponent;
let fixture: ComponentFixture<MasterViewComponent>;
describe('MainViewComponent', () => {
let component: MainViewComponent;
let fixture: ComponentFixture<MainViewComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ MasterViewComponent ],
declarations: [ MainViewComponent ],
imports: [ NoopAnimationsModule, FormsModule, RouterTestingModule, IgxNavbarModule, IgxButtonModule, IgxToggleModule, IgxIconModule, IgxNavigationDrawerModule, IgxListModule ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(MasterViewComponent);
fixture = TestBed.createComponent(MainViewComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-master-view',
templateUrl: './master-view.component.html',
styleUrls: ['./master-view.component.scss']
selector: 'app-main-view',
templateUrl: './main-view.component.html',
styleUrls: ['./main-view.component.scss']
})
export class MasterViewComponent {
export class MainViewComponent {
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';

import { MasterViewRoutingModule } from './master-view-routing.module';
import { MasterViewComponent } from './master-view.component';
import { MainViewRoutingModule } from './main-view-routing.module';
import { MainViewComponent } from './main-view.component';
import { ConnectionsComponent } from './connections/connections.component';
import {
IgxListModule, IgxAvatarModule, IgxIconModule, IgxGridModule, IgxActionStripModule, IgxButtonModule,
Expand All @@ -16,14 +16,14 @@ import { SubsystemComponent } from './subsystems/subsystem.component';

@NgModule({
declarations: [
MasterViewComponent,
MainViewComponent,
ConnectionsComponent,
ProcessesComponent,
SubsystemComponent
],
imports: [
CommonModule,
MasterViewRoutingModule,
MainViewRoutingModule,
IgxListModule,
IgxAvatarModule,
IgxIconModule,
Expand All @@ -41,5 +41,5 @@ import { SubsystemComponent } from './subsystems/subsystem.component';
IgxTreeGridModule
]
})
export class MasterViewModule {
export class MainViewModule {
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Morgan Stanley makes this available to you under the Apache License, Version 2.0 (the "License"). You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. See the NOTICE file distributed with this work for additional information regarding copyright ownership. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -->
<div class="column-layout column">
<button igxButton="icon" type="icon" [disabled]="false" routerLink="/master-view/memory-chart">
<button igxButton="icon" type="icon" [disabled]="false" routerLink="/main-view/memory-chart">
<igx-icon>open_in_new</igx-icon>
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
import { SuperRPC } from 'super-rpc';
import { IProcessInfoAggregator } from '../DTOs/IProcessInfoAggregator';
import { ProcessInfo } from '../DTOs/ProcessInfo';
import { ServiceProcessObject } from '../master-view/processes/ServiceProcessObject';
import { ServiceProcessObject } from '../main-view/processes/ServiceProcessObject';

@Injectable({
providedIn: 'root'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { SuperRPC } from 'super-rpc';
import { ISubsystemController } from '../DTOs/ISubsystemController';
import { SubsystemInfo } from '../DTOs/SubsystemInfo';
import { SubsystemServiceObject } from '../master-view/subsystems/ServiceSubsystemObject';
import { SubsystemServiceObject } from '../main-view/subsystems/ServiceSubsystemObject';

@Injectable({
providedIn: 'root'
Expand Down
Loading