| + | Name | +
|---|---|
| + + + | ++ {{function.name}} + | +
| + | +
+ |
+
| - - - | -Title | -Status | -Requester | -Resolver | -Last activity | -Actions | -
|---|---|---|---|---|---|---|
| - - | -
-
- {{item.id}} - |
-
-
- {{item.state}}
-
-
-
-
- {{percentages[item.id]}} %
- |
-
- - {{item.requester_username}} - -{{item.created | fromNow}} - |
- {{item.resolver_username}} - | -{{item.last_activity | fromNow}} | -
-
-
-
-
-
-
-
-
- |
-
Execution instance #{{resolution.instance_id}} resolved by {{resolution.resolver_username}}.
@@ -261,7 +261,7 @@{{comment.content}}
- {{comment.username}}, {{comment.created | fromNow}} + {{comment.username}}, {{comment.created | utaskFromNow}}| + | Name | Description | diff --git a/ui/dashboard/src/app/@services/api.service.ts b/ui/dashboard/src/app/@services/api.service.ts deleted file mode 100644 index 73c39020..00000000 --- a/ui/dashboard/src/app/@services/api.service.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { environment } from '../../environments/environment'; - -@Injectable() -export class ApiService { - private base = environment.apiBaseUrl; - - constructor(private http: HttpClient) { } - - getMeta() { - return this.http.get(`${this.base}meta`); - } - - getStats() { - return this.http.get(`${this.base}unsecured/stats`); - } - - getTemplates(params: any) { - return this.http.get( - `${this.base}template`, - { - params, - observe: 'response', - } - ); - } - - getTemplate(name: string) { - return this.http.get( - `${this.base}template/${name}` - ); - } - - postResolution(body: any) { - return this.http.post( - `${this.base}resolution`, - body - ); - } - - postTask(body: any) { - return this.http.post( - `${this.base}task`, - body - ); - } - - rejectTask(taskId: string) { - return this.http.post( - `${this.base}task/${taskId}/wontfix`, - {} - ); - } - - tasks(params: any) { - return this.http.get( - `${this.base}task`, - { - params, - observe: 'response', - } - ); - } - - putTask(id: string, obj: any) { - return this.http.put( - `${this.base}task/${id}`, - obj - ); - } - - deleteTask(id: string) { - return this.http.delete( - `${this.base}task/${id}` - ); - } - - addComment(taskId: string, content: string) { - return this.http.post( - `${this.base}task/${taskId}/comment`, - { - content - } - ); - } - - putResolution(id: string, obj: any) { - return this.http.put( - `${this.base}resolution/${id}`, - obj - ); - } - - runResolution(id: string) { - return this.http.post(`${this.base}resolution/${id}/run`, {}); - } - - extendResolution(id: string) { - return this.http.post(`${this.base}resolution/${id}/extend`, {}); - } - - pauseResolution(id: string) { - return this.http.post(`${this.base}resolution/${id}/pause`, {}); - } - - cancelResolution(id: string) { - return this.http.post(`${this.base}resolution/${id}/cancel`, {}); - } - - task(id: string) { - return this.http.get(`${this.base}task/${id}`); - } - - resolution(id: string) { - return this.http.get(`${this.base}resolution/${id}`); - } -} diff --git a/ui/dashboard/src/app/@services/graph.service.spec.ts b/ui/dashboard/src/app/@services/graph.service.spec.ts deleted file mode 100644 index 9b30c878..00000000 --- a/ui/dashboard/src/app/@services/graph.service.spec.ts +++ /dev/null @@ -1,194 +0,0 @@ -import { TestBed, async, inject } from '@angular/core/testing'; -import { GraphService } from './graph.service'; -const d3 = require('d3'); -import dagreD3 from 'dagre-d3'; -import $ from 'jquery'; -import { Component, ViewChild, ElementRef, AfterViewInit } from '@angular/core'; - -@Component({ - selector: 'app-test', - template: ``, -}) -class TestComponent implements AfterViewInit { - @ViewChild('svg') svg: ElementRef; - - ngAfterViewInit() { - } -} - -describe('GraphService', () => { - let graphService: GraphService; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ], - declarations: [ - TestComponent, - ], - providers: [ - GraphService - ], - }).compileComponents(); - graphService = TestBed.get(GraphService); - })); - - it('Injection graph service', () => { - inject([GraphService], (injectedService: GraphService) => { - expect(injectedService).toBe(graphService); - }); - }); - - it(`Generate steps`, () => { - var steps = graphService.generateSteps({ steps: null }); - expect(steps).toEqual([]); - - var steps = graphService.generateSteps({ - steps: { - step1: 1, - step2: 2 - } - }); - expect(steps).toEqual([{ - key: 'step1', - data: 1 - }, { - key: 'step2', - data: 2 - }]); - }); - - it(`Check Steps`, () => { - var response = graphService.checkSteps([{ - key: 'step1', - data: 1 - }, { - key: 'step2', - data: 2 - }]); - expect(response.valid).toEqual(true); - expect(response.errorMessage).toEqual(''); - - var response = graphService.checkSteps([]); - expect(response.valid).toEqual(false); - expect(response.errorMessage).toEqual('The steps list is empty'); - - var response = graphService.checkSteps([{ - key: 'step1', - data: { - dependencies: ['step3'] - } - }, { - key: 'step2', - data: 2 - }]); - expect(response.valid).toEqual(false); - expect(response.errorMessage).toEqual(`Step 'step1' have a dependency to 'step3' which don't exist`); - }); - - it('Clear Nodes Selection', () => { - var svg = document.createElement("svg"); - svg.innerHTML = ' |
|---|