+
diff --git a/client/src/app/dashboard/instance-details/instance-details.component.spec.ts b/client/src/app/dashboard/instance-details/instance-details.component.spec.ts
index bd2d9b77..775e6aba 100644
--- a/client/src/app/dashboard/instance-details/instance-details.component.spec.ts
+++ b/client/src/app/dashboard/instance-details/instance-details.component.spec.ts
@@ -8,8 +8,8 @@ import { TableAllComponent } from '../table-all/table-all.component';
import { RouterTestingModule } from '@angular/router/testing';
import { ApiService } from 'src/app/api/api/api.service';
import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { InfoCenterDataSource } from '../info-center/info-center-datasource';
import { MatChipsModule } from '@angular/material/chips';
+import { JwtModule } from '@auth0/angular-jwt';
describe('InstanceDetailsComponent', () => {
let component: InstanceDetailsComponent;
@@ -18,7 +18,8 @@ describe('InstanceDetailsComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ InstanceDetailsComponent, InfoCenterComponent, TableAllComponent],
- imports: [BrowserAnimationsModule, MaterialModule, GraphViewModule, RouterTestingModule, HttpClientTestingModule, MatChipsModule],
+ imports: [BrowserAnimationsModule, MaterialModule, GraphViewModule, RouterTestingModule,
+ JwtModule.forRoot({}), HttpClientTestingModule, MatChipsModule],
providers: [ApiService]
})
.compileComponents();
diff --git a/client/src/app/dashboard/table-all/table-all.component.css b/client/src/app/dashboard/table-all/table-all.component.css
index 6d1b7fd7..3f4cd50c 100644
--- a/client/src/app/dashboard/table-all/table-all.component.css
+++ b/client/src/app/dashboard/table-all/table-all.component.css
@@ -86,4 +86,7 @@ tr.example-element-row:not(.example-expanded-row):active {
margin:30px;
}
+.fieldAlign{
+ width: 100%;
+}
diff --git a/client/src/app/dashboard/table-all/table-all.component.html b/client/src/app/dashboard/table-all/table-all.component.html
index 7edc17f2..d4e451b1 100644
--- a/client/src/app/dashboard/table-all/table-all.component.html
+++ b/client/src/app/dashboard/table-all/table-all.component.html
@@ -15,15 +15,26 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
There are currently no instances running.
@@ -55,8 +66,8 @@
Action
-
- Instance not hosted with docker.
+
+ Actions not available.
+
@@ -140,8 +152,4 @@
+
\ No newline at end of file
diff --git a/client/src/app/dashboard/table-all/table-all.component.spec.ts b/client/src/app/dashboard/table-all/table-all.component.spec.ts
index 766b6757..ae932609 100644
--- a/client/src/app/dashboard/table-all/table-all.component.spec.ts
+++ b/client/src/app/dashboard/table-all/table-all.component.spec.ts
@@ -30,6 +30,8 @@ import { LabelDialogComponent } from '../label-dialog/label-dialog.component';
import { LabelDeleteComponent } from '../label-delete/label-delete.component';
import { ApiService } from '../../api/api/api.service';
import { MaterialModule } from 'src/app/material-module/material.module';
+import { ApiModule } from 'src/app/api/api.module';
+import { JwtModule } from '@auth0/angular-jwt';
import { MatChipsModule } from '@angular/material/chips';
describe('TableAllComponent', () => {
@@ -40,7 +42,7 @@ describe('TableAllComponent', () => {
TestBed.configureTestingModule({
declarations: [TableAllComponent],
imports: [HttpClientTestingModule, HttpClientModule, BrowserModule, BrowserAnimationsModule,
- MaterialModule, MatChipsModule],
+ MaterialModule, JwtModule.forRoot({}), ApiModule, MatChipsModule],
providers: [{
provide: MatDialogRef,
useValue: {}
@@ -79,9 +81,4 @@ describe('TableAllComponent', () => {
expect(fixture.nativeElement.querySelectorAll('mat-form-field').length).toBe(1);
});
- it('should check for Add Dialog open functionality', async(() => {
- const openAddDialog = spyOn(component, 'openAddDialog');
- fixture.debugElement.query(By.css('#addButton')).triggerEventHandler('click', null);
- expect(openAddDialog).toHaveBeenCalled();
- }));
});
diff --git a/client/src/app/dashboard/table-all/table-all.component.ts b/client/src/app/dashboard/table-all/table-all.component.ts
index 5c26ada6..742c5122 100644
--- a/client/src/app/dashboard/table-all/table-all.component.ts
+++ b/client/src/app/dashboard/table-all/table-all.component.ts
@@ -25,8 +25,8 @@ import { LabelDialogComponent } from '../label-dialog/label-dialog.component';
import { LabelDeleteComponent } from '../label-delete/label-delete.component';
import { animate, state, style, transition, trigger } from '@angular/animations';
import { HttpEvent } from '@angular/common/http';
-import { ModelService } from 'src/app/model/model.service';
import { ApiService } from 'src/app/api/api/api.service';
+import { AuthService } from 'src/app/api/auth.service';
@Component({
@@ -65,7 +65,6 @@ export class TableAllComponent implements OnInit {
}
}
-
displayedColumns = ['ID', 'name', 'host', 'portNumber', 'instanceState', 'action', 'Details'];
columnsToDisplay: string[] = ['dockerId', 'labels'];
dataSource: MatTableDataSource = new MatTableDataSource(this.dataArray);
@@ -75,13 +74,17 @@ export class TableAllComponent implements OnInit {
expandedID: number;
@ViewChild(MatPaginator) paginator: MatPaginator;
- constructor(public dialog: MatDialog, private apiService: ApiService, private modelService: ModelService) {
+ constructor(public dialog: MatDialog, private apiService: ApiService, public authService: AuthService) {
}
ngOnInit() {
this.dataSource.paginator = this.paginator;
}
+ public hideActions(ele: Instance) {
+ return !ele.dockerId || !this.authService.userIsAdmin();
+ }
+
/**
* Function for deleting an insatnce. Cannot delete an instance if its running.
* Prompts to Stop the instance before deleting.
@@ -117,7 +120,7 @@ export class TableAllComponent implements OnInit {
* Function for deleting a label.
* @param InstanceID
*/
- openLabelDelete(i: number, id: string, label: string) {
+ openLabelDelete(id: string, label: string) {
const deletedialogRef = this.dialog.open(LabelDeleteComponent, {
width: '250px',
data: { name: label }
@@ -154,10 +157,9 @@ export class TableAllComponent implements OnInit {
});
dialogRef.afterClosed().subscribe(dialogResult => {
- if (dialogResult === 'CancelAdd') {
+ if (!dialogResult || dialogResult === 'CancelAdd') {
dialogRef.close();
} else {
- console.log('dialogResult', dialogResult);
this.apiService.postInstance(this.type, dialogResult.name).subscribe((result: Instance) => {
this.dataSource.data.push(result);
}, err => {
diff --git a/client/src/app/dashboard/table-overview/table-overview.component.css b/client/src/app/dashboard/table-overview/table-overview.component.css
index e69de29b..c7cda503 100644
--- a/client/src/app/dashboard/table-overview/table-overview.component.css
+++ b/client/src/app/dashboard/table-overview/table-overview.component.css
@@ -0,0 +1,3 @@
+.titleAlign{
+ margin-left:15px;
+}
\ No newline at end of file
diff --git a/client/src/app/dashboard/table-overview/table-overview.component.html b/client/src/app/dashboard/table-overview/table-overview.component.html
index 57372174..9bdb0673 100644
--- a/client/src/app/dashboard/table-overview/table-overview.component.html
+++ b/client/src/app/dashboard/table-overview/table-overview.component.html
@@ -16,42 +16,35 @@
~ limitations under the License.
-->
-
-
+
+
WebApi Details
+
+
+
-
-
- WebApi Details
-
- |
-
-
- |
-
-
-
- Web Application Details
-
+ Web Application Details
+
+ Crawler Details
+
- |
-
-
- |
-
-
-
- Crawler Details
-
- |
-
-
- |
-
-
-
User Management
-
+
User Management
diff --git a/client/src/app/dashboard/user-management/user-management.component.ts b/client/src/app/dashboard/user-management/user-management.component.ts
index 01c00641..de1f8cfb 100644
--- a/client/src/app/dashboard/user-management/user-management.component.ts
+++ b/client/src/app/dashboard/user-management/user-management.component.ts
@@ -19,7 +19,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { User } from '../../model/models/user';
import { ApiService } from 'src/app/api/api/api.service';
-import { HttpEvent } from '@angular/common/http';
import { MatPaginator, MatTableDataSource, MatSort, MatDialog } from '@angular/material';
import { UserAddComponent } from '../user-add/user-add.component';
import { DeleteUserComponent } from '../delete-user/delete-user.component';
diff --git a/client/src/app/landing-page/landing-page.component.css b/client/src/app/landing-page/landing-page.component.css
index dc53cd8c..5dc8fdd6 100644
--- a/client/src/app/landing-page/landing-page.component.css
+++ b/client/src/app/landing-page/landing-page.component.css
@@ -33,5 +33,5 @@
transform: translate(-50%, -50%);
}
.loginbtn{
- padding-left: 30%;
+ padding-left: 25%;
}
\ No newline at end of file
diff --git a/client/tsconfig.json b/client/tsconfig.json
index 916247e4..ee2373e6 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,6 +1,10 @@
{
"compileOnSave": false,
"compilerOptions": {
+ "paths": {
+ "core-js/es7/reflect": [
+ "node_modules/core-js/proposals/reflect-metadata"
+ ]},
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
diff --git a/conf/application.conf b/conf/application.conf
index 6b576126..38849486 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -369,9 +369,9 @@ play.modules.enabled += "module.Module"
# play.http.errorHandler = "utils.ErrorHandler"
app.portManagement = 8083
-app.instanceRegistryUri = "http://pg-delphi.cs.upb.de:8895"
+app.instanceRegistryUri = "http://pg-delphi.cs.upb.de:8810"
app.instanceRegistryUri = ${?INSTANCE_REGISTRY_URI}
-app.instanceRegistryBasePath = "pg-delphi.cs.upb.de:8895"
+app.instanceRegistryBasePath = "pg-delphi.cs.upb.de:8810"
app.instanceRegistryBasePath = ${?INSTANCE_REGISTRY_BASE_PATH}
//JwtKey
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..48e341a0
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+ "lockfileVersion": 1
+}