/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 62389

Added by Andreas Mantas over 1 year ago

svn merge -r 62321:HEAD http://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-repository-dashboard-gui/branches/new-datasource-mode

     /*
     *  created by myrto on 12/12/2017
     */
     import { Component, OnInit } from '@angular/core';
     import { RegisterExistingDatasourceComponent } from './register-existing-datasource.component';
     @Component ({
       selector: 'app-sr-data',
       templateUrl: './register-existing-datasource.component.html'
     })
     export class SrDataComponent extends RegisterExistingDatasourceComponent implements OnInit {
       ngOnInit() {
         this.datasourceType = 'data';
         this.currentMode = 're3data';
         super.ngOnInit();
+      }
+    }

     /*
     *  updated by myrto on 19/12/2018
     */
     import { Component, OnInit } from '@angular/core';
     import { RegisterExistingDatasourceComponent } from './register-existing-datasource.component';
     @Component ({
       selector: 'app-sr-literature',
       templateUrl: './register-existing-datasource.component.html'
     })
     export class SrLiteratureComponent extends RegisterExistingDatasourceComponent implements OnInit {
       ngOnInit() {
         this.datasourceType = 'literature';
         this.currentMode = 'opendoar';
         super.ngOnInit();
+      }
+    }

             () => {
               // console.log(this.reposOfUser);
               this.reposOfUser.forEach(repo => {
                 if (!repo.consentTermsOfUse || !repo.fullTextDownload) {
                 if (repo.consentTermsOfUse === null || repo.fullTextDownload === null) {
                   this.addTerm(repo.officialname, repo.id, repo.consentTermsOfUse);
                   this.isModalShown = true;
+                }

           Agree to the <a href="https://www.openaire.eu/terms-of-use-for-content-providers#consent" target="_blank">re-use of full texts</a>
         </label>
       </form-inline>
       <!--  FIXME: replace consentTermsOfUseDate with registrationDate  -->
       <div class="uk-margin-top" *ngIf="selectedRepo.consentTermsOfUseDate">Data source registration date: {{selectedRepo.consentTermsOfUseDate | date}}</div>
       <div class="uk-margin-small-top">Last date of acceptance of the Terms of Use: {{selectedRepo.lastConsentTermsOfUseDate ? (selectedRepo.lastConsentTermsOfUseDate | date) : '-'}}</div>
       <ng-container *ngIf="showButton">
         <div class="uk-margin-top" *ngIf="selectedRepo.registrationdate">Data source registration date: {{selectedRepo.registrationdate | date}}</div>
         <div class="uk-margin-small-top">Last date of acceptance of the Terms of Use: {{selectedRepo.lastConsentTermsOfUseDate ? (selectedRepo.lastConsentTermsOfUseDate | date) : '-'}}</div>
       </ng-container>
       <p class="uk-text-meta">Note: OpenAIRE will not provide the full text files for public distribution, the users will access from the original datasource.</p>
       <div *ngIf="showButton" class="form-group">
         <button class="uk-button uk-button-primary updateRepoInfoButton" type="button" (click)="updateRepo()">Update Information</button>

     export const datasourceTypeDesc = {
       desc: 'The type of your repository',
       label: 'Repository Type',
       label: 'Data source type',
       mandatory: true,
       recommended: false
     };

     import { SourcesRegisterComponent } from './sources-register.component';
     import { CommonModule } from '@angular/common';
     import { TabsModule } from 'ngx-bootstrap';
     import { SrLiteratureComponent } from './sources-register/sr-literature.component';
     import { ReusableComponentsModule } from '../../shared/reusablecomponents/reusable-components.module';
     import { FormsModule, ReactiveFormsModule } from '@angular/forms';
     import { RepoFilter } from './sourcesPipes';
     import { SrDataComponent } from './sources-register/sr-data.component';
     import { RegisterDatasourceSelectExistingComponent } from './sources-register/register-datasource-select-existing.component';
     import { SrJournalComponent } from './sources-register/sr-journal.component';
     import { SrAggregatorComponent } from './sources-register/sr-aggregator.component';
-...
     import { RegisterExistingDatasourceComponent } from './sources-register/register-existing-datasource.component';
     import { DatasourceUpdateTermsFormComponent } from '../../shared/reusablecomponents/sources-forms/datasource-update-terms-form.component';
     import {SrCrisComponent} from './sources-register/sr-cris.component';
     import {SrRepositoryComponent} from './sources-register/sr-repository.component';
     @NgModule ({
       imports: [
-...
         SourcesRegisterComponent,
         RegisterNewDatasourceComponent,
         RegisterExistingDatasourceComponent,
         SrLiteratureComponent,
         SrDataComponent,
         SrRepositoryComponent,
         SrJournalComponent,
         SrAggregatorComponent,
         SrCrisComponent,

       updateInterface(repoId: string, registeredBy: string, comment: string, interfaceInfo: RepositoryInterface): Observable<RepositoryInterface> {
         let url;
         console.log(comment);
         if (comment == null || comment === '') {
           url = `${this.apiUrl}updateRepositoryInterface?repoId=${repoId}&registeredBy=${registeredBy}`;
         } else {
-...
         return this.httpClient.get<Map<string, string>>(url, headerOptions);
+      }
       getDatasourceClasses(mode: string): Observable<Map<string, string>> {
       getDatasourceClasses(mode: string): Observable<Object> {
         const url = `${this.apiUrl}getDatasourceClasses/${mode}`;
         console.log(`knocking on: ${url}`);
         return this.httpClient.get<Map<string, string>>(url, headerOptions);

     // Generated using typescript-generator version 1.29.366 on 2018-02-05 16:06:12.
     export class BrowseData {
         data: { [index: string]: FieldData };
         fields: string[];
       data: { [index: string]: FieldData };
       fields: string[];
+    }
     export class DataCollectionAccessProtocol {
         value: string;
         username: string;
         password: string;
       value: string;
       username: string;
       password: string;
+    }
     export class DataCollectionInterface {
         protocol: DataCollectionAccessProtocol;
         baseUrl: string;
         format: string;
         filter: string;
       protocol: DataCollectionAccessProtocol;
       baseUrl: string;
       format: string;
       filter: string;
+    }
     export class DataCollectionType {
         dataCollectionInterface: DataCollectionInterface;
         id: string;
         label: string;
         group: string;
       dataCollectionInterface: DataCollectionInterface;
       id: string;
       label: string;
       group: string;
+    }
     export class Document {
         map: { [index: string]: string[] };
         fieldNames: string[];
       map: { [index: string]: string[] };
       fieldNames: string[];
+    }
     export class FieldData {
         fieldRowList: FieldRow[];
         count: number[];
         values: string[];
       fieldRowList: FieldRow[];
       count: number[];
       values: string[];
+    }
     export class FieldRow {
         value: string;
         count: number;
       value: string;
       count: number;
+    }
     export class FormattedSearchResult {
         formattedResult: string;
         resultsNumber: number;
       formattedResult: string;
       resultsNumber: number;
+    }
     export class Hint {
         alternateTerm: string;
         autoFollowHint: boolean;
       alternateTerm: string;
       autoFollowHint: boolean;
+    }
     export class DriverResource implements Serializable {
         resourceId: string;
         resourceUri: string;
         resourceKind: string;
         resourceType: string;
         dateOfCreation: Date;
       resourceId: string;
       resourceUri: string;
       resourceKind: string;
       resourceType: string;
       dateOfCreation: Date;
+    }
     export class MDFormatDataStructure extends DriverResource {
         resourceName: string;
         layouts: { [index: string]: LayoutField[] };
       resourceName: string;
       layouts: { [index: string]: LayoutField[] };
+    }
     export class PiwikInfo implements IsSerializable {
         repositoryId: string;
         openaireId: string;
         repositoryName: string;
         country: string;
         siteId: string;
         authenticationToken: string;
         creationDate: Date;
         requestorName: string;
         requestorEmail: string;
         validated: boolean;
         validationDate: Date;
         comment: string;
       repositoryId: string;
       openaireId: string;
       repositoryName: string;
       country: string;
       siteId: string;
       authenticationToken: string;
       creationDate: Date;
       requestorName: string;
       requestorEmail: string;
       validated: boolean;
       validationDate: Date;
       comment: string;
+    }
     export class Repository extends DriverResource implements IsSerializable {
     export class DatasourceDetails {
       id: string;
       officialName: string;
       englishName: string;
       websiteUrl: string;
       logoUrl: string;
       contactEmail: string;
       countryName: string;
       countryCode: string;
       organization: string;
       openaireId: string;
       officialname: string;
       englishname: string;
       websiteurl: string;
       logourl: string;
       contactemail: string;
       latitude: number;
       longitude: number;
       timezone: number;
       namespacePrefix: string;
       odNumberOfItems: string;
       odNumberOfItemsDate: string;
       odPolicies: string;
       odLanguages: string;
       odContentTypes: string;
       collectedFrom: string;
       inferred: boolean;
       deletedByInference: boolean;
       trust: number;
       inferenceProvenance: string;
       dateOfValidation: Date;
       datasourceClass: string;
       provenanceActionClass: string;
       dateOfCollection: Date;
       typology: string;
       namespaceprefix: string;
       languages: string;
       dateofvalidation: Date;
       eoscDatasourceType: string;
       dateofcollection: Date;
       platform: string;
       activationId: string;
       mergehomonyms: boolean;
       description: string;
       releaseStartDate: Date;
       releaseEndDate: Date;
       missionStatementUrl: string;
       dataProvider: boolean;
       serviceProvider: boolean;
       databaseAccessType: string;
       dataUploadType: string;
       databaseAccessRestriction: string;
       dataUploadRestriction: string;
       versioning: boolean;
       citationGuidelineUrl: string;
       qualityManagementKind: string;
       pidSystems: string;
       certificates: string;
       aggregator: string;
       issn: string;
       eissn: string;
       lissn: string;
       interfaces: RepositoryInterface[];
       registeredby: string;
       subjects: string;
       aggregator: string;
       collectedfrom: string;
       managed: boolean;
       registrationdate: Date;
       consentTermsOfUseDate: Date;
       lastConsentTermsOfUseDate: Date;
       consentTermsOfUse: boolean;
       fullTextDownload: boolean;
       consentTermsOfUseDate: Date;
       lastConsentTermsOfUseDate: Date;
       availableDiskSpace: string;
       securityParameters: string;
       protocol: string;
       registeredBy: string;
       datasourceType: string;
       datasourceAggregatorId: string;
       datasourceOriginalIdValue: string;
       datasourceOriginalIdProvenance: string;
       datasourceAggregated: boolean;
       datasourceComplianceDegreeValue: string;
       datasourceComplianceDegreeEncoding: string;
       numberOfObjects: number;
       maxSizeOfDatastructure: number;
       maxNumberOfDataStructures: number;
       registered: boolean;
       extraFields: { [index: string]: string };
       organizations: OrganizationDetails[] = new Array<OrganizationDetails>();
       identities: IdentitiesDetails[];
       status: string;
       typology: string;
+    }
     export class Repository extends DatasourceDetails implements IsSerializable {
       timezone: number;
       interfaces: RepositoryInterface[];
       piwikInfo: PiwikInfo;
       environments: string[];
       registrationDate: Date;
       verified: boolean;
       namespacePrefix: string;
       dateOfValidation: Date;
       dateOfCollection: Date;
       dataCollectionTypes: DataCollectionType[];
+    }
-...
       officialname: string;
       englishname: string;
       websiteurl: string;
       typology: string;
       registeredby: string;
       organizations: Organization[];
       registrationdate: Date;
       piwikInfo: PiwikInfo;
       eoscDatasourceType: string;
       logoUrl: string;
       description: string;
       consentTermsOfUse: boolean;
       consentTermsOfUseDate: Date;
       lastConsentTermsOfUseDate: Date;
       fullTextDownload: boolean;
       consentTermsOfUseDate: Date;
       organizations: OrganizationDetails[];
       typology: string;
       piwikInfo: PiwikInfo;
+    }
     export class TermsOfUse {
-...
       consentTermsOfUseDate: Date;
+    }
     export class Organization {
       country: string;
       legalname: string;
       websiteurl: string;
       legalshortname: string;
       logourl: string;
+    }
     export class RepositoryAccessProtocol {
         value: string;
         username: string;
         password: string;
         filter: string;
       value: string;
       username: string;
       password: string;
       filter: string;
+    }
     export class RepositoryBlackboard {
         lastrequest: string;
         lastresponse: string;
         messages: RepositoryBlackboardMessage[];
       lastrequest: string;
       lastresponse: string;
       messages: RepositoryBlackboardMessage[];
+    }
     export class RepositoryBlackboardMessage {
         id: string;
         action: Action;
         actionStatus: ActionStatus;
         parameters: string[];
       id: string;
       action: Action;
       actionStatus: ActionStatus;
       parameters: string[];
+    }
     export class RepositoryComparator implements Comparator<Repository> {
+    }
     export class RepositoryInterface implements Serializable, IsSerializable {
       desiredCompatibilityLevel: string;
       complianceName: string;
       upgradeToV3: string;
       deleteApi: boolean;
       accessSet: string;
       accessFormat: string;
     // export class RepositoryInterface implements Serializable, IsSerializable {
     //   desiredCompatibilityLevel: string;
     //   complianceName: string;
     //   upgradeToV3: string;
     //   deleteApi: boolean;
     //   accessSet: string;
     //   accessFormat: string;
     //   metadataIdentifierPath: string;
     //   lastCollectionDate: string;
     //   nextScheduledExecution: string;
     //   status: string;
     //   collectedFrom: string;
     //   id: string;
     //   typology: string;
     //   compatibility: string;
     //   contentdescription: string;
     //   protocol: string;
     //   baseurl: string;
     //   active: boolean;
     //   removable: boolean;
     //   apiParams: { [index: string]: string };
     //   extraFields: { [index: string]: string };
     //   comments: string;
     // }
     export class ApiDetails {
       id: string;
       protocol: string;
       datasource: string;
       contentdescription: string;
       eoscDatasourceType: string;
       compatibility: string;
       compatibilityOverride: string;
       lastCollectionTotal: number;
       lastCollectionDate: Date;
       lastAggregationTotal: number;
       lastAggregationDate: Date;
       lastDownloadTotal: number;
       lastDownloadDate: Date;
       baseurl: string;
       removable: boolean;
       apiParams: ApiParamDetails[] = new Array<ApiParamDetails>();
       metadataIdentifierPath: string;
       lastCollectionDate: string;
       nextScheduledExecution: string;
       status: string;
       collectedFrom: string;
       id: string;
       typology: string;
       compliance: string;
       contentDescription: string;
       accessProtocol: string;
       baseUrl: string;
       active: boolean;
       removable: boolean;
       accessParams: { [index: string]: string };
       extraFields: { [index: string]: string };
       comments: string;
+    }
     export class RepositoryInterface extends ApiDetails {
+    }
     export class ApiParamDetails {
       param: string;
       value: string;
       constructor(param, value) {
         this.param = param;
         this.value = value;
+      }
+    }
     export class SearchCriteriaImpl implements SearchCriteria {
         startsWith: string;
         endsWith: string;
         contains: string;
       startsWith: string;
       endsWith: string;
       contains: string;
+    }
     export class RepositorySearchCriteria extends SearchCriteriaImpl implements SearchCriteria {
         haveDocuments: boolean;
         protocolType: string;
         adminInfo: string;
         officialName: string;
         registeredBy: string;
         country: string;
         verified: boolean;
       haveDocuments: boolean;
       protocolType: string;
       adminInfo: string;
       officialName: string;
       registeredBy: string;
       country: string;
       verified: boolean;
+    }
     export class SearchResult {
         query: string;
         locale: string;
         total: number;
         page: number;
         size: number;
         fields: string[];
         searchResults: string[];
         browseResults: string[];
       query: string;
       locale: string;
       total: number;
       page: number;
       size: number;
       fields: string[];
       searchResults: string[];
       browseResults: string[];
+    }
     export class SimilarDocument {
         id: string;
         score: number;
       id: string;
       score: number;
+    }
     export class StoreInfo {
         serviceUrl: string;
         storeId: string;
       serviceUrl: string;
       storeId: string;
+    }
     export class StoreObjectInfo {
         storeInfo: StoreInfo;
         objectId: string;
       storeInfo: StoreInfo;
       objectId: string;
+    }
     export class SuggestiveResult {
         epr: EPR;
         alternativeTerm: string;
         autofollow: boolean;
       epr: EPR;
       alternativeTerm: string;
       autofollow: boolean;
+    }
     export class CustomProperties implements IsSerializable {
         properties: { [index: string]: string };
       properties: { [index: string]: string };
+    }
     export class JobForValidation implements IsSerializable {
         officialName: string;
         baseUrl: string;
         userEmail: string;
         validationSet: string;
         datasourceId: string;
         interfaceId: string;
         desiredCompatibilityLevel: string;
         activationId: string;
         repoType: string;
         interfaceIdOld: string;
         groupByXpath: string;
         metadataPrefix: string;
         records: number;
         registration: boolean;
         updateExisting: boolean;
         cris: boolean;
         crisReferentialChecks: boolean;
         selectedCrisEntities: string[];
         selectedContentRules: number[];
         selectedUsageRules: number[];
         adminEmails: string[];
       officialName: string;
       baseUrl: string;
       userEmail: string;
       validationSet: string;
       datasourceId: string;
       interfaceId: string;
       desiredCompatibilityLevel: string;
       activationId: string;
       repoType: string;
       interfaceIdOld: string;
       groupByXpath: string;
       metadataPrefix: string;
       records: number;
       registration: boolean;
       updateExisting: boolean;
       cris: boolean;
       crisReferentialChecks: boolean;
       selectedCrisEntities: string[];
       selectedContentRules: number[];
       selectedUsageRules: number[];
       adminEmails: string[];
+    }
     export class JobResultEntry implements IsSerializable {
         name: string;
         description: string;
         successes: string;
         weight: number;
         errors: string[];
         ruleId: number;
         hasErrors: boolean;
         mandatory: boolean;
         type: string;
       name: string;
       description: string;
       successes: string;
       weight: number;
       errors: string[];
       ruleId: number;
       hasErrors: boolean;
       mandatory: boolean;
       type: string;
+    }
     export class Rule implements IsSerializable {
         id: number;
         name: string;
         description: string;
         type: string;
         mandatory: boolean;
         weight: number;
         provider_information: string;
         job_type: string;
         entity_type: string;
         for_cris: boolean;
         configuration: CustomProperties;
       id: number;
       name: string;
       description: string;
       type: string;
       mandatory: boolean;
       weight: number;
       provider_information: string;
       job_type: string;
       entity_type: string;
       for_cris: boolean;
       configuration: CustomProperties;
+    }
     export class RuleSet implements Serializable, IsSerializable {
         id: number;
         name: string;
         description: string;
         guidelinesAcronym: string;
         shortName: string;
         visibility: string[];
         contentRules: Rule[];
         usageRules: Rule[];
         contentRulesIds: number[];
         usageRulesIds: number[];
       id: number;
       name: string;
       description: string;
       guidelinesAcronym: string;
       shortName: string;
       visibility: string[];
       contentRules: Rule[];
       usageRules: Rule[];
       contentRulesIds: number[];
       usageRulesIds: number[];
+    }
     export class StoredJob extends JobForValidation implements IsSerializable {
         contentJobStatus: string;
         usageJobStatus: string;
         started: string;
         ended: string;
         duration: string;
         error: string;
         validationType: string;
         jobType: string;
         guidelinesShortName: string;
         validationStatus: string;
         recordsTested: number;
         id: number;
         contentJobScore: number;
         usageJobScore: number;
         rules: number[];
         resultEntries: JobResultEntry[];
         filteredScores: { [index: string]: number };
       contentJobStatus: string;
       usageJobStatus: string;
       started: string;
       ended: string;
       duration: string;
       error: string;
       validationType: string;
       jobType: string;
       guidelinesShortName: string;
       validationStatus: string;
       recordsTested: number;
       id: number;
       contentJobScore: number;
       usageJobScore: number;
       rules: number[];
       resultEntries: JobResultEntry[];
       filteredScores: { [index: string]: number };
+    }
     export class AdvQueryObject implements IsSerializable {
         datasource: string;
         topic: string;
         titles: string[];
         subjects: string[];
         authors: string[];
         dates: Range[];
         trust: Range;
         page: number;
       datasource: string;
       topic: string;
       titles: string[];
       subjects: string[];
       authors: string[];
       dates: Range[];
       trust: Range;
       page: number;
+    }
     export class BrowseEntry implements Comparable<BrowseEntry>, IsSerializable {
         value: string;
         size: number;
       value: string;
       size: number;
+    }
     export class ConditionParams implements IsSerializable {
         value: string;
         otherValue: string;
       value: string;
       otherValue: string;
+    }
     export class OaBrokerRelatedDataset implements IsSerializable {
         openaireId: string;
         originalId: string;
         title: string;
         collectedFrom: string;
         pids: OaBrokerTypedValue[];
         instances: OaBrokerInstance[];
       openaireId: string;
       originalId: string;
       title: string;
       collectedFrom: string;
       pids: OaBrokerTypedValue[];
       instances: OaBrokerInstance[];
+    }
     export class DatasourcesBroker implements IsSerializable {
         datasourcesOfUser: Tuple<BrowseEntry, string>[];
         sharedDatasources: Tuple<BrowseEntry, string>[];
         datasourcesOfOthers: Tuple<BrowseEntry, string>[];
       datasourcesOfUser: Tuple<BrowseEntry, string>[];
       sharedDatasources: Tuple<BrowseEntry, string>[];
       datasourcesOfOthers: Tuple<BrowseEntry, string>[];
+    }
     export class OaBrokerRelatedDatasource implements IsSerializable {
-...
+    }
     export class EventsPage implements IsSerializable {
         datasource: string;
         topic: string;
         currPage: number;
         totalPages: number;
         total: number;
         values: OaBrokerEventPayload[];
       datasource: string;
       topic: string;
       currPage: number;
       totalPages: number;
       total: number;
       values: OaBrokerEventPayload[];
+    }
     export class OaBrokerExternalReference implements IsSerializable {
         url: string;
         sitename: string;
         type: string;
         refidentifier: string;
       url: string;
       sitename: string;
       type: string;
       refidentifier: string;
+    }
     export class OaBrokerInstance implements IsSerializable {
         url: string;
         license: string;
         hostedby: string;
         instancetype: string;
       url: string;
       license: string;
       hostedby: string;
       instancetype: string;
+    }
     export class OaBrokerJournal implements IsSerializable {
         name: string;
         issn: string;
         eissn: string;
         lissn: string;
       name: string;
       issn: string;
       eissn: string;
       lissn: string;
+    }
     export class MapConditions implements IsSerializable {
         field: string;
         fieldType: MapValueType;
         operator: ConditionOperator;
         listParams: ConditionParams[];
       field: string;
       fieldType: MapValueType;
       operator: ConditionOperator;
       listParams: ConditionParams[];
+    }
     export class OaBrokerEventPayload implements IsSerializable {
         result: OaBrokerMainEntity; // old publication: Publication; ??
         highlight: OaBrokerMainEntity;
         provenance: OaBrokerProvenance;
         trust: number;
       result: OaBrokerMainEntity; // old publication: Publication; ??
       highlight: OaBrokerMainEntity;
       provenance: OaBrokerProvenance;
       trust: number;
+    }
     export class OaBrokerAuthor implements IsSerializable {
-...
+    }
     export class OpenaireSubscription implements IsSerializable {
         subscriber: string;
         frequency: NotificationFrequency;
         mode: NotificationMode;
         query: AdvQueryObject;
       subscriber: string;
       frequency: NotificationFrequency;
       mode: NotificationMode;
       query: AdvQueryObject;
+    }
     export class OaBrokerTypedValue implements IsSerializable {
         value: string;
         type: string;
       value: string;
       type: string;
+    }
     export class OaBrokerProject implements IsSerializable {
         openaireId: string;
         code: string;
         acronym: string;
         title: string;
         funder: string;
         fundingProgram: string;
         jurisdiction: string;
       openaireId: string;
       code: string;
       acronym: string;
       title: string;
       funder: string;
       fundingProgram: string;
       jurisdiction: string;
+    }
     export class OaBrokerProvenance implements IsSerializable {
         repositoryName: string;
         repositoryType: string;
         url: string;
         id: string;
       repositoryName: string;
       repositoryType: string;
       url: string;
       id: string;
+    }
     export class OaBrokerRelatedPublication implements IsSerializable {
-...
+    }
     export class OaBrokerMainEntity implements IsSerializable {
         openaireId: string;
         originalId: string;
         typology: string;
         titles: string[];
         abstracts: string[];
         language: string;
         subjects: OaBrokerTypedValue[];
         creators: OaBrokerAuthor[];
         publicationdate: string;
         publisher: string;
         embargoenddate: string;
         contributor: string[];
         journal: OaBrokerJournal;
         pids: OaBrokerTypedValue[];
         instances: OaBrokerInstance[];
         externalReferences: OaBrokerExternalReference[];
         publications: OaBrokerRelatedPublication[];
         projects: OaBrokerProject[];
         datasets: OaBrokerRelatedDataset[];
         softwares: OaBrokerRelatedSoftware[];
         datasources: OaBrokerRelatedDatasource[];
       openaireId: string;
       originalId: string;
       typology: string;
       titles: string[];
       abstracts: string[];
       language: string;
       subjects: OaBrokerTypedValue[];
       creators: OaBrokerAuthor[];
       publicationdate: string;
       publisher: string;
       embargoenddate: string;
       contributor: string[];
       journal: OaBrokerJournal;
       pids: OaBrokerTypedValue[];
       instances: OaBrokerInstance[];
       externalReferences: OaBrokerExternalReference[];
       publications: OaBrokerRelatedPublication[];
       projects: OaBrokerProject[];
       datasets: OaBrokerRelatedDataset[];
       softwares: OaBrokerRelatedSoftware[];
       datasources: OaBrokerRelatedDatasource[];
+    }
     export class Range implements IsSerializable {
         min: string;
         max: string;
       min: string;
       max: string;
+    }
     export class SimpleSubscriptionDesc implements IsSerializable {
         id: string;
         datasource: string;
         topic: string;
         count: number;
         creationDate: Date;
         lastNotificationDate: Date;
       id: string;
       datasource: string;
       topic: string;
       count: number;
       creationDate: Date;
       lastNotificationDate: Date;
+    }
     export class OaBrokerRelatedSoftware implements IsSerializable {
-...
+    }
     export class Subscription implements IsSerializable {
         subscriptionId: string;
         subscriber: string;
         topic: string;
         frequency: NotificationFrequency;
         mode: NotificationMode;
         creationDate: Date;
         lastNotificationDate: Date;
         conditions: string;
         conditionsAsList: MapConditions[];
       subscriptionId: string;
       subscriber: string;
       topic: string;
       frequency: NotificationFrequency;
       mode: NotificationMode;
       creationDate: Date;
       lastNotificationDate: Date;
       conditions: string;
       conditionsAsList: MapConditions[];
+    }
     export class LayoutField {
         name: string;
         xpath: string;
         type: string;
         indexable: boolean;
         result: boolean;
         stat: boolean;
         tokenizable: boolean;
       name: string;
       xpath: string;
       type: string;
       indexable: boolean;
       result: boolean;
       stat: boolean;
       tokenizable: boolean;
+    }
     export interface IsSerializable {
-...
+    }
     export class EPR {
         epr: string;
         address: string;
         serviceName: string;
         endpointName: string;
         parameterNames: string[];
       epr: string;
       address: string;
       serviceName: string;
       endpointName: string;
       parameterNames: string[];
+    }
     export class Tuple<K, V> implements IsSerializable {
         first: K;
         second: V;
       first: K;
       second: V;
+    }
     export interface Comparator<T> {
-...
     export interface Comparable<T> {
+    }
     export type ConditionOperator = "EXACT" | "MATCH_ANY" | "MATCH_ALL" | "RANGE";
     export type ConditionOperator = 'EXACT' | 'MATCH_ANY' | 'MATCH_ALL' | 'RANGE';
     export type MapValueType = "STRING" | "INTEGER" | "FLOAT" | "DATE" | "BOOLEAN" | "LIST_STRING" | "LIST_INTEGER" | "LIST_FLOAT" | "LIST_DATE" | "LIST_BOOLEAN";
     export type MapValueType =
       'STRING'
       | 'INTEGER'
       | 'FLOAT'
       | 'DATE'
       | 'BOOLEAN'
       | 'LIST_STRING'
       | 'LIST_INTEGER'
       | 'LIST_FLOAT'
       | 'LIST_DATE'
       | 'LIST_BOOLEAN';
     export type NotificationFrequency = "never" | "realtime" | "daily" | "weekly" | "monthly";
     export type NotificationFrequency = 'never' | 'realtime' | 'daily' | 'weekly' | 'monthly';
     export type NotificationMode = "MOCK" | "EMAIL";
     export type NotificationMode = 'MOCK' | 'EMAIL';
     export type Action = "CREATE" | "DELETE" | "UPDATE" | "MANAGE" | "RELEASE" | "CANCEL";
     export type Action = 'CREATE' | 'DELETE' | 'UPDATE' | 'MANAGE' | 'RELEASE' | 'CANCEL';
     export type ActionStatus = "DONE" | "ONGOING" | "FAILED" | "WAITING" | "ASSIGNED";
     export type ActionStatus = 'DONE' | 'ONGOING' | 'FAILED' | 'WAITING' | 'ASSIGNED';
     export class Country {
       name: string;
       code: string;
-...
       lastTransformation: AggregationDetails[];
+    }
     export class UserInfo implements  IsSerializable {
     export class UserInfo implements IsSerializable {
       sub: string;
       role: string[];
       name: string;
-...
       lastName: string;
       email: string;
+    }
     export class OrganizationDetails {
       legalshortname: string;
       legalname: string;
       websiteurl: string;
       logourl: string;
       country: string;
+    }
     export class IdentitiesDetails {
       pid: string;
       issuertype: string;
+    }

                       <!-- REPOSITORY CARD -->
                       <div *ngFor="let res of repositorySnippet" class="md-card repositoryCard">
                         <div class="md-card-content large-padding">
                           <div class="uk-text-meta">{{res.typology.split('::')[0]}}  {{res.typology.split('::')[1]}}  {{res.typology.split('::')[2]}}</div>
                           <div class="uk-text-meta">{{res.eoscDatasourceType.split('::')[0]}}  {{res.eoscDatasourceType.split('::')[1]}}  {{res.eoscDatasourceType.split('::')[2]}}</div>
                           <div class="repositoryCardHeader uk-margin-bottom uk-margin-small-top"><a [routerLink]="['/repositoryAdmin/' + res.id]">{{res.officialname}}</a></div>
                           <div class="uk-margin-small-bottom"><span class="uk-badge uk-badge-primary uk-badge-notification uk-margin-small-right">ID</span>{{res.id}}</div>
                           <div class="uk-margin-small-bottom"><span class="uk-badge uk-badge-primary uk-badge-notification uk-margin-small-right">RM</span>{{res.registeredby}}</div>

       countries: Country[] = [];
       datasourceClasses: Map<string, string> = new Map<string, string>();
       classCodes: string[] = [];
       // classCodes: string[] = [];
       @Input() mode: string;
-...
         softwarePlatform : ['', Validators.required],
         platformName : '',
         officialName : ['', Validators.required],
         issn : ['', [Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$')] ],
         eissn : ['', Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$') ],
         lissn : ['', Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$') ],
         issn : ['', [Validators.pattern('^(\\d{4}-\\d{3}[\\dxX])|([0-9]{7}[\\dxX]$)')] ],
         eissn : ['', Validators.pattern('^(\\d{4}-\\d{3}[\\dxX])|([0-9]{7}[\\dxX]$)') ],
         lissn : ['', Validators.pattern('^(\\d{4}-\\d{3}[\\dxX])|([0-9]{7}[\\dxX]$)') ],
         repoDescription : ['', Validators.required],
         country : ['', Validators.required],
         longtitude : ['', [Validators.required, Validators.min(-180), Validators.max(180)] ],
-...
         this.group = this.fb.group(this.groupDefinition);
         if (this.mode === 'journal') {
           this.group.get('issn').clearValidators();
           this.group.get('issn').setValidators([Validators.required, Validators.pattern('^\\d{4}-\\d{3}[\\dxX]$')]);
           this.group.get('issn').setValidators([Validators.required, Validators.pattern('^(\\d{4}-\\d{3}[\\dxX])|([0-9]{7}[\\dxX]$)')]);
+        }
         this.getTypologies();
         this.getTimezones();
-...
       setupForm() {
         if (this.selectedRepo) {
           console.log(`my datasource type is: ${this.selectedRepo.datasourceType}`);
           console.log(`my datasource type is: ${this?.selectedRepo?.eoscDatasourceType}`);
           this.group.setValue({
             softwarePlatform: this.selectedRepo.typology,
             softwarePlatform: this.selectedRepo.platform,
             platformName: '',
             officialName: this.selectedRepo.officialName,
             officialName: this.selectedRepo.officialname,
             issn: '',
             eissn: '',
             lissn: '',
             repoDescription: this.selectedRepo.description,
             country: this.selectedRepo.countryCode,
             country: this.selectedRepo.organizations[0].country, // countryCode
             longtitude: this.selectedRepo.longitude,
             latitude: this.selectedRepo.latitude,
             websiteUrl: this.selectedRepo.websiteUrl,
             institutionName: this.selectedRepo.organization,
             englishName: this.selectedRepo.englishName,
             logoUrl: this.selectedRepo.logoUrl,
             websiteUrl: this.selectedRepo.websiteurl,
             institutionName: this.selectedRepo.organizations[0].legalname,
             englishName: this.selectedRepo.englishname,
             logoUrl: this.selectedRepo.logourl,
             timezone: this.selectedRepo.timezone,
             datasourceType: this.selectedRepo.datasourceClass,
             adminEmail: this.selectedRepo.contactEmail
             datasourceType: this.selectedRepo.eoscDatasourceType, // TODO: still needed?
             adminEmail: this.selectedRepo.contactemail
           });
           if (this.selectedRepo.datasourceType === 'journal') {
           if (this.selectedRepo.eoscDatasourceType === 'Journal archive') {
             let ssnToShow = this.selectedRepo.issn.slice(0, 4) + '-' + this.selectedRepo.issn.toString().slice(4);
             this.group.get('issn').setValue(ssnToShow);
-...
       getDatasourceClasses() {
         this.repoService.getDatasourceClasses(this.mode).subscribe(
           classes => this.datasourceClasses = classes,
           classes => {
             for (const [key, value] of Object.entries(classes)) {
               this.datasourceClasses.set(key, value);
+            }
           },
           error => {
             this.errorMessage = noServiceMessage;
             console.log(error);
           },
           () => {
             for (const key of Object.keys(this.datasourceClasses)) {
               this.classCodes.push(key);
+            }
             this.classCodes = Array.from(this.datasourceClasses.keys());
+          }
         );
+      }
-...
+      }
       createNewRepository(): Repository {
         const newRepo: Repository = new Repository();
         newRepo.officialName = this.group.get('officialName').value.toString();
         newRepo.englishName = this.group.get('englishName').value.toString();
         newRepo.websiteUrl = this.group.get('websiteUrl').value;
         newRepo.logoUrl = this.group.get('logoUrl').value;
         newRepo.contactEmail = this.group.get('adminEmail').value;
         newRepo.countryName = this.countries.filter(x => x.code === this.group.get('country').value)[0].name;
         newRepo.countryCode = this.group.get('country').value;
         newRepo.organization = this.group.get('institutionName').value.toString();
         const newRepo = new Repository();
         newRepo.officialname = this.group.get('officialName').value.toString();
         newRepo.englishname = this.group.get('englishName').value.toString();
         newRepo.websiteurl = this.group.get('websiteUrl').value;
         newRepo.logourl = this.group.get('logoUrl').value;
         newRepo.contactemail = this.group.get('adminEmail').value;
         newRepo.organizations.push({
           legalshortname: null,
           legalname: this.group.get('institutionName').value.toString(),
           websiteurl: null,
           logourl: null,
           country: this.group.get('country').value
         });
         newRepo.latitude = this.group.get('latitude').value;
         newRepo.longitude = this.group.get('longtitude').value;
         newRepo.timezone = this.group.get('timezone').value;
         newRepo.datasourceClass = this.group.get('datasourceType').value;
         if (this.group.get('softwarePlatform').value ) {
           newRepo.typology = this.group.get('softwarePlatform').value;
         if (this.group.get('softwarePlatform').value !== '') {
           console.log('1//', this.group.get('softwarePlatform').value);
           newRepo.platform = this.group.get('softwarePlatform').value;
         } else if (this.group.get('platformName').value) {
           newRepo.typology = this.group.get('platformName').value;
           newRepo.platform = this.group.get('platformName').value;
           console.log('2//', this.group.get('platformName').value);
+        }
         // newRepo.typology = this.group.get('softwarePlatform').value;
         newRepo.typology = this.group.get('datasourceType').value;
         // newRepo.eoscDatasourceType = this.datasourceClasses.get(this.group.get('datasourceType').value);
         // console.warn(newRepo.eoscDatasourceType);
         newRepo.description = this.group.get('repoDescription').value.toString();
         newRepo.issn = '';
         newRepo.eissn = '';
-...
+          }
+        }
         newRepo.registeredBy = this.authService.getUserEmail();
         newRepo.registeredby = this.authService.getUserEmail();
         /* THE BELOW FIELDS ARE NOT SET IN GWT CODE*/
         newRepo.datasourceType = this.mode;
         newRepo.dateOfCreation = new Date(Date.now()); // NOT NEEDED ??
         newRepo.registered = true;
         newRepo.registrationDate = new Date(Date.now()); // NOT NEEDED ??
         newRepo.eoscDatasourceType = this.mode; // TODO: delete this?
         console.warn(newRepo.eoscDatasourceType);
         newRepo.managed = true;
         const now = new Date(Date.now());
         newRepo.consentTermsOfUseDate = now;
         newRepo.lastConsentTermsOfUseDate = now;
         newRepo.registrationdate = now;
         return newRepo;
+      }

     import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
     import { FormBuilder, FormGroup, Validators } from '@angular/forms';
     import { baseUrlDesc, compatibilityLevelDesc, customValSetDesc, Description, existingValSetDesc, commentDesc } from '../../../domain/oa-description';
     import { InterfaceInformation, RepositoryInterface } from '../../../domain/typeScriptClasses';
     import {ApiParamDetails, InterfaceInformation, RepositoryInterface} from '../../../domain/typeScriptClasses';
     import { ValidatorService } from '../../../services/validator.service';
     import { RepositoryService } from '../../../services/repository.service';
     import { formErrorWasntSaved, formInfoLoading, formSubmitting, formSuccessAddedInterface, formSuccessUpdatedInterface, invalidCustomBaseUrl,
-...
       repoInterfaceForm: FormGroup;
       readonly repoInterfaceFormDef = {
         baseUrl: ['', Validators.required],
         baseurl: ['', Validators.required],
         selectValidationSet: [''],
         customValidationSet: [''],
         compatibilityLevel: [''],
-...
           this.chooseValSet(true);
           if (this.data[3]) {
             this.currentInterface = this.data[3];
             this.repoInterfaceForm.get('baseUrl').setValue(this.currentInterface.baseUrl);
             this.repoInterfaceForm.get('compatibilityLevel').setValue(this.currentInterface.desiredCompatibilityLevel);
             this.repoInterfaceForm.get('baseurl').setValue(this.currentInterface.baseurl);
             this.repoInterfaceForm.get('compatibilityLevel').setValue(this.currentInterface.compatibilityOverride);
+          }
           this.getInterfaceInfo();
           this.getCompatibilityClasses();
-...
         this.successMessage = '';
         this.errorMessage = '';
         const  baseUrl = this.repoInterfaceForm.get('baseUrl').value;
         if (baseUrl) {
         const  baseurl = this.repoInterfaceForm.get('baseurl').value;
         if (baseurl) {
           this.loadingMessage = formInfoLoading;
           this.valService.getInterfaceInformation(baseUrl).subscribe(
           this.valService.getInterfaceInformation(baseurl).subscribe(
             info => {
               this.interfaceInfo = info;
               if (this.interfaceInfo.identified) {
-...
                 this.showIdentifiedBaseUrl = true;
               } else {
                 this.errorMessage = invalidCustomBaseUrl;
                 this.identifiedBaseUrl = true;  // pass interface without baseUrl identification
                 this.identifiedBaseUrl = true;  // pass interface without baseurl identification
                 this.showIdentifiedBaseUrl = false;
+              }
               if (this.interfaceInfo.sets) {
                 this.valsetList = this.interfaceInfo.sets;
                 console.log(this.valsetList);
                 // console.log(this.valsetList);
+              }
             },
             error => {
-...
               this.errorMessage = noServiceMessage;
             },
             () => {
               if ( this.currentInterface && this.currentInterface.accessParams && this.currentInterface.accessParams['set'] ) {
                 if ( this.valsetList.some( x => x === this.currentInterface.accessParams['set']) ) {
                   this.repoInterfaceForm.get('selectValidationSet').setValue(this.currentInterface.accessParams['set']);
               if ( this.currentInterface && this.currentInterface.apiParams && this.currentInterface.apiParams.find(entry => entry.param === 'set')) {
                 if ( this.valsetList.some( x => x === this.currentInterface.apiParams['set']) ) {
                   this.repoInterfaceForm.get('selectValidationSet').setValue(this.currentInterface.apiParams.find(entry => entry.param === 'set').value);
                 } else {
                   this.repoInterfaceForm.get('customValidationSet').setValue(this.currentInterface.accessParams['set']);
                   this.repoInterfaceForm.get('customValidationSet').setValue(this.currentInterface.apiParams.find(entry => entry.param === 'set').value);
+                }
+              }
               this.loadingMessage = '';
-...
       getExistingCompatibilityLevel() {
         if (this.currentInterface) {
           if (this.currentInterface.desiredCompatibilityLevel &&
             this.classCodes.some( x => x === this.currentInterface.desiredCompatibilityLevel ) ) {
             this.existingCompLevel = this.compClasses[this.currentInterface.desiredCompatibilityLevel];
           if (this.currentInterface.compatibilityOverride &&
             this.classCodes.some( x => x === this.currentInterface.compatibilityOverride ) ) {
             this.existingCompLevel = this.compClasses[this.currentInterface.compatibilityOverride];
           } else {
             this.repoInterfaceForm.get('compatibilityLevel').setValue('');
             this.existingCompLevel = this.currentInterface.desiredCompatibilityLevel;
             this.existingCompLevel = this.currentInterface.compatibilityOverride;
+          }
+        }
+      }
-...
         this.errorMessage = '';
         this.successMessage = '';
         if (this.formIsValid()) {
           const baseUrl = this.repoInterfaceForm.get('baseUrl').value;
           const baseurl = this.repoInterfaceForm.get('baseurl').value;
           let valset = '';
           if (this.existingValSet) {
             valset = this.repoInterfaceForm.get('selectValidationSet').value;
-...
+          }
           if (this.currentInterface) {
             this.updateCurrent(baseUrl, valset, compLvl, comment);
             this.updateCurrent(baseurl, valset, compLvl, comment);
           } else {
             this.addCurrent(baseUrl, valset, compLvl, comment);
             this.addCurrent(baseurl, valset, compLvl, comment);
+          }
         } else {
           this.interfaceToExport = null;
-...
+      }
       getCurrentValues() {
         console.log('getcurrentvalues');
         let intrf = this.currentInterface;
         if (intrf == null) {
           intrf = new RepositoryInterface();
+        }
         intrf.baseUrl = this.repoInterfaceForm.get('baseUrl').value;
         if (this.existingValSet) {
           intrf.accessSet = this.repoInterfaceForm.get('selectValidationSet').value;
           intrf.accessParams = {'set': this.repoInterfaceForm.get('selectValidationSet').value};
         } else {
           intrf.accessSet = this.repoInterfaceForm.get('customValidationSet').value;
           intrf.accessParams = {'set': this.repoInterfaceForm.get('customValidationSet').value};
+        }
         intrf.baseurl = this.repoInterfaceForm.get('baseurl').value;
         this.updateValidationSet(intrf, this.repoInterfaceForm.get(this.existingValSet ? 'selectValidationSet' : 'customValidationSet').value);
         console.log(intrf);
         if (this.repoInterfaceForm.get('compatibilityLevel').value) {
           intrf.desiredCompatibilityLevel = this.repoInterfaceForm.get('compatibilityLevel').value;
           intrf.compliance = this.repoInterfaceForm.get('compatibilityLevel').value;
           intrf.compatibilityOverride = this.repoInterfaceForm.get('compatibilityLevel').value;
           intrf.compatibility = this.repoInterfaceForm.get('compatibilityLevel').value;
         } else {
           intrf.desiredCompatibilityLevel = this.existingCompLevel;
           intrf.compliance = this.existingCompLevel;
           intrf.compatibilityOverride = this.existingCompLevel;
           intrf.compatibility = this.existingCompLevel;
+        }
         intrf.typology = this.currentRepo.datasourceClass;
         return intrf;
+      }

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 62389

Added by Andreas Mantas over 1 year ago