Skip to content

Commit 17d1ef5

Browse files
andyjmacleanandyjmaclean
authored
Merge pull request #839 from europeana/hotfix/v13-s12-0
Hotfix/v13 s12 0
2 parents b7f1f3f + c9d7442 commit 17d1ef5

File tree

8 files changed

+20
-23
lines changed

8 files changed

+20
-23
lines changed

‎projects/metis/cypress/e2e/dashboard.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ context('metis-ui', () => {
1919
setupUser();
2020
cy.request(Cypress.env('dataServer') + '/' + UrlManipulation.METIS_UI_CLEAR);
2121
setEmptyDataResult(
22-
'/orchestrator/workflows/executions/?orderField=CREATED_DATE&ascending=false' +
22+
'/orchestrator/workflows/executions?orderField=CREATED_DATE&ascending=false' +
2323
'&nextPage=0&workflowStatus=INQUEUE&workflowStatus=RUNNING'
2424
);
2525
cy.visit('/dashboard');

‎projects/metis/src/app/_services/workflow.service.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ describe('Workflow Service', () => {
320320
mockHttp
321321
.expect(
322322
'GET',
323-
'/orchestrator/workflows/executions/' +
323+
'/orchestrator/workflows/executions' +
324324
'?orderField=CREATED_DATE&ascending=false&nextPage=0' +
325325
'&workflowStatus=INQUEUE&workflowStatus=RUNNING'
326326
)
@@ -337,15 +337,15 @@ describe('Workflow Service', () => {
337337
mockHttp
338338
.expect(
339339
'GET',
340-
'/orchestrator/workflows/executions/' +
340+
'/orchestrator/workflows/executions' +
341341
'?orderField=CREATED_DATE&ascending=false&nextPage=0' +
342342
'&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
343343
)
344344
.send(mockFirstPageResults);
345345
mockHttp
346346
.expect(
347347
'GET',
348-
'/orchestrator/workflows/executions/' +
348+
'/orchestrator/workflows/executions' +
349349
'?orderField=CREATED_DATE&ascending=false&nextPage=1' +
350350
'&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
351351
)
@@ -359,15 +359,15 @@ describe('Workflow Service', () => {
359359
mockHttp
360360
.expect(
361361
'GET',
362-
'/orchestrator/workflows/executions/' +
362+
'/orchestrator/workflows/executions' +
363363
'?orderField=CREATED_DATE&ascending=false&nextPage=0' +
364364
'&workflowStatus=INQUEUE&workflowStatus=RUNNING'
365365
)
366366
.send(mockFirstPageResults);
367367
mockHttp
368368
.expect(
369369
'GET',
370-
'/orchestrator/workflows/executions/' +
370+
'/orchestrator/workflows/executions' +
371371
'?orderField=CREATED_DATE&ascending=false&nextPage=1' +
372372
'&workflowStatus=INQUEUE&workflowStatus=RUNNING'
373373
)
@@ -386,15 +386,15 @@ describe('Workflow Service', () => {
386386
mockHttp
387387
.expect(
388388
'GET',
389-
'/orchestrator/workflows/executions/' +
389+
'/orchestrator/workflows/executions' +
390390
'?orderField=CREATED_DATE&ascending=false&nextPage=0' +
391391
'&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
392392
)
393393
.send(mockWorkflowExecutionResults);
394394
mockHttp
395395
.expect(
396396
'GET',
397-
'/orchestrator/workflows/executions/' +
397+
'/orchestrator/workflows/executions' +
398398
'?orderField=CREATED_DATE&ascending=false&nextPage=1' +
399399
'&workflowStatus=CANCELLED&workflowStatus=FAILED&workflowStatus=FINISHED'
400400
)
@@ -409,15 +409,15 @@ describe('Workflow Service', () => {
409409
mockHttp
410410
.expect(
411411
'GET',
412-
'/orchestrator/workflows/executions/' +
412+
'/orchestrator/workflows/executions' +
413413
'?orderField=CREATED_DATE&ascending=false&nextPage=0' +
414414
'&workflowStatus=INQUEUE&workflowStatus=RUNNING'
415415
)
416416
.send(mockWorkflowExecutionResults);
417417
mockHttp
418418
.expect(
419419
'GET',
420-
'/orchestrator/workflows/executions/' +
420+
'/orchestrator/workflows/executions' +
421421
'?orderField=CREATED_DATE&ascending=false&nextPage=1' +
422422
'&workflowStatus=INQUEUE&workflowStatus=RUNNING'
423423
)

‎projects/metis/src/app/_services/workflow.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ export class WorkflowService extends SubscriptionManager {
264264
page: number,
265265
ongoing = false
266266
): Observable<Results<WorkflowExecution>> {
267-
let url = `${apiSettings.apiHostCore}/orchestrator/workflows/executions/?orderField=CREATED_DATE&ascending=false&nextPage=${page}`;
267+
let url = `${apiSettings.apiHostCore}/orchestrator/workflows/executions?orderField=CREATED_DATE&ascending=false&nextPage=${page}`;
268268
if (ongoing) {
269269
url += '&workflowStatus=INQUEUE&workflowStatus=RUNNING';
270270
} else {

‎projects/metis/src/app/dataset/editor/editor.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h3>
3737
><span>{{ step }}</span> <span *ngIf="stepCompare"> {{ stepCompare }}</span></span
3838
>
3939
</div>
40-
<div [ngClass]="{ 'theme-midnight' : editorConfig.theme !== 'default' }">
40+
<div [ngClass]="{ 'theme-midnight': editorConfig.theme !== 'default' }">
4141
<ng-content></ng-content>
4242
</div>
4343
<div *ngIf="expandable" class="btns-set btns-set-right">

‎projects/metis/src/app/dataset/generalinfo/generalinfo.component.html‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
<span class="svg-icon-dataset"></span> {{ datasetData.datasetName }}
44
</div>
55
<dl class="dataset-info-fields">
6-
<dt>{{ 'provider' | translate }}</dt>
7-
<dd>{{ datasetData.provider }}</dd>
6+
<dt *ngIf="datasetData.provider">{{ 'provider' | translate }}</dt>
7+
<dd *ngIf="datasetData.provider">{{ datasetData.provider }}</dd>
88
<dt *ngIf="datasetData.dataProvider">{{ 'dataProvider' | translate }}</dt>
99
<dd *ngIf="datasetData.dataProvider">{{ datasetData.dataProvider }}</dd>
1010
<dt *ngIf="currentDepublicationStatusMessage">{{ 'depublicationStatus' | translate }}</dt>
11-
<dd>
12-
<span
13-
*ngIf="currentDepublicationStatusMessage"
14-
class="pill depublication-status"
15-
[ngClass]="currentDepublicationStatusClass"
16-
>
11+
<dd *ngIf="currentDepublicationStatusMessage">
12+
<span class="pill depublication-status" [ngClass]="currentDepublicationStatusClass">
1713
{{ currentDepublicationStatusMessage | translate }}
1814
</span>
1915
</dd>

‎projects/metis/test-data/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ new (class extends TestDataServer {
489489
return true;
490490
}
491491

492-
regRes = /orchestrator\/workflows\/executions\/\?\S+INQUEUE\S+RUNNING/.exec(route);
492+
regRes = /orchestrator\/workflows\/executions\?\S+INQUEUE\S+RUNNING/.exec(route);
493493

494494
if (regRes) {
495495
const params = url.parse(route, true).query;
@@ -499,7 +499,7 @@ new (class extends TestDataServer {
499499
return true;
500500
}
501501

502-
regRes = /orchestrator\/workflows\/executions\/\?/.exec(route);
502+
regRes = /orchestrator\/workflows\/executions[\/\?]/.exec(route);
503503

504504
if (regRes) {
505505
console.log('unhandled.....');

‎shared-styles/assets/sass/pandora/components/_status-bullet.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import '../../scss/iconography/svg-icons-metis';
12
@import '../../scss/generic/variables-colours';
23
@import '../settings/metis-variables-colours';
34

‎shared-styles/assets/sass/pandora/components/_viewxmlsamples.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ codemirror {
211211
.view-sample.no-sample .theme-midnight .view-sample-editor,
212212
.view-sample .theme-midnight .view-sample-editor-codemirror {
213213
// colour taken from CodeMirror
214-
$midnight: #0F192A;
214+
$midnight: #0f192a;
215215
background-color: $midnight;
216216
scrollbar-color: $eu-jade $midnight;
217217
}

0 commit comments

Comments
 (0)