Skip to content

issue 162: filter clarinusermetadata/manage payload to contain only required metadata keys #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kuchtiak-ufal wants to merge 1 commit into
base: clarin-v7
Choose a base branch
from
Open

issue 162: filter clarinusermetadata/manage payload to contain only required metadata keys #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions ...p/bitstream-page/clarin-license-agreement-page/clarin-license-agreement-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
*/
LICENSE_PATH_SEZNAM_CZ = 'szn-dataset-licence.html';

/**
* The list of metadata keys that are optional and do not require user input.
*/
OPTIONAL_METADATA_KEYS = ['ORGANIZATION'];

/**
* The content of the Seznam dataset license. Fetch from the static file.
*/
Expand Down Expand Up @@ -209,8 +214,11 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
this.getBitstreamUUID();
if (this.userMetadata$.value?.page) {
// Filter the page array to exclude items with metadataKey "IP"
// and exclude items that are not in the requiredInfo list
this.userMetadata$.value.page =
this.userMetadata$.value.page.filter(item => item.metadataKey !== 'IP');
this.userMetadata$.value.page.filter(item => item.metadataKey !== 'IP' &&
this.requiredInfo$?.value?.some(requiredInfo =>
requiredInfo.name === item.metadataKey));
}
// Add IP address into request. Every restricted download must have stored IP address in the `user_metadata` table.
this.userMetadata$.value?.page.push(Object.assign(new ClarinUserMetadata(), {
Expand Down Expand Up @@ -422,13 +430,18 @@ export class ClarinLicenseAgreementPageComponent implements OnInit {
// Every requiredInfo.name === userMetadata.metadataKey must have the value in the userMetadata.metadataValue
this.requiredInfo$?.value?.forEach(requiredInfo => {
let hasMetadataValue = false;
this.userMetadata$?.value?.page?.forEach(userMetadata => {
if (userMetadata.metadataKey === requiredInfo.name) {
if (isNotEmpty(userMetadata.metadataValue)) {
hasMetadataValue = true;
// The OPTIONAL metadata keys don't require user input, so we consider them as filled in
if (this.OPTIONAL_METADATA_KEYS.includes(requiredInfo.name)) {
hasMetadataValue = true;
} else {
this.userMetadata$?.value?.page?.forEach(userMetadata => {
if (userMetadata.metadataKey === requiredInfo.name) {
if (isNotEmpty(userMetadata.metadataValue)) {
hasMetadataValue = true;
}
}
}
});
});
}
areFilledIn.push(hasMetadataValue);
});

Expand Down
Loading