diff --git a/.github/ISSUE_TEMPLATE/re3gistry-discussion.md b/.github/ISSUE_TEMPLATE/re3gistry-discussion.md deleted file mode 100644 index 8f51f037..00000000 --- a/.github/ISSUE_TEMPLATE/re3gistry-discussion.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: Start a discussion -about: Start a discussion or raise a question on the Re3gistry - ---- - -Please replace these lines with your question or discussion topic. diff --git a/.github/ISSUE_TEMPLATE/re3gistry-improvement-proposal.md b/.github/ISSUE_TEMPLATE/re3gistry-improvement-proposal.md deleted file mode 100644 index ec4d4db1..00000000 --- a/.github/ISSUE_TEMPLATE/re3gistry-improvement-proposal.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: Re3gistry Improvement Proposal -about: GitHub issue which proposes an improvement of the Re3gistry - ---- - -_Please follow the template below and provide at least information for -the first 4 sections_ - -# Background and Motivation -Explain the problem behind this proposal. If the problem has already been -discussed externally, please add a link. Source code or data snippets, -diagrams, graphics that illustrate the problem are welcome. - -# Proposed change -Explain what should be changed in the software. Mockups, screenshots, diagrams -or other graphics are welcome. - -# Alternatives -Describe alternative solutions/features that have been considered. - -# Funding -Is there full or partial funding available for implementing this proposal? - -# Additional information -This is an optional section for additional information. These could include, -for example: -- the impact of this improvement proposal, known risks or compatibility issues -on existing deployments. -- (time) constraints, if this proposal is fully or partially funded diff --git a/.github/ISSUE_TEMPLATE/re3gistry-problem.md b/.github/ISSUE_TEMPLATE/re3gistry-problem.md deleted file mode 100644 index 63f0a1dd..00000000 --- a/.github/ISSUE_TEMPLATE/re3gistry-problem.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Report a problem or bug -about: Open an issue to report a problem with the Re3gistry - ---- - -Please replace these lines with a brief summary of your issue and the expected -behaviour. - -To help us investigate the issue, you may want to include: - -- [ ] a description of the steps to reproduce your issue -- [ ] the browser and version used -- [ ] a screenshot illustrating the problem -- [ ] the Test Report (ideally as an attachment to the issue) -- [ ] the name of the Test that failed or better: change the `Level of Detail` -in the Report by clicking on `All Details`, then scroll down to the failed test -and copy the Link on the right-hand side of the `Assertion URI` -- [ ] the URL of your service / the file you have uploaded or referenced (as -an attachment). - -If your service is protected or you have confidential data that you cannot -upload here, you can request an email address to which you can send URLs / files. -Please note that issues cannot be investigated for services/datasets that we cannot -access. diff --git a/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties b/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties index 87d9f035..0b05f9fe 100644 --- a/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties +++ b/sources/Re3gistry2/src/main/resources/configurations_files/configuration.properties @@ -33,7 +33,7 @@ application.persistenceunitname=Re3gistry2 # Application version -application.version=Version: 2.4.2 +application.version=Version: 2.5.1 # Localization application.language.available=en diff --git a/sources/Re3gistry2/src/main/webapp/jsp/ajaxServices/browseLoader.jsp b/sources/Re3gistry2/src/main/webapp/jsp/ajaxServices/browseLoader.jsp index 9e92874a..dd8cde1a 100644 --- a/sources/Re3gistry2/src/main/webapp/jsp/ajaxServices/browseLoader.jsp +++ b/sources/Re3gistry2/src/main/webapp/jsp/ajaxServices/browseLoader.jsp @@ -189,6 +189,7 @@ request.setCharacterEncoding("UTF-8"); %> +
    <% if (!registryURI.isEmpty() && !registryLabel.isEmpty()) { diff --git a/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp b/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp index 92792004..7d88df37 100644 --- a/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp +++ b/sources/Re3gistry2/src/main/webapp/jsp/includes/footer.inc.jsp @@ -30,7 +30,7 @@
    Re3gistry version 2.4.2 + class="ecl-footer-core__title ecl-link ecl-link--standalone">Re3gistry version 2.5.1
    diff --git a/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegBulkImportHandler.java b/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegBulkImportHandler.java index 35f2b95a..f8636038 100644 --- a/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegBulkImportHandler.java +++ b/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegBulkImportHandler.java @@ -882,7 +882,7 @@ private void storeItems(HashMap> itemsBulkIm RegItemclass regItemclassChild = getItemClassChildren(regItemContainer); if (regItemclassChild != null) { - RegAction regAction = new RegAction(); + RegAction regAction = addRegActionForAllProposedItemsCSV(regUser, regItemContainer, regItemclassChild); if (regAction != null) { storeProposedItems(itemsBulkImport, regItemContainer, regUser, regItemclassChild, regAction, request, additionLines); try { @@ -1251,7 +1251,8 @@ private void storeProposedItems(HashMap> ite items.getValue().get(0).getRegFieldsHashMap().values(); HashMap fields = items.getValue().get(0).getRegFieldsHashMap(); RegItem regItemIterator = regItemManager.getByLocalidAndRegItemClass(items.getKey(), regItemclassChild); - regItemproposedHandler.completeCopyRegItemToRegItemporposedBulkEdit(regItemIterator, regUser, fields); + String language = items.getValue().get(0).getLanguage().getUuid(); + regItemproposedHandler.completeCopyRegItemToRegItemporposedBulkEdit(regItemIterator, regUser, fields, additionLines, language); } } catch (Exception ex) { diff --git a/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegItemproposedHandler.java b/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegItemproposedHandler.java index 9e2fc95b..f117c954 100644 --- a/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegItemproposedHandler.java +++ b/sources/Re3gistry2JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegItemproposedHandler.java @@ -1222,6 +1222,92 @@ private void copyRegRelationsToRegRelationproposeds(RegItem regItem, RegItemprop regLocalizationproposedManager.add(regLocalizationproposed); } } +private void copyRegRelationsToRegRelationproposedsBulkEdit(RegItem regItem, RegItemproposed regItemproposed, HashMap fields, ArrayList additionLines, String language) throws Exception { + RegRelationManager regRelationManager = new RegRelationManager(entityManager); + RegLocalizationManager regLocalizationManager = new RegLocalizationManager(entityManager); + RegRelationproposedManager regRelationproposedManager = new RegRelationproposedManager(entityManager); + RegLocalizationproposedManager regLocalizationproposedManager = new RegLocalizationproposedManager(entityManager); + RegItemManager regItemManager = new RegItemManager(entityManager); + RegItemclassManager regItemclassManager = new RegItemclassManager(entityManager); + try { + + regItemManager.getByLocalid(language); + // Getting all the relations related to that object + List regRelations = regRelationManager.getAllBySubject(regItem); + + // Copying RegRelations to RegRelationProposeds + HashMap tempHashmap = new HashMap(); + + for (int j = 0; j < regRelations.size(); j++) { + List localizations = regRelations.get(j).getRegLocalizationList(); + RegItem regItemCurrent = regRelations.get(j).getRegItemObject(); + RegItem regItemObject = new RegItem(); + for (Map.Entry entry : fields.entrySet()) { + for (int i = 0; i < localizations.size(); i++) { + if (localizations.get(i).getRegField().getLocalid().equalsIgnoreCase(entry.getKey().getLocalid())) { + if(!entry.getValue().equalsIgnoreCase("")){ + RegItemclass regItemClassObject = regItemclassManager.getByLocalid(entry.getKey().getLocalid()); + regItemObject = regItemManager.getByLocalidAndRegItemClass(entry.getValue(), regItemClassObject); + regRelations.get(j).setRegItemObject(regItemCurrent); + } + + } + + } + } + + if (regItemObject.getUuid() == null){ + regItemObject = regItemCurrent; + } + + RegRelationproposed regRelationproposed = new RegRelationproposed(); + String regRelationproposedUuid = RegRelationproposedUuidHelper.getUuid(regItemproposed, null, regRelations.get(j).getRegRelationpredicate(), null, regItemCurrent); + //String regRelationproposedUuid2 = RegRelationproposedUuidHelper.getUuid(regItemproposed, null, regRelations.get(j).getRegRelationpredicate(), null, regRelations.get(j).getRegItemObject()); + + regRelationproposed.setUuid(regRelationproposedUuid); + regRelationproposed.setRegItemSubject(null); + regRelationproposed.setRegItemproposedSubject(regItemproposed); + regRelationproposed.setRegItemObject(regItemObject); + regRelationproposed.setRegItemproposedObject(null); + regRelationproposed.setRegRelationReference(regRelations.get(j)); + regRelationproposed.setRegRelationpredicate(regRelations.get(j).getRegRelationpredicate()); + regRelationproposed.setInsertdate(new Date()); + + regRelationproposedManager.add(regRelationproposed); + + tempHashmap.put(regRelations.get(j).getUuid(), regRelationproposed); + + } + + // Replicating the relevant Reglocalizationproposeds pointing to the + // RegRelationproposed copyied above + // Getting all the localization with a reference to a reg relation + // related to the current RegItem + List regLocalizations = regLocalizationManager.getAllWithRelationReference(regItem); + for (RegLocalization regLocalization : regLocalizations) { + // Creating the regLocalizationproposed for the regRelationreference + + RegLocalizationproposed regLocalizationproposed = new RegLocalizationproposed(); + String newUuid = RegLocalizationproposedUuidHelper.getUuid(regLocalization.getFieldValueIndex(), regLocalization.getRegLanguagecode(), regItemproposed, regLocalization.getRegField()); + regLocalizationproposed.setUuid(newUuid); + regLocalizationproposed.setFieldValueIndex(regLocalization.getFieldValueIndex()); + regLocalizationproposed.setHref(regLocalization.getHref()); + regLocalizationproposed.setRegField(regLocalization.getRegField()); + regLocalizationproposed.setRegItemproposed(regItemproposed); + regLocalizationproposed.setRegLanguagecode(regLocalization.getRegLanguagecode()); + regLocalizationproposed.setRegLocalizationReference(regLocalization); + regLocalizationproposed.setRegRelationproposedReference(tempHashmap.get(regLocalization.getRegRelationReference().getUuid())); + regLocalizationproposed.setValue(regLocalization.getValue()); + regLocalizationproposed.setInsertdate(new Date()); + regLocalizationproposed.setRegAction(regItemproposed.getRegAction()); + + regLocalizationproposedManager.add(regLocalizationproposed); + } + + } catch (Exception e) { + System.out.println("eu.europa.ec.re3gistry2.javaapi.handler.RegItemproposedHandler.copyRegRelationsToRegRelationproposedsBulkEdit()"); + } + } // Copy all the RegItemRegGroupRegRoleMapping related to the item passed by parameter // to RegItemproposedRegGroupRegRoleMapping @@ -2002,7 +2088,7 @@ public RegItemproposed completeCopyRegItemToRegItemporposed(RegItem regItem, Reg return regItemproposed; } - public RegItemproposed completeCopyRegItemToRegItemporposedBulkEdit(RegItem regItem, RegUser regUser, HashMap fields) throws Exception { + public RegItemproposed completeCopyRegItemToRegItemporposedBulkEdit(RegItem regItem, RegUser regUser, HashMap fields, ArrayList additionLines, String language) throws Exception { RegItemproposed regItemproposed = null; synchronized (sync) { if (!entityManager.getTransaction().isActive()) { @@ -2023,7 +2109,7 @@ public RegItemproposed completeCopyRegItemToRegItemporposedBulkEdit(RegItem regI entityManager.getTransaction().begin(); } if (regItem != null && regItemproposed != null) { - copyRegRelationsToRegRelationproposeds(regItem, regItemproposed); + copyRegRelationsToRegRelationproposedsBulkEdit(regItem, regItemproposed, fields, additionLines, language); } entityManager.getTransaction().commit();