Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/components/blocks/SanctionBlock.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ const SanctionBlock = (props) => {
{t(EXPIRED)}
</Button>
</div>
<tr className="py-6 float-left font-bold">
<div className="py-6 float-left font-bold">
<Trans
i18nKey="sanctionsCounter"
values={{ count: sanctions.activeSanction.length + sanctions.inactiveSanction.length,
active: sanctions.activeSanction.length,
expired: sanctions.inactiveSanction.length,
}}
/>
</tr>
</div>
<table className="table text-left">
<thead>
<tr className="bg-gray-200 text-gray-700">
Expand All @@ -79,9 +79,11 @@ const SanctionBlock = (props) => {
{(isEqualArray(values, [ALL]) || isEqualArray(values, [ACTIVE])) &&
!!sanctions.activeSanction.length && (
<>
<tr className="pl-5 py-1.5 float-left font-bold">
{t('activeSanctions')}
</tr>
<tbody>
<tr className="pl-5 py-1.5 float-left font-bold">
<td>{t('activeSanctions')}</td>
</tr>
</tbody>
<tbody className="rounded-sm border-none" style={{ background: '#FFF4F4' }}>
{sanctions.activeSanction.map((sanction) => (
sanction.name_of_sanction.map((type, i) => (
Expand Down
20 changes: 20 additions & 0 deletions src/components/pages/datasets/pep/PepDetail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const PepDetail = ({ match, history }) => {
component: SanctionBlock,
blockProps: { data: data.SANCTION && data.SANCTION.length ? data.SANCTION : [{ noSanction: t('noSanction') }] },
type: ASYNCBLOCK,
status: STATUS_BLOCK.isInformation,
},
{
id: pepBlocks.CRIMINAL,
Expand All @@ -88,6 +89,7 @@ const PepDetail = ({ match, history }) => {
component: PepCriminal,
blockProps: { data: pep.criminal_proceedings ? pep.criminal_proceedings : [{ noCriminal: t('noCriminal') }] },
type: INFOBLOCK,
status: STATUS_BLOCK.isInformation,
},
{
id: pepBlocks.RELATED_PERSONS,
Expand All @@ -96,6 +98,7 @@ const PepDetail = ({ match, history }) => {
component: PepRelatedPerson,
blockProps: { pepId: pep.id, matchProps: match, data: prepareRelatedPersonData(pep) },
type: INFOBLOCK,
status: null,
},
{
id: pepBlocks.RELATED_COMPANIES,
Expand All @@ -104,6 +107,7 @@ const PepDetail = ({ match, history }) => {
component: PepRelatedCompanies,
blockProps: { data: pep.related_companies },
type: INFOBLOCK,
status: null,
},
{
id: asyncBlocks.CAREER,
Expand All @@ -113,6 +117,7 @@ const PepDetail = ({ match, history }) => {
component: PepCareer,
blockProps: { data: sortedCareerData(data.CAREER) },
type: ASYNCBLOCK,
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.INCOME,
Expand All @@ -127,6 +132,7 @@ const PepDetail = ({ match, history }) => {
pepId: pep.id,
ownerField: 'recipient',
},
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.LIABILITY,
Expand All @@ -137,6 +143,7 @@ const PepDetail = ({ match, history }) => {
blockData: data.LIABILITY,
type: ASYNCBLOCK,
blockProps: { data: data.LIABILITY, pepId: pep.id },
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.EXPENDITURE,
Expand All @@ -151,6 +158,7 @@ const PepDetail = ({ match, history }) => {
pepId: pep.id,
ownerField: 'participant',
},
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.MONETARY_ASSETS,
Expand All @@ -163,6 +171,7 @@ const PepDetail = ({ match, history }) => {
data: data.MONETARY_ASSETS.filter((money) => money.amount !== null),
pepId: pep.id,
},
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.GIFT,
Expand All @@ -177,6 +186,7 @@ const PepDetail = ({ match, history }) => {
ownerField: 'recipient',
data: data.GIFT,
},
status: STATUS_BLOCK.noInformation,
},
{
id: pepBlocks.INTANGIBLE_ASSETS,
Expand All @@ -185,6 +195,7 @@ const PepDetail = ({ match, history }) => {
component: IntangibleAssets,
blockProps: { data: pep.cryptocurrencies_from_last_declaration },
type: INFOBLOCK,
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.REAL_ESTATE,
Expand All @@ -194,6 +205,7 @@ const PepDetail = ({ match, history }) => {
component: PepProperty,
type: ASYNCBLOCK,
blockProps: { data: data.REAL_ESTATE },
status: STATUS_BLOCK.noInformation,
},
{
id: asyncBlocks.CAR,
Expand All @@ -203,6 +215,7 @@ const PepDetail = ({ match, history }) => {
component: PepVehicle,
blockProps: { data: data.CAR },
type: ASYNCBLOCK,
status: STATUS_BLOCK.noInformation,
},
{
id: pepBlocks.OTHER_NAMES,
Expand All @@ -211,6 +224,7 @@ const PepDetail = ({ match, history }) => {
component: PepOtherNames,
blockProps: { data: pep.fullname_transcriptions_eng },
type: INFOBLOCK,
status: STATUS_BLOCK.noInformation,
},
{
id: pepBlocks.ADDITIONAL_INFO,
Expand All @@ -219,6 +233,7 @@ const PepDetail = ({ match, history }) => {
component: PepHtml,
blockProps: { data: pep.info || '' },
type: INFOBLOCK,
status: STATUS_BLOCK.noInformation,
},
];
const getShortInfo = () => {
Expand Down Expand Up @@ -309,6 +324,11 @@ const PepDetail = ({ match, history }) => {
cur.status = STATUS_BLOCK.isInformation;
return 1;
}
if (!(cur.blockProps.data.length)) {
cur.status = STATUS_BLOCK.noInformation;
} else {
cur.status = STATUS_BLOCK.isInformation;
}
return 0;
}).map((block, i) => {
const Component = block.component;
Expand Down
8 changes: 4 additions & 4 deletions src/components/pages/datasets/person/PersonDetail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -286,21 +286,21 @@ const PersonDetail = ({ match, history }) => {
id: personBlocks.CAREER,
title: 'career',
titleIcon: Career,
component: CareerBlock,
blockProps: {
data: person.position_data,
person,
},
component: CareerBlock,
status: null,
},
{
id: personBlocks.OTHER_NAMES,
title: 'otherNames',
titleIcon: Name,
component: OtherNames,
blockProps: {
data: person.full_name_options,
},
component: OtherNames,
status: null,
},
{
Expand Down Expand Up @@ -398,11 +398,11 @@ const PersonDetail = ({ match, history }) => {
const getAdditionalInfo = () => config.sort((prev, cur) => {
if (prev.blockProps.data && prev.blockProps.data.length && !(cur.blockProps.data.length)) {
prev.status = STATUS_BLOCK.isInformation;
cur.status = STATUS_BLOCK.noInformation;
cur.status = STATUS_BLOCK.inDevelopment;
return -1;
}
if (cur.blockProps.data.length && !(prev.blockProps.data.length)) {
prev.status = STATUS_BLOCK.noInformation;
prev.status = STATUS_BLOCK.inDevelopment;
cur.status = STATUS_BLOCK.isInformation;
return 1;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/payment/LogTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const LogTable = () => {
return (
<TabContent>
<TabContentBlock large noPadding title={t('myLogs')}>
<div className="overflow-auto md:overflow-hidden">
<div className="overflow-auto md:overflow-visible">
<Table
columns={columns}
url="payment/api-logs/project/"
Expand Down