Skip to content

Commit d230abc

Browse files
author
mdulko
committed
release: revert TECH-1049, TECH-1076 because they are not in 'Done' status
1 parent 4742ad7 commit d230abc

12 files changed

Lines changed: 103 additions & 80 deletions

File tree

‎frontend/__tests__/components/compliance/__snapshots__/EvaluationSchemaTable.test.tsx.snap‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,21 @@ exports[`Unit tests for EvaluationSchemaTable component: should render the compo
7777
<td
7878
class="border-none border-bottom"
7979
>
80-
Fulfillment of REQUIRED cross-cutting requirements stated in the respective BB specifications
80+
Fulfillment of REQUIRED Key Digital Functionalities stated in the respective BB specifications
81+
</td>
82+
</tr>
83+
<tr>
84+
<td
85+
class="border-none border-bottom"
86+
>
87+
Fulfillment of REQUIRED cross-cutting and functional requirements stated in the respective BB specifications
8188
</td>
8289
</tr>
8390
<tr>
8491
<td
8592
class="border-none"
8693
>
87-
Fulfillment of REQUIRED functional requirements stated in the respective BB specifications
94+
Fulfillment of REQUIRED cross-cutting requirements stated in the Architecture BB specifications
8895
</td>
8996
</tr>
9097
</tbody>
@@ -103,14 +110,21 @@ exports[`Unit tests for EvaluationSchemaTable component: should render the compo
103110
<td
104111
class="border-none border-bottom"
105112
>
106-
&gt;50%
113+
All
114+
</td>
115+
</tr>
116+
<tr>
117+
<td
118+
class="border-none border-bottom"
119+
>
120+
≥ 1
107121
</td>
108122
</tr>
109123
<tr>
110124
<td
111125
class="border-none"
112126
>
113-
&gt;90%
127+
≥ 1
114128
</td>
115129
</tr>
116130
</tbody>
@@ -129,14 +143,21 @@ exports[`Unit tests for EvaluationSchemaTable component: should render the compo
129143
<td
130144
class="border-none border-bottom"
131145
>
132-
&gt;50%
146+
All
147+
</td>
148+
</tr>
149+
<tr>
150+
<td
151+
class="border-none border-bottom"
152+
>
153+
All
133154
</td>
134155
</tr>
135156
<tr>
136157
<td
137158
class="border-none"
138159
>
139-
&gt;90%
160+
All
140161
</td>
141162
</tr>
142163
</tbody>
@@ -171,7 +192,7 @@ exports[`Unit tests for EvaluationSchemaTable component: should render the compo
171192
<td
172193
class="border-none"
173194
>
174-
Fulfillment of REQUIRED API related requirements in the Architecture BB specifications (ch. 5.1-5.4, 5.6, 5.13)
195+
Fulfillment of REQUIRED API related requirements in the Architecture BB specifications
175196
</td>
176197
</tr>
177198
</tbody>

‎frontend/__tests__/components/header/__snapshots__/Header.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exports[`Unit tests for Header component: should render the Header component and
3232
data-testid="header-menu-button"
3333
href="/apiTesting"
3434
>
35-
API Compliance Testing
35+
API testing
3636
</a>
3737
</div>
3838
<div

‎frontend/__tests__/components/mainLayout/__snapshots__/MainLayout.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ exports[`Unit test for MainLayout component: render the MainLayout component 1`]
3535
data-testid="header-menu-button"
3636
href="/apiTesting"
3737
>
38-
API Compliance Testing
38+
API testing
3939
</a>
4040
</div>
4141
<div

‎frontend/components/Definition.tsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ import React from 'react';
22
import ReactMarkdown from 'react-markdown';
33
import classNames from 'classnames';
44
import { formatTranslationType } from '../service/types';
5-
import children = ReactMarkdown.propTypes.children;
65

76
type DefinitionType = {
87
title: formatTranslationType;
98
hasRedirecting?: boolean;
10-
description?: formatTranslationType;
9+
description: formatTranslationType;
1110
descriptionPartTwo?: formatTranslationType;
1211
note?: formatTranslationType;
1312
customStyle?: string;
14-
children?: React.ReactNode;
1513
};
1614

1715
const Definition = ({
@@ -21,7 +19,6 @@ const Definition = ({
2119
descriptionPartTwo,
2220
note,
2321
customStyle,
24-
children
2522
}: DefinitionType) => (
2623
<div className={classNames('definition-section', customStyle)}>
2724
<p className="definition-title" data-testid="definition-title">
@@ -30,17 +27,18 @@ const Definition = ({
3027
<div data-testid="definition-description">
3128
{hasRedirecting ? (
3229
<div>
30+
{/* @ts-ignore */}
3331
<ReactMarkdown className="definition-description" linkTarget="_blank">
34-
{`${description}`}
32+
{description || ''}
3533
</ReactMarkdown>
34+
{/* @ts-ignore */}
3635
<ReactMarkdown className="definition-description" linkTarget="_blank">
37-
{`${descriptionPartTwo}`}
36+
{descriptionPartTwo || ''}
3837
</ReactMarkdown>
3938
</div>
4039
) : (
4140
<div className="definition-description">{description}</div>
4241
)}
43-
{children}
4442
</div>
4543
{note && (
4644
<p className="definition-note" data-testid="definition-note">

‎frontend/components/compliance/EvaluationSchemaTable.tsx‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,42 @@ const EvaluationSchemaTable = () => {
3737
values: [
3838
{
3939
value: format(
40-
'evaluation_schema.fulfillment_of_required_cc.label'
40+
'evaluation_schema.fulfillment_of_required_key.label'
4141
),
4242
},
4343
{
4444
value: format(
4545
'evaluation_schema.fulfillment_of_required_functional_requirements.label'
4646
),
4747
},
48+
{
49+
value: format(
50+
'evaluation_schema.fulfillment_of_required_cross_cutting_requirements.label'
51+
),
52+
},
4853
],
4954
},
5055
{
5156
values: [
5257
{
53-
value: format('evaluation_schema.over50.label'),
58+
value: format('evaluation_schema.all.label'),
5459
},
5560
{
56-
value: format('evaluation_schema.over90.label'),
61+
value: format('evaluation_schema.equal_or_more_than_1.label'),
5762
},
63+
{ value: format('evaluation_schema.equal_or_more_than_1.label') },
5864
],
5965
},
6066
{
6167
values: [
6268
{
63-
value: format('evaluation_schema.over50.label'),
69+
value: format('evaluation_schema.all.label'),
6470
},
6571
{
66-
value: format('evaluation_schema.over90.label'),
72+
value: format('evaluation_schema.all.label'),
73+
},
74+
{
75+
value: format('evaluation_schema.all.label'),
6776
},
6877
],
6978
},

‎frontend/components/form/EvaluationSummary.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const EvaluationSummary = () => {
9898
const rows: DataRow[] = [
9999
{
100100
cell: [
101-
{ value: format('table.deployment_compliance.label') },
101+
{ value: format('table.deployment.label') },
102102
{
103103
values: [
104104
{
@@ -126,7 +126,7 @@ const EvaluationSummary = () => {
126126
},
127127
{
128128
cell: [
129-
{ value: format('table.interface_compliance.label') },
129+
{ value: format('table.interface.label') },
130130
{
131131
values: [
132132
{

‎frontend/components/form/InterfaceCompliance.tsx‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import React, { RefObject, useEffect, useState } from 'react';
2+
import { AiOutlineQuestionCircle } from 'react-icons/ai';
3+
import Link from 'next/link';
24
import ReactMarkdown from 'react-markdown';
35
import SelectBBs, { IRSCFormRef } from '../shared/combined/SelectBBs';
46
import { getComplianceRequirements } from '../../service/serviceAPI';
57
import { ComplianceRequirementsType } from '../../service/types';
68
import useTranslations from '../../hooks/useTranslation';
9+
import { CONFLUENCE_INSTRUCTIONS_LINK } from '../../service/constants';
710

811
type InterfaceComplianceFormProps = {
912
setUpdatedBBs: (data: ComplianceRequirementsType[] | undefined) => void;
@@ -40,25 +43,37 @@ const InterfaceComplianceForm = ({
4043

4144
return (
4245
<div style={{ display: display ? 'block' : 'none' }}>
46+
<div className="question-line">
47+
<AiOutlineQuestionCircle className="form-question-mark-icon" />
48+
<p className="question-line-text">
49+
{format('form.question_line.not_sure_how_to_start')}
50+
{format('form.question_line.click')}
51+
<Link
52+
className="question-line-link"
53+
href={CONFLUENCE_INSTRUCTIONS_LINK}
54+
target="_blank"
55+
>
56+
{format('form.question_line.here')}
57+
</Link>
58+
{format(
59+
'form.question_line.and_see_instructions_on_how_to_configure_interface_compliance'
60+
)}
61+
</p>
62+
</div>
4363
<div className="interface-bb-selector">
64+
{/* @ts-ignore */}
4465
<ReactMarkdown className="definition-description" linkTarget="_blank">
45-
{`${format('form.select_building_blocks.api.top.label.part_1')}`}
46-
</ReactMarkdown>
47-
<ReactMarkdown className="definition-description" linkTarget="_blank">
48-
{`${format('form.select_building_blocks.api.top.label.part_2')}`}
66+
{format('form.select_building_blocks.top.label')}
4967
</ReactMarkdown>
5068
<ol>
5169
<li>
52-
<p className="definition-description">{format('form.select_building_blocks.api.list.first.label')}</p>
53-
</li>
54-
<li>
55-
<p className="definition-description">{format('form.select_building_blocks.api.list.second.label')}</p>
70+
<p className="definition-description">{format('form.select_building_blocks.list.first.label')}</p>
5671
</li>
5772
<li>
58-
<p className="definition-description">{format('form.select_building_blocks.api.list.third.label')}</p>
73+
<p className="definition-description">{format('form.select_building_blocks.list.second.label')}</p>
5974
</li>
6075
<li>
61-
<p className="definition-description">{format('form.select_building_blocks.api.list.fourth.label')}</p>
76+
<p className="definition-description">{format('form.select_building_blocks.list.third.label')}</p>
6277
</li>
6378
</ol>
6479
<p className="definition-description">{format('form.select_building_blocks.bottom.label')}</p>

‎frontend/components/form/RequirementSpecificationForm.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ const RequirementSpecificationComplianceForm = ({
4343
return (
4444
<div style={{ display: display ? 'block' : 'none' }}>
4545
<div className="interface-bb-selector">
46+
{/* @ts-ignore */}
4647
<ReactMarkdown className="definition-description" linkTarget="_blank">
47-
{`${format('form.select_building_blocks.top.label')}`}
48+
{format('form.select_building_blocks.top.label')}
4849
</ReactMarkdown>
4950
<ol>
5051
<li>

‎frontend/components/shared/ProgressBar.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
.progress-bar-step-label {
9191
font-size: 16px;
9292
color: @text-secondary;
93-
min-width: 240px;
93+
min-width: 200px;
9494
text-align: center;
9595
}
9696

‎frontend/pages/apiTesting/index.tsx‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import Head from 'next/head';
22
import { useRouter } from 'next/router';
3-
import React, { useEffect, useState } from 'react';
3+
import { useEffect, useState } from 'react';
44
import { toast } from 'react-toastify';
5-
import ReactMarkdown from 'react-markdown';
65
import Definition from '../../components/Definition';
76
import ProductTable from '../../components/table/ProductTable';
87
import useTranslations from '../../hooks/useTranslation';
@@ -60,17 +59,10 @@ const ApiTestingPage = () => {
6059
<main>
6160
<Definition
6261
title={format('app.definition.title')}
63-
>
64-
<ReactMarkdown className="definition-description" linkTarget="_blank">
65-
{`${format('app.definition.description.part_1')}`}
66-
</ReactMarkdown>
67-
<ReactMarkdown className="definition-description" linkTarget="_blank">
68-
{`${format('app.definition.description.part_2')}`}
69-
</ReactMarkdown>
70-
<ReactMarkdown className="definition-description" linkTarget="_blank">
71-
{`${format('app.definition.description.part_3')}`}
72-
</ReactMarkdown>
73-
</Definition>
62+
description={format('app.definition.description')}
63+
hasRedirecting={true}
64+
note={format('app.definition.note')}
65+
/>
7466
<ProductTable showAll={showAll} />
7567
</main>
7668
</div>

0 commit comments

Comments
 (0)