Merge pull request #439 from europeana/release/v1.8.0

Release/v1.8.0
europeana · Apr 1, 2020 · 7c5f2fd · 7c5f2fd
2 parents faf6b6f + 4689966
commit 7c5f2fd
Show file tree

Hide file tree

Showing 70 changed files with 893 additions and 399 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,5 @@
 /coverage
 /dist
 /node_modules
-/test-data
 /src/environments/apisettings.ts
 /tmp
diff --git a/cypress/fixtures/report.ts b/cypress/fixtures/report.ts
@@ -1,7 +1,7 @@
 import { Report } from '../../src/app/_models/report';
 
 export const report: Report = {
-  id: -3184946032335434000,
+  id: '-3184946032335434000',
   errors: [
     {
       errorType: '030c19d0-ebdb-11e8-b0f8-fa163eab778a',

diff --git a/cypress/integration/dashboard.spec.ts b/cypress/integration/dashboard.spec.ts
@@ -92,7 +92,7 @@ context('metis-ui', () => {
 
     it('should show the last executions to have run', () => {
       cy.get('.executions-grid .grid-header').should('have.length', expectedHeaderCount);
-      cy.get('.executions-grid .row-start').contains('Dataset 1');
+      cy.get('.executions-grid .row-start').contains('Dataset_1');
       cy.get('.executions-grid .row-start').should('have.length', expectedRowCount);
       cy.get('.executions-grid .grid-cell').should(
         'have.length',

diff --git a/cypress/integration/dataset.spec.ts b/cypress/integration/dataset.spec.ts
@@ -47,8 +47,11 @@ context('metis-ui', () => {
       cy.get('.search-form').should('have.length', 1);
     });
 
-    it('should show the dataset, general info, status, history', () => {
-      cy.get('.dataset-name').contains('Dataset 1');
+    it('should show the dataset, general info, status, history and redirection ids', () => {
+      cy.get('.dataset-name').contains('Dataset_1');
+
+      cy.get('.redirection-ids').contains('0');
+      cy.get('.redirection-ids').contains('1');
 
       cy.get('.metis-dataset-info-block dd').as('dd');
       cy.get('@dd').contains('Europeana');
@@ -88,7 +91,7 @@ context('metis-ui', () => {
     });
 
     it('should show the fields', () => {
-      checkFormField('Dataset Name', 'Dataset 1');
+      checkFormField('Dataset Name', 'Dataset_1');
       checkFormField('Provider', 'Europeana Provider');
       checkStaticField('Date Created', '19/02/2019 - 08:36');
       checkStaticField('Created by', '123');

diff --git a/src/app/_mocked/mockeddatasets.service.ts b/src/app/_mocked/mockeddatasets.service.ts
@@ -17,6 +17,7 @@ export const mockDataset: Dataset = {
   organizationId: '1',
   organizationName: 'mockedOrganization',
   provider: 'mockedProvider',
+  datasetIdsToRedirectFrom: ['123', '321'],
   replacedBy: 'mocked',
   replaces: 'mocked',
   updatedDate: '2018-04-03T07:49:42.275Z',

diff --git a/src/app/_mocked/mockedworkflow.service.ts b/src/app/_mocked/mockedworkflow.service.ts
@@ -520,7 +520,7 @@ export const mockStatisticsDetail: NodePathStatistics = {
 };
 
 export const mockReport: Report = {
-  id: 123,
+  id: '123',
   errors: [
     {
       errorType: 'errorType',

diff --git a/src/app/_models/dataset.ts b/src/app/_models/dataset.ts
@@ -14,6 +14,7 @@ export interface Dataset {
   datasetId: string;
   ecloudDatasetId: string;
   datasetName: string;
+  datasetIdsToRedirectFrom?: Array<string>;
   organizationId: string;
   organizationName: string;
   provider?: string;

diff --git a/src/app/_models/report.ts b/src/app/_models/report.ts
@@ -17,7 +17,7 @@ export interface ReportError {
 // Java name: TaskErrorsInfo
 
 export interface Report {
-  id: number;
+  id: string;
   errors: ReportError[];
 }
 

diff --git a/src/app/_services/workflow.service.spec.ts b/src/app/_services/workflow.service.spec.ts
@@ -175,10 +175,7 @@ describe('workflow service', () => {
 
   it('should get dataset execution summaries per page', () => {
     service.getCompletedDatasetOverviewsUptoPage(0).subscribe((results) => {
-      expect(results).toEqual({
-        results: mockDatasetOverviewResults.results,
-        more: false
-      });
+      expect(results.results).toEqual(mockDatasetOverviewResults.results);
     });
     mockHttp
       .expect('GET', '/orchestrator/workflows/executions/overview' + '?nextPage=0')
@@ -201,10 +198,9 @@ describe('workflow service', () => {
 
   it('should get multiple pages of completed executions for a dataset', () => {
     service.getCompletedDatasetExecutionsUptoPage('543452', 1).subscribe((results) => {
-      expect(results).toEqual({
-        results: mockWorkflowExecutionResults.results.concat(mockWorkflowExecutionResults.results),
-        more: false
-      });
+      expect(results.results).toEqual(
+        mockWorkflowExecutionResults.results.concat(mockWorkflowExecutionResults.results)
+      );
     });
     mockHttp
       .expect(
@@ -224,7 +220,7 @@ describe('workflow service', () => {
       .send(mockWorkflowExecutionResults);
 
     service.getCompletedDatasetExecutionsUptoPage('543452', 0).subscribe((results) => {
-      expect(results).toEqual({ results: mockWorkflowExecutionResults.results, more: true });
+      expect(results.results).toEqual(mockWorkflowExecutionResults.results);
     });
     mockHttp
       .expect(

diff --git a/src/app/_services/workflow.service.ts b/src/app/_services/workflow.service.ts
@@ -440,7 +440,7 @@ export class WorkflowService {
     const cancelledBy = workflow.cancelledBy;
     if (workflow.workflowStatus === WorkflowStatus.CANCELLED && cancelledBy) {
       if (cancelledBy === 'SYSTEM_MINUTE_CAP_EXPIRE') {
-        return of(this.translate.instant('system time-out'));
+        return of(this.translate.instant('systemTimeout'));
       } else {
         return this.authenticationServer.getUserByUserId(cancelledBy).pipe(
           map((user) => {