| # | +File name | +Size | +Progress | +Error | +
|---|---|---|---|---|
| {{index + 1}} | +{{file.name}} | +{{file.size | bytes}} | +
+ |
+ + {{file.errorMessage|| "Unknown upload error."}} + | +
| # | ++ {{ (pageSize * genericFilesPaginator.pageIndex) + id + 1 }} + | +Name | +
+ {{ row.fileName }}
+ {{row.importError}} + |
+ Size | +{{ row.fileSize | bytes }} | +Actions | ++ + + + + | +
|---|
| Name | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} |
|
@@ -60,7 +60,7 @@
|
diff --git a/projects/wipp-frontend-lib/src/lib/job/job-detail/job-detail.component.ts b/projects/wipp-frontend-lib/src/lib/job/job-detail/job-detail.component.ts
index 3ea99ed7..37abfd12 100644
--- a/projects/wipp-frontend-lib/src/lib/job/job-detail/job-detail.component.ts
+++ b/projects/wipp-frontend-lib/src/lib/job/job-detail/job-detail.component.ts
@@ -3,7 +3,6 @@ import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
import {Job} from '../job';
import {JobService} from '../job.service';
import {Plugin} from '../../plugin/plugin';
-import 'rxjs-compat/add/operator/map';
import {Workflow} from '../../workflow/workflow';
export interface IdHash {
@@ -29,11 +28,15 @@ export class JobDetailComponent implements OnInit {
workflow: Workflow;
outputHash: IdHash = {};
+ workflowsPath: string;
+ pluginsPath: string;
+
constructor(private activeModal: NgbActiveModal,
private jobService: JobService) {
}
ngOnInit() {
+ this.getUiPaths();
this.getJob();
}
@@ -83,4 +86,9 @@ export class JobDetailComponent implements OnInit {
return [id, outputName];
}
+ getUiPaths() {
+ this.workflowsPath = this.jobService.getWorkflowsUiPath();
+ this.pluginsPath = this.jobService.getPluginsUiPath();
+ }
+
}
diff --git a/projects/wipp-frontend-lib/src/lib/job/job.service.ts b/projects/wipp-frontend-lib/src/lib/job/job.service.ts
index cc211f9c..29bd2b66 100644
--- a/projects/wipp-frontend-lib/src/lib/job/job.service.ts
+++ b/projects/wipp-frontend-lib/src/lib/job/job.service.ts
@@ -6,7 +6,7 @@ import {Plugin} from '../plugin/plugin';
import {ImagesCollection} from '../images-collection/images-collection';
import {StitchingVector} from '../stitching-vector/stitching-vector';
import {Workflow} from '../workflow/workflow';
-import { API_ROOT_URL } from '../injection-token';
+import { ENV } from '../injection-token';
const httpOptions = {
@@ -21,15 +21,18 @@ const httpOptions = {
export class JobService {
constructor(
- @Inject(API_ROOT_URL) private apiRootUrl: string,
+ @Inject(ENV) private env: any,
private http: HttpClient) {
}
- private jobsUrl = this.apiRootUrl + '/jobs';
- private imagesCollection = this.apiRootUrl + '/imagesCollections';
- private stitchingVector = this.apiRootUrl + '/stitchingVectors';
- private pluginsUrl = this.apiRootUrl + '/plugins';
- private workflowsUrl = this.apiRootUrl + '/workflows';
+ private jobsUrl = this.env.apiRootUrl + '/jobs';
+ private imagesCollection = this.env.apiRootUrl + '/imagesCollections';
+ private stitchingVector = this.env.apiRootUrl + '/stitchingVectors';
+ private pluginsUrl = this.env.apiRootUrl + '/plugins';
+ private workflowsUrl = this.env.apiRootUrl + '/workflows';
+
+ private workflowsUiPath = this.env.uiPaths.workflowsPath;
+ private pluginsUiPath = this.env.uiPaths.pluginsPath;
getJob(jobId: string): ObservableName | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{layer.label}} | - + {{layer.pyramid?.name}} | diff --git a/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-detail/pyramid-visualization-detail.component.ts b/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-detail/pyramid-visualization-detail.component.ts index 1225e638..5e1ad07b 100644 --- a/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-detail/pyramid-visualization-detail.component.ts +++ b/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-detail/pyramid-visualization-detail.component.ts @@ -18,6 +18,7 @@ export class PyramidVisualizationDetailComponent implements OnInit, OnDestroy { visualizationId = this.route.snapshot.paramMap.get('id'); visualization: Visualization = new Visualization(); + pyramidUiPath: string; manifest: any = null; newGroup = {}; layersGroups = []; @@ -33,6 +34,7 @@ export class PyramidVisualizationDetailComponent implements OnInit, OnDestroy { } ngOnInit() { + this.getPyramidUiPath(); this.visualizationService.getVisualization(this.visualizationId) .subscribe(visualization => { this.visualization = visualization; @@ -40,6 +42,10 @@ export class PyramidVisualizationDetailComponent implements OnInit, OnDestroy { }); } + getPyramidUiPath() { + this.pyramidUiPath = this.visualizationService.getPyramidUiPath(); + } + loadManifest() { if (!this.visualization.manifest) { this.manifest = { diff --git a/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-list/pyramid-visualization-list.component.html b/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-list/pyramid-visualization-list.component.html index 024a62ea..4d1063a8 100644 --- a/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-list/pyramid-visualization-list.component.html +++ b/projects/wipp-frontend-lib/src/lib/pyramid-visualization/pyramid-visualization-list/pyramid-visualization-list.component.html @@ -17,7 +17,7 @@Name | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} | Name | -{{ row.name }} | +{{ row.name }} |