diff --git a/NOTICE b/NOTICE index bfaa082cfe1..bf9911626a0 100644 --- a/NOTICE +++ b/NOTICE @@ -26,11 +26,6 @@ Bitstream Vera is a trademark of Bitstream, Inc. For details, see http://dejavu-fonts.org and http://dejavu-fonts.org/wiki/License -This product includes JasperReports Library -Copyright (c) 2001-2016 TIBCO Software Inc. -JasperReports Library is distributed under the terms of -GNU Lesser General Public Licenses (LGPL) - This product includes AdminLTE template Copyright (c) 2014-2016 Abdullah Almsaeed AdminLTE is distributed under the terms of The MIT License diff --git a/config/initial-objects/000-system-configuration.xml b/config/initial-objects/000-system-configuration.xml index 3d6814bd377..dfa28d0f829 100644 --- a/config/initial-objects/000-system-configuration.xml +++ b/config/initial-objects/000-system-configuration.xml @@ -54,11 +54,6 @@ OFF org.hibernate.internal.ExceptionMapperStandardImpl - - - OFF - net.sf.jasperreports.engine.fill.JRFillDataset - diff --git a/config/initial-objects/080-report-audit.xml b/config/initial-objects/080-report-audit.xml deleted file mode 100644 index 42194b59555..00000000000 --- a/config/initial-objects/080-report-audit.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - All audit records report - Report made from all audit records. - - - - - - - - - diff --git a/config/initial-objects/090-report-audit-jasper.xml b/config/initial-objects/090-report-audit-jasper.xml deleted file mode 100644 index 5ec1a4d1e28..00000000000 --- a/config/initial-objects/090-report-audit-jasper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Audit logs report (Jasper) - Report made from audit records. - - true - - PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgamFzcGVyVGVtcGxhdGUNCiAgUFVCTElDICItLy9KYXNwZXJSZXBvcnRzLy9EVEQgVGVtcGxhdGUvL0VOIg0KICAiaHR0cDovL2phc3BlcnJlcG9ydHMuc291cmNlZm9yZ2UubmV0L2R0ZHMvamFzcGVydGVtcGxhdGUuZHRkIj4NCjxqYXNwZXJUZW1wbGF0ZT4NCiAgICAgICAgCTxzdHlsZSBmb250TmFtZT0iRGVqYVZ1IFNhbnMiIGZvbnRTaXplPSIxMCIgaEFsaWduPSJMZWZ0IiBpc0RlZmF1bHQ9InRydWUiIGlzUGRmRW1iZWRkZWQ9InRydWUiIA0KCQkJCSAgIG5hbWU9IkJhc2UiIHBkZkVuY29kaW5nPSJJZGVudGl0eS1IIiBwZGZGb250TmFtZT0iRGVqYVZ1U2Fucy50dGYiIHZBbGlnbj0iTWlkZGxlIj4NCgkJCTwvc3R5bGU+DQoJCQk8c3R5bGUgYmFja2NvbG9yPSIjMjY3OTk0IiBmb250U2l6ZT0iMjYiIGZvcmVjb2xvcj0iI0ZGRkZGRiIgaXNEZWZhdWx0PSJmYWxzZSINCiAgICAgICAgICAgICAgICAgICBtb2RlPSJPcGFxdWUiIG5hbWU9IlRpdGxlIiBzdHlsZT0iQmFzZSIvPiANCgkJCTxzdHlsZSBmb250U2l6ZT0iMTIiIGZvcmVjb2xvcj0iIzAwMDAwMCIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iUGFnZSBoZWFkZXIiDQogICAgICAgICAgICAgICAgICAgc3R5bGU9IkJhc2UiLz4NCgkJCTxzdHlsZSBiYWNrY29sb3I9IiMzMzMzMzMiIGZvbnRTaXplPSIxMiIgZm9yZWNvbG9yPSIjRkZGRkZGIiBoQWxpZ249IkNlbnRlciINCiAgICAgICAgICAgICAgICAgICBpc0RlZmF1bHQ9ImZhbHNlIiBtb2RlPSJPcGFxdWUiIG5hbWU9IkNvbHVtbiBoZWFkZXIiIHN0eWxlPSJCYXNlIi8+DQoJCQk8c3R5bGUgaXNCb2xkPSJmYWxzZSIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iRGV0YWlsIiBzdHlsZT0iQmFzZSIvPg0KICAgICAgICAgICAgPHN0eWxlIGlzQm9sZD0iZmFsc2UiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IkNvZGUiIHN0eWxlPSJCYXNlIiBmb250U2l6ZT0iOSIvPg0KCQkJPHN0eWxlIGZvbnRTaXplPSI5IiBmb3JlY29sb3I9IiMwMDAwMDAiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IlBhZ2UgZm9vdGVyIg0KICAgICAgICAgICAgICAgICAgIHN0eWxlPSJCYXNlIi8+DQoJCTwvamFzcGVyVGVtcGxhdGU+ - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - - diff --git a/config/initial-objects/090-report-audit.xml b/config/initial-objects/090-report-audit.xml new file mode 100644 index 00000000000..1704e9025ea --- /dev/null +++ b/config/initial-objects/090-report-audit.xml @@ -0,0 +1,227 @@ + + + + + All audit records report + Report made from all audit records. + + + + + + + + + + + + targetRef + + filterAll + + + + + initiatorRef + + filterAll + + + + + outcome + + filterAll + + + + + eventType + + filterAll + + + + + eventStage + + filterAll + + + + + timestamp + + filterAll + + + + + timestamp + + filterAll + + + + + + + + outcome + OperationResultStatusType + + + + + + eventType + AuditEventTypeType + + + + + + eventStage + AuditEventStageType + + + + + + from + dateTime + + + + + + to + dateTime + + + + + + target + c:ObjectReferenceType + + + + + + initiator + c:ObjectReferenceType + + + + + + diff --git a/config/initial-objects/100-report-reconciliation.xml b/config/initial-objects/100-report-reconciliation.xml index 32f521d5f4d..147ab42051e 100644 --- a/config/initial-objects/100-report-reconciliation.xml +++ b/config/initial-objects/100-report-reconciliation.xml @@ -1,22 +1,215 @@ - - Reconciliation report (Jasper) - Reconciliation report for selected resource. - - true - - PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgamFzcGVyVGVtcGxhdGUNCiAgUFVCTElDICItLy9KYXNwZXJSZXBvcnRzLy9EVEQgVGVtcGxhdGUvL0VOIg0KICAiaHR0cDovL2phc3BlcnJlcG9ydHMuc291cmNlZm9yZ2UubmV0L2R0ZHMvamFzcGVydGVtcGxhdGUuZHRkIj4NCjxqYXNwZXJUZW1wbGF0ZT4NCiAgICAgICAgCTxzdHlsZSBmb250TmFtZT0iRGVqYVZ1IFNhbnMiIGZvbnRTaXplPSIxMCIgaEFsaWduPSJMZWZ0IiBpc0RlZmF1bHQ9InRydWUiIGlzUGRmRW1iZWRkZWQ9InRydWUiIA0KCQkJCSAgIG5hbWU9IkJhc2UiIHBkZkVuY29kaW5nPSJJZGVudGl0eS1IIiBwZGZGb250TmFtZT0iRGVqYVZ1U2Fucy50dGYiIHZBbGlnbj0iTWlkZGxlIj4NCgkJCTwvc3R5bGU+DQoJCQk8c3R5bGUgYmFja2NvbG9yPSIjMjY3OTk0IiBmb250U2l6ZT0iMjYiIGZvcmVjb2xvcj0iI0ZGRkZGRiIgaXNEZWZhdWx0PSJmYWxzZSINCiAgICAgICAgICAgICAgICAgICBtb2RlPSJPcGFxdWUiIG5hbWU9IlRpdGxlIiBzdHlsZT0iQmFzZSIvPiANCgkJCTxzdHlsZSBmb250U2l6ZT0iMTIiIGZvcmVjb2xvcj0iIzAwMDAwMCIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iUGFnZSBoZWFkZXIiDQogICAgICAgICAgICAgICAgICAgc3R5bGU9IkJhc2UiLz4NCgkJCTxzdHlsZSBiYWNrY29sb3I9IiMzMzMzMzMiIGZvbnRTaXplPSIxMiIgZm9yZWNvbG9yPSIjRkZGRkZGIiBoQWxpZ249IkNlbnRlciINCiAgICAgICAgICAgICAgICAgICBpc0RlZmF1bHQ9ImZhbHNlIiBtb2RlPSJPcGFxdWUiIG5hbWU9IkNvbHVtbiBoZWFkZXIiIHN0eWxlPSJCYXNlIi8+DQoJCQk8c3R5bGUgaXNCb2xkPSJmYWxzZSIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iRGV0YWlsIiBzdHlsZT0iQmFzZSIvPg0KICAgICAgICAgICAgPHN0eWxlIGlzQm9sZD0iZmFsc2UiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IkNvZGUiIHN0eWxlPSJCYXNlIiBmb250U2l6ZT0iOSIvPg0KCQkJPHN0eWxlIGZvbnRTaXplPSI5IiBmb3JlY29sb3I9IiMwMDAwMDAiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IlBhZ2UgZm9vdGVyIg0KICAgICAgICAgICAgICAgICAgIHN0eWxlPSJCYXNlIi8+DQoJCTwvamFzcGVyVGVtcGxhdGU+ - pdf - JRSwapFileVirtualizer - 300 - 10000 - 300000 - + + + Reconciliation report + Reconciliation report for selected resource. + + + + + + + + + + + + resourceRef + + filterAll + + + + + synchronizationSituation + + filterAll + + + + + objectClass + + filterAll + + + + + kind + + filterAll + + + + + intent + + filterAll + + + + + + + + intent + string + + + + + + objectClass + string + + + + + + kind + ShadowKindType + + + + + + situation + SynchronizationSituationType + + + + + + resource + c:ObjectReferenceType + c:ResourceType + + + + + + ShadowType + + nameColumn + name + + + resourceColumn + resourceRef + nameColumn + + + situationColumn + synchronizationSituation + resourceColumn + + + ownerColumn + + + + + + + + + situationColumn + + + synchTimestampColumn + synchronizationTimestamp + ownerColumn + + + diff --git a/config/initial-objects/110-report-user-list.xml b/config/initial-objects/110-report-user-list.xml index e1e6395cf7a..1d4c9ca25fb 100644 --- a/config/initial-objects/110-report-user-list.xml +++ b/config/initial-objects/110-report-user-list.xml @@ -1,21 +1,257 @@ - - Users in MidPoint (Jasper) + + + Users in MidPoint Users listed in MidPoint. - - - PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgamFzcGVyVGVtcGxhdGUNCiAgUFVCTElDICItLy9KYXNwZXJSZXBvcnRzLy9EVEQgVGVtcGxhdGUvL0VOIg0KICAiaHR0cDovL2phc3BlcnJlcG9ydHMuc291cmNlZm9yZ2UubmV0L2R0ZHMvamFzcGVydGVtcGxhdGUuZHRkIj4NCjxqYXNwZXJUZW1wbGF0ZT4NCiAgICAgICAgCTxzdHlsZSBmb250TmFtZT0iRGVqYVZ1IFNhbnMiIGZvbnRTaXplPSIxMCIgaEFsaWduPSJMZWZ0IiBpc0RlZmF1bHQ9InRydWUiIGlzUGRmRW1iZWRkZWQ9InRydWUiIA0KCQkJCSAgIG5hbWU9IkJhc2UiIHBkZkVuY29kaW5nPSJJZGVudGl0eS1IIiBwZGZGb250TmFtZT0iRGVqYVZ1U2Fucy50dGYiIHZBbGlnbj0iTWlkZGxlIj4NCgkJCTwvc3R5bGU+DQoJCQk8c3R5bGUgYmFja2NvbG9yPSIjMjY3OTk0IiBmb250U2l6ZT0iMjYiIGZvcmVjb2xvcj0iI0ZGRkZGRiIgaXNEZWZhdWx0PSJmYWxzZSINCiAgICAgICAgICAgICAgICAgICBtb2RlPSJPcGFxdWUiIG5hbWU9IlRpdGxlIiBzdHlsZT0iQmFzZSIvPiANCgkJCTxzdHlsZSBmb250U2l6ZT0iMTIiIGZvcmVjb2xvcj0iIzAwMDAwMCIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iUGFnZSBoZWFkZXIiDQogICAgICAgICAgICAgICAgICAgc3R5bGU9IkJhc2UiLz4NCgkJCTxzdHlsZSBiYWNrY29sb3I9IiMzMzMzMzMiIGZvbnRTaXplPSIxMiIgZm9yZWNvbG9yPSIjRkZGRkZGIiBoQWxpZ249IkNlbnRlciINCiAgICAgICAgICAgICAgICAgICBpc0RlZmF1bHQ9ImZhbHNlIiBtb2RlPSJPcGFxdWUiIG5hbWU9IkNvbHVtbiBoZWFkZXIiIHN0eWxlPSJCYXNlIi8+DQoJCQk8c3R5bGUgaXNCb2xkPSJmYWxzZSIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iRGV0YWlsIiBzdHlsZT0iQmFzZSIvPg0KICAgICAgICAgICAgPHN0eWxlIGlzQm9sZD0iZmFsc2UiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IkNvZGUiIHN0eWxlPSJCYXNlIiBmb250U2l6ZT0iOSIvPg0KCQkJPHN0eWxlIGZvbnRTaXplPSI5IiBmb3JlY29sb3I9IiMwMDAwMDAiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IlBhZ2UgZm9vdGVyIg0KICAgICAgICAgICAgICAgICAgIHN0eWxlPSJCYXNlIi8+DQoJCTwvamFzcGVyVGVtcGxhdGU+ - pdf - JRSwapFileVirtualizer - 300 - 10000 - 300000 - + + + + + + + + + activation/administrativeStatus + + filterAll + + + + + assignment/targetRef + + filterAll + + + + + assignment/targetRef + + filterAll + + + + + assignment/construction/resourceRef + + filterAll + + + + + + + + activation + ActivationStatusType + + + + + + organization + c:ObjectReferenceType + c:OrgType + + + + + + role + c:ObjectReferenceType + c:RoleType + + + + + + resource + c:ObjectReferenceType + c:ResourceType + + + + + + + nameColumn + name + + + fullNameColumn + fullName + nameColumn + + + activationColumn + activation/administrativeStatus + fullNameColumn + + + roleColumn + assignment + + + + + + + + + activationColumn + + + orgColumn + assignment + + + + + + + + + roleColumn + + + accountColumn + linkRef + + + + + + + + + orgColumn + + UserType + + diff --git a/config/initial-objects/130-report-certification-definitions.xml b/config/initial-objects/130-report-certification-definitions.xml index 9795729d665..575014f957a 100644 --- a/config/initial-objects/130-report-certification-definitions.xml +++ b/config/initial-objects/130-report-certification-definitions.xml @@ -7,6 +7,7 @@ --> Certification definitions report All certification definitions with basic information on related campaigns. @@ -15,15 +16,14 @@ - + + + nameColumn name - - - ownerColumn @@ -43,21 +43,12 @@ + number openCampaignsColumn @@ -74,7 +65,6 @@ oid = object.getOid(); numberOfCampaigns = 0; - campaigns = midpoint.searchObjects(AccessCertificationCampaignType.class, prismContext.queryFor(AccessCertificationCampaignType.class).build(), null); for (AccessCertificationCampaignType campaign : campaigns) { if (oid.equals(campaign.getDefinitionRef().getOid())) { AccessCertificationCampaignStateType state = campaign.getState(); @@ -89,6 +79,7 @@ + number lastStartedColumn @@ -124,8 +115,26 @@ + + ascending + name + AccessCertificationDefinitionType + + campaigns + AccessCertificationCampaignType + + + + true diff --git a/config/initial-objects/140-report-certification-campaigns.xml b/config/initial-objects/140-report-certification-campaigns.xml index 78b2853c93e..51afc737483 100644 --- a/config/initial-objects/140-report-certification-campaigns.xml +++ b/config/initial-objects/140-report-certification-campaigns.xml @@ -7,19 +7,180 @@ --> - Certification campaigns report (Jasper) - All certification campaigns along with their state. - - true - - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - + Certification campaigns report + All certification campaigns along with their state. + + + + + + + + + state + + filterAll + + + + + state + inReviewStage + + + state + reviewStageDone + + + state + inRemediation + + + + + + + + + + nameColumn + name + + + + + + ownerColumn + ownerRef + + + + nameColumn + + + startTimestampColumn + startTimestamp + + + + ownerColumn + + + + + + + + endTimestampColumn + endTimestamp + + + + startTimestampColumn + + + + + + + + casesColumn + case + + + + endTimestampColumn + number + + + stateColumn + state + + + + casesColumn + + + stageNumberColumn + stageNumber + + + + stateColumn + + + stageCasesColumn + stageNumberColumn + + + + + + + + + + + percentageCompleteColumn + stageCasesColumn + + + + + + + + + + + ascending + name + + AccessCertificationCampaignType + + true + + alsoClosedCampaigns + boolean + + + + + diff --git a/config/initial-objects/150-report-certification-cases.xml b/config/initial-objects/150-report-certification-cases.xml index b0f6c1478a5..86868f09e65 100644 --- a/config/initial-objects/150-report-certification-cases.xml +++ b/config/initial-objects/150-report-certification-cases.xml @@ -6,19 +6,197 @@ ~ and European Union Public License. See LICENSE file for details. --> - Certification cases report (Jasper) - Cases within a given certification campaign. - - true - - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - + Certification cases report + Cases within a given certification campaign. + + + + + + + + ../name + + filterAll + + + + + + + + objectColumn + objectRef + + + + + + + + + + + targetColumn + targetRef + + + + objectColumn + + + + + + + + reviewersColumn + + + + targetColumn + + + + + + + + lastReviewedOnColumn + + + + reviewersColumn + + + + + + + + reviewedByColumn + + + + lastReviewedOnColumn + + + + + + + + iterationColumn + iteration + + + + reviewedByColumn + + + inStageNumberColumn + stageNumber + + + + iterationColumn + + + outcomeColumn + outcome + + + + inStageNumberColumn + + + commentsColumn + + + + outcomeColumn + + + + + + + + remediedTimestampColumn + remediedTimestamp + + + + commentsColumn + + AccessCertificationCaseType + + objectRef/@/name + + + + campaignName + c:ObjectReferenceType + c:AccessCertificationCampaignType + + + + + diff --git a/config/initial-objects/160-report-certification-decisions.xml b/config/initial-objects/160-report-certification-decisions.xml index 86cb0f2e414..386cfd4cbbc 100644 --- a/config/initial-objects/160-report-certification-decisions.xml +++ b/config/initial-objects/160-report-certification-decisions.xml @@ -6,19 +6,182 @@ ~ and European Union Public License. See LICENSE file for details. --> - Certification decisions report (Jasper) - Decisions of individual reviewers for a certification campaign as a whole or for a given campaign stage. - - true - - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - + Certification decisions report + Decisions of individual reviewers for a certification campaign as a whole or for a given campaign stage. + + + + + + + + ../name + + filterAll + + + + + + + + + + + objectColumn + objectRef + + + + + + + + + + + targetColumn + targetRef + + + + objectColumn + + + + + + + + workItemColumn + workItem + + + + targetColumn + + + + + + + + objectRef/@/name + + c:AccessCertificationCaseType + + + campaignName + c:ObjectReferenceType + c:AccessCertificationCampaignType + + + + + + stageNumber + string + + + + + + iteration + string + + + + + diff --git a/config/initial-objects/280-object-collection-resource-up.xml b/config/initial-objects/251-object-collection-resource-up.xml similarity index 100% rename from config/initial-objects/280-object-collection-resource-up.xml rename to config/initial-objects/251-object-collection-resource-up.xml diff --git a/config/initial-objects/270-object-collection-task-active.xml b/config/initial-objects/261-object-collection-task-active.xml similarity index 100% rename from config/initial-objects/270-object-collection-task-active.xml rename to config/initial-objects/261-object-collection-task-active.xml diff --git a/config/initial-objects/284-object-collection-audit.xml b/config/initial-objects/270-object-collection-audit.xml similarity index 100% rename from config/initial-objects/284-object-collection-audit.xml rename to config/initial-objects/270-object-collection-audit.xml diff --git a/config/initial-objects/285-object-collection-audit-24h.xml b/config/initial-objects/271-object-collection-audit-24h.xml similarity index 100% rename from config/initial-objects/285-object-collection-audit-24h.xml rename to config/initial-objects/271-object-collection-audit-24h.xml diff --git a/config/initial-objects/290-object-collection-audit-errors-24h.xml b/config/initial-objects/272-object-collection-audit-errors-24h.xml similarity index 100% rename from config/initial-objects/290-object-collection-audit-errors-24h.xml rename to config/initial-objects/272-object-collection-audit-errors-24h.xml diff --git a/config/initial-objects/300-object-collection-audit-modifications-24h.xml b/config/initial-objects/273-object-collection-audit-modifications-24h.xml similarity index 100% rename from config/initial-objects/300-object-collection-audit-modifications-24h.xml rename to config/initial-objects/273-object-collection-audit-modifications-24h.xml diff --git a/config/initial-objects/280-object-collection-certification-campaign-all.xml b/config/initial-objects/280-object-collection-certification-campaign-all.xml new file mode 100644 index 00000000000..a92f8c21f25 --- /dev/null +++ b/config/initial-objects/280-object-collection-certification-campaign-all.xml @@ -0,0 +1,27 @@ + + + + + All certification campaigns + AccessCertificationCampaignType + + + + + + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/255-object-collection-certification-definition-all.xml b/config/initial-objects/290-object-collection-shadow-all.xml similarity index 72% rename from gui/admin-gui/src/main/resources/initial-objects/255-object-collection-certification-definition-all.xml rename to config/initial-objects/290-object-collection-shadow-all.xml index 330c41f246c..c08274cd3d9 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/255-object-collection-certification-definition-all.xml +++ b/config/initial-objects/290-object-collection-shadow-all.xml @@ -1,6 +1,6 @@ - - - net.sf.jasperreports - jasperreports - - - bouncycastle - bcmail-jdk14 - - - bouncycastle - bcprov-jdk14 - - - bouncycastle - bctsp-jdk14 - - - org.bouncycastle - bcprov-jdk15on - - - org.apache.poi diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java index 9da81c40ca4..0e7396559c8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java @@ -9,6 +9,10 @@ import java.util.*; import java.util.function.Supplier; +import com.evolveum.midpoint.gui.impl.component.ContainerableListPanel; +import com.evolveum.midpoint.web.component.search.*; + +import com.evolveum.midpoint.xml.ns._public.common.common_3.GuiObjectColumnType; import com.evolveum.midpoint.prism.query.ObjectOrdering; import com.evolveum.midpoint.web.component.util.SerializableFunction; @@ -22,26 +26,17 @@ import org.apache.wicket.util.string.StringValue; import org.jetbrains.annotations.NotNull; -import com.evolveum.midpoint.gui.api.model.LoadableModel; import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.gui.impl.component.ContainerableListPanel; import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView; import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.schema.GetOperationOptions; import com.evolveum.midpoint.schema.SelectorOptions; -import com.evolveum.midpoint.schema.constants.ObjectTypes; -import com.evolveum.midpoint.util.DisplayableValue; -import com.evolveum.midpoint.web.component.data.ISelectableDataProvider; import com.evolveum.midpoint.web.component.data.SelectableBeanObjectDataProvider; import com.evolveum.midpoint.web.component.data.column.ColumnUtils; import com.evolveum.midpoint.web.component.data.column.ObjectNameColumn; import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem; -import com.evolveum.midpoint.web.component.search.ContainerTypeSearchItem; -import com.evolveum.midpoint.web.component.search.Search; -import com.evolveum.midpoint.web.component.search.SearchFactory; -import com.evolveum.midpoint.web.component.search.SearchValue; import com.evolveum.midpoint.web.component.util.SelectableBean; import com.evolveum.midpoint.web.component.util.SerializableSupplier; import com.evolveum.midpoint.web.session.PageStorage; @@ -145,7 +140,7 @@ public void addPerformed(AjaxRequestTarget target, List selected) { } @Override - protected IColumn, String> createNameColumn(IModel displayModel, String itemPath, ExpressionType expression) { + protected IColumn, String> createNameColumn(IModel displayModel, GuiObjectColumnType customColumn, String itemPath, ExpressionType expression) { return new ObjectNameColumn<>(displayModel == null ? createStringResource("ObjectType.name") : displayModel, itemPath, expression, getPageBase(), StringUtils.isEmpty(itemPath)) { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/PanelTab.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/PanelTab.java index 8b238752a60..a17f3cba00e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/PanelTab.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/PanelTab.java @@ -58,4 +58,8 @@ public boolean isVisible() { return visible.isVisible(); } + + public void resetPanel(){ + panel = null; + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java index 19c3c04ca1e..feb01e78447 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java @@ -16,6 +16,8 @@ import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuPanel; +import com.evolveum.midpoint.report.api.ReportService; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java index cca055a367e..c226865f24d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java @@ -23,6 +23,8 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; +import com.evolveum.midpoint.web.component.util.SelectableBean; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.*; import org.apache.commons.lang3.math.NumberUtils; @@ -867,6 +869,8 @@ public static List createContainerableTypesQnameList() { List qnameList = types.stream().map(type -> type.getTypeQName()).collect(Collectors.toList()); //todo create enum for containerable types? qnameList.add(AuditEventRecordType.COMPLEX_TYPE); + qnameList.add(AccessCertificationCaseType.COMPLEX_TYPE); + qnameList.add(CaseWorkItemType.COMPLEX_TYPE); return qnameList.stream().sorted((type1, type2) -> { Validate.notNull(type1); Validate.notNull(type2); @@ -2412,11 +2416,12 @@ public static void setCurrentPage(Table table, ObjectPaging paging) { return; } - if (paging == null) { + if (paging == null || paging.getOffset() == null) { table.getDataTable().setCurrentPage(0); return; } + long itemsPerPage = table.getDataTable().getItemsPerPage(); long page = ((paging.getOffset() + itemsPerPage) / itemsPerPage) - 1; if (page < 0) { @@ -2601,6 +2606,7 @@ protected void onSubmit(AjaxRequestTarget target) { if (target != null) { target.add(findParent(TabbedPanel.class)); } + target.add(parentPage.getFeedbackPanel()); } }; @@ -5085,6 +5091,71 @@ public static String countLinkFroNonDeadShadows(Collection return Integer.toString(count); } + public static List> getAllowedValues(SearchFilterParameterType parameter, PageBase pageBase) { + List> allowedValues = new ArrayList<>(); + + if (parameter == null || parameter.getAllowedValuesExpression() == null) { + return allowedValues; + } + Task task = pageBase.createSimpleTask("evaluate expression for allowed values"); + ExpressionType expression = parameter.getAllowedValuesExpression(); + Object value = null; + try { + + value = ExpressionUtil.evaluateExpression(new VariablesMap(), null, + expression, MiscSchemaUtil.getExpressionProfile(), + pageBase.getExpressionFactory(), "evaluate expression for allowed values", task, task.getResult()); + } catch (Exception e) { + LOGGER.error("Couldn't execute expression " + expression, e); + pageBase.error(pageBase.createStringResource("FilterSearchItem.message.error.evaluateAllowedValuesExpression", expression).getString()); + return allowedValues; + } + if (value instanceof PrismPropertyValue) { + value = ((PrismPropertyValue) value).getRealValue(); + } + + if (!(value instanceof List)) { + LOGGER.error("Exception return unexpected type, expected List, but was " + (value == null ? null : value.getClass())); + pageBase.error(pageBase.createStringResource("FilterSearchItem.message.error.wrongType", expression).getString()); + return allowedValues; + } + + if (!((List) value).isEmpty()) { + if (!(((List) value).get(0) instanceof DisplayableValue)) { + LOGGER.error("Exception return unexpected type, expected List, but was " + (value == null ? null : value.getClass())); + pageBase.error(pageBase.createStringResource("FilterSearchItem.message.error.wrongType", expression).getString()); + return allowedValues; + } + return (List>) value; + } + return allowedValues; + } + + public static DropDownChoicePanel createDropDownChoices(String id, IModel> model, IModel>> choices, + boolean allowNull, PageBase pageBase) { + return new DropDownChoicePanel(id, model, choices, new IChoiceRenderer() { + private static final long serialVersionUID = 1L; + + @Override + public Object getDisplayValue(DisplayableValue val) { + if (val.getValue() instanceof Enum) { + return pageBase.createStringResource((Enum) val.getValue()).getString(); + } + return pageBase.createStringResource(val.getLabel()).getString(); + } + + @Override + public String getIdValue(DisplayableValue val, int index) { + return Integer.toString(index); + } + + @Override + public DisplayableValue getObject(String id, IModel> choices) { + return StringUtils.isNotBlank(id) ? choices.getObject().get(Integer.parseInt(id)) : null; + } + }, allowNull); + } + public static Map createMainButtonLayerIcon(DisplayType mainButtonDisplayType) { if (mainButtonDisplayType.getIcon() != null && mainButtonDisplayType.getIcon().getCssClass() != null && mainButtonDisplayType.getIcon().getCssClass().contains(GuiStyleConstants.CLASS_ADD_NEW_OBJECT)) { @@ -5094,4 +5165,23 @@ public static Map createMainButtonLayerIcon(DisplayType layerIconMap.put(IconCssStyle.BOTTOM_RIGHT_STYLE, WebComponentUtil.createIconType(GuiStyleConstants.CLASS_PLUS_CIRCLE, "green")); return layerIconMap; } + + public static void addNewArchetype(PrismObjectWrapper object, String archetypeOid, AjaxRequestTarget target, PageBase pageBase){ + try { + PrismContainerWrapper archetypeAssignment = object.findContainer(TaskType.F_ASSIGNMENT); + PrismContainerValue archetypeAssignmentValue = archetypeAssignment.getItem().createNewValue(); + AssignmentType newArchetypeAssignment = archetypeAssignmentValue.asContainerable(); + newArchetypeAssignment.setTargetRef(ObjectTypeUtil.createObjectRef(archetypeOid, ObjectTypes.ARCHETYPE)); + WebPrismUtil.createNewValueWrapper(archetypeAssignment, archetypeAssignmentValue, pageBase, target); + } catch (SchemaException e) { + LOGGER.error("Exception during assignment lookup, reason: {}", e.getMessage(), e); + pageBase.error("Cannot set selected handler: " + e.getMessage()); + return; + } + } + + public static boolean isImportReport(ReportType report) { + ReportBehaviorType behavior = report.getBehavior(); + return behavior != null && DirectionTypeType.IMPORT.equals(behavior.getDirection()); + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentConstructionPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentConstructionPanel.java index 7e48b3ab1e0..3e8453a4cd5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentConstructionPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentConstructionPanel.java @@ -7,6 +7,7 @@ package com.evolveum.midpoint.gui.impl.component; import com.evolveum.midpoint.gui.api.component.BasePanel; +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper; import com.evolveum.midpoint.gui.impl.prism.panel.ResourceAttributePanel; import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; @@ -41,7 +42,8 @@ private void initLayout() { SingleContainerPanel baseConstructionPanel = new SingleContainerPanel<>(ID_BASIC, getModel(), ConstructionType.COMPLEX_TYPE) { @Override - protected ItemVisibility getVisibility(ItemPath itemPath) { + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + ItemPath itemPath = itemWrapper.getPath(); if (isAssociation(itemPath)) { return ItemVisibility.HIDDEN; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentsDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentsDetailsPanel.java index 88092234bee..18c5dc2abe4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentsDetailsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AssignmentsDetailsPanel.java @@ -232,7 +232,8 @@ public WebMarkupContainer createPanel(String panelId) { PrismContainerWrapperModel.fromContainerValueWrapper(getModel(), AssignmentType.F_ACTIVATION), ActivationType.COMPLEX_TYPE) { @Override - protected ItemVisibility getVisibility(ItemPath itemPath) { + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + ItemPath itemPath = itemWrapper.getPath(); if (ItemPath.create(AssignmentHolderType.F_ASSIGNMENT, AssignmentType.F_ACTIVATION, ActivationType.F_LOCKOUT_EXPIRATION_TIMESTAMP).equivalent(itemPath.namedSegmentsOnly())) { return ItemVisibility.HIDDEN; } @@ -249,7 +250,7 @@ protected ItemVisibility getVisibility(ItemPath itemPath) { return ItemVisibility.HIDDEN; } - return super.getVisibility(itemPath); + return super.getVisibility(itemWrapper); } }; } @@ -264,9 +265,10 @@ public WebMarkupContainer createPanel(String panelId) { return new SingleContainerPanel<>(panelId, PrismContainerWrapperModel.fromContainerValueWrapper(getModel(), AssignmentType.F_CONDITION), MappingType.COMPLEX_TYPE) { @Override - protected ItemVisibility getVisibility(ItemPath itemPath) { + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { ItemPath assignmentConditionExpressionPath = ItemPath.create(AssignmentHolderType.F_ASSIGNMENT, AssignmentType.F_CONDITION, MappingType.F_EXPRESSION); ItemPath inducementConditionExpressionPath = ItemPath.create(AbstractRoleType.F_INDUCEMENT, AssignmentType.F_CONDITION, MappingType.F_EXPRESSION); + ItemPath itemPath = itemWrapper.getPath(); if (itemPath.namedSegmentsOnly().equivalent(assignmentConditionExpressionPath) || itemPath.namedSegmentsOnly().equivalent(inducementConditionExpressionPath)) { return ItemVisibility.AUTO; } else { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/BasicMultivalueContainerListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/BasicMultivalueContainerListPanel.java new file mode 100644 index 00000000000..62943a73a83 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/BasicMultivalueContainerListPanel.java @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2018 Evolveum and contributors + * + * This work is dual-licensed under the Apache License 2.0 + * and European Union Public License. See LICENSE file for details. + */ +package com.evolveum.midpoint.gui.impl.component; + +import com.evolveum.midpoint.gui.api.component.DisplayNamePanel; +import com.evolveum.midpoint.gui.api.component.tabs.PanelTab; +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder; +import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle; +import com.evolveum.midpoint.gui.impl.factory.panel.ItemRealValueModel; +import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; +import com.evolveum.midpoint.model.api.AssignmentObjectRelation; +import com.evolveum.midpoint.prism.Containerable; +import com.evolveum.midpoint.prism.PrismContainerValue; +import com.evolveum.midpoint.prism.path.ItemPath; +import com.evolveum.midpoint.web.component.AjaxButton; +import com.evolveum.midpoint.web.component.CompositedIconButtonDto; +import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn; +import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem; +import com.evolveum.midpoint.web.component.prism.ItemVisibility; +import com.evolveum.midpoint.web.component.util.VisibleBehaviour; +import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; + +import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; +import com.evolveum.midpoint.web.page.admin.reports.component.EngineReportTabPanel; +import com.evolveum.midpoint.web.session.UserProfileStorage; +import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionReportEngineConfigurationType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchFilterParameterType; + +import org.apache.wicket.Component; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.extensions.markup.html.tabs.ITab; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * @author skublik + */ + +public abstract class BasicMultivalueContainerListPanel + extends MultivalueContainerListPanelWithDetailsPanel { + + private static final long serialVersionUID = 1L; + + public BasicMultivalueContainerListPanel(String id, Class type) { + super(id, type); + } + + protected String createHeaderClassIcon(){ + return "fa fa-sliders"; + }; + + @Override + protected boolean isCreateNewObjectVisible() { + return true; + } + + @Override + protected List createNewButtonDescription() { + String title = getPageBase().createStringResource("PageAdminObjectDetails.title.new", getContainerNameForNewButton()).getString(); + DisplayType defaultButtonDisplayType = WebComponentUtil.createDisplayType("fa fa-plus", "green", title); + CompositedIconButtonDto defaultButton = new CompositedIconButtonDto(); + CompositedIconBuilder builder = new CompositedIconBuilder(); + builder.setBasicIcon(WebComponentUtil.getIconCssClass(defaultButtonDisplayType), IconCssStyle.IN_ROW_STYLE) + .appendColorHtmlValue(WebComponentUtil.getIconColor(defaultButtonDisplayType)); + + defaultButton.setAdditionalButtonDisplayType(defaultButtonDisplayType); + defaultButton.setCompositedIcon(builder.build()); + return Collections.singletonList(defaultButton); + } + + protected String getContainerNameForNewButton(){ + return ""; + } + + @Override + protected UserProfileStorage.TableId getTableId() { + return null; + } + + @Override + protected Component createHeader(String headerId) { + return new WebMarkupContainer(headerId); + } + + @Override + protected IColumn, String> createCheckboxColumn() { + return new CheckBoxHeaderColumn<>(); + } + + @Override + protected List createInlineMenu() { + return getDefaultMenuActions(); + } + + @Override + protected void newItemPerformed(AjaxRequestTarget target, AssignmentObjectRelation relationSepc) { + PrismContainerValue newParameter = getContainerModel().getObject().getItem().createNewValue(); + createNewItemContainerValueWrapper(newParameter, getContainerModel().getObject(), target); + refreshTable(target); + reloadSavePreviewButtons(target); + } + +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java index b4a4ebfef2d..043af036301 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java @@ -7,15 +7,16 @@ package com.evolveum.midpoint.gui.impl.component; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.*; import java.util.Objects; import java.util.stream.Collectors; import javax.xml.namespace.QName; import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; +import com.evolveum.midpoint.prism.path.ItemName; +import com.evolveum.prism.xml.ns._public.query_3.OrderDirectionType; +import com.evolveum.prism.xml.ns._public.query_3.PagingType; import com.evolveum.midpoint.web.component.CompositedIconButtonDto; import org.apache.commons.collections4.CollectionUtils; @@ -26,11 +27,14 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.AbstractExportableColumn; +import org.apache.wicket.extensions.markup.html.repeater.util.SortParam; +import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Fragment; +import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; @@ -64,6 +68,7 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.MiscSchemaUtil; import com.evolveum.midpoint.schema.util.ObjectTypeUtil; +import com.evolveum.midpoint.schema.util.ObjectQueryUtil; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.QNameUtil; import com.evolveum.midpoint.util.exception.*; @@ -103,7 +108,7 @@ public abstract class ContainerableListPanel load() { if (isCollectionViewPanel()) { - search.setCollectionSearchItem(new ObjectCollectionSearchItem(search, getObjectCollectionView())); + CompiledObjectCollectionView view = getObjectCollectionView(); + search.setCollectionSearchItem(new ObjectCollectionSearchItem(search, view)); search.setCollectionItemVisible(isCollectionViewPanelForWidget()); + if (storage != null && view.getPaging() != null) { + ObjectPaging paging = ObjectQueryUtil.convertToObjectPaging(view.getPaging(), getPrismContext()); + if (storage.getPaging() == null) { + storage.setPaging(paging); + } + if (getTableId() != null && paging.getMaxSize() != null + && !getPageBase().getSessionStorage().getUserProfile().isExistPagingSize(getTableId())) { + getPageBase().getSessionStorage().getUserProfile().setPagingSize(getTableId(), paging.getMaxSize()); + } + } } if (storage != null) { storage.setSearch(search); @@ -235,7 +251,7 @@ protected boolean isListPanelVisible() { return true; } - protected WebMarkupContainer createHeader(String headerId) { + protected Component createHeader(String headerId) { return initSearch(headerId); } @@ -243,13 +259,14 @@ protected BoxedTablePanel initItemTable() { List> columns = createColumns(); ISelectableDataProvider provider = createProvider(); + setDefaultSorting(provider); BoxedTablePanel itemTable = new BoxedTablePanel<>(ID_ITEMS_TABLE, provider, columns, getTableId()) { private static final long serialVersionUID = 1L; @Override - protected WebMarkupContainer createHeader(String headerId) { - WebMarkupContainer header = ContainerableListPanel.this.createHeader(headerId); + protected Component createHeader(String headerId) { + Component header = ContainerableListPanel.this.createHeader(headerId); header.add(new VisibleBehaviour(() -> isHeaderVisible())); return header; @@ -269,6 +286,7 @@ public String getObject() { } })); } + customProcessNewRowItem(item, model); return item; } @@ -312,6 +330,9 @@ public boolean enableSavePageSize() { return itemTable; } + protected void customProcessNewRowItem(org.apache.wicket.markup.repeater.Item item, IModel model) { + } + protected abstract UserProfileStorage.TableId getTableId(); protected boolean isHeaderVisible() { @@ -384,7 +405,12 @@ private List> createColumns() { addCustomActions(menuItems, this::getSelectedRealObjects); if (!menuItems.isEmpty()) { - InlineMenuButtonColumn actionsColumn = new InlineMenuButtonColumn<>(menuItems, getPageBase()); + InlineMenuButtonColumn actionsColumn = new InlineMenuButtonColumn<>(menuItems, getPageBase()){ + @Override + public String getCssClass() { + return "col-md-1"; + } + }; columns.add(actionsColumn); } return columns; @@ -405,6 +431,7 @@ private List> initViewColumns() { LOGGER.trace("Finished to init custom columns, created columns {}", columns); return columns; } + private void addingCheckAndIconColumnIfExists(List> columns){ IColumn checkboxColumn = createCheckboxColumn(); if (checkboxColumn != null) { @@ -430,7 +457,7 @@ protected List> getViewColumnsTransformed(List> getViewColumnsTransformed(List columnDisplayModel = createColumnDisplayModel(customColumn); if (customColumns.indexOf(customColumn) == 0) { // TODO what if a complex path is provided here? - column = createNameColumn(columnDisplayModel, customColumn.getPath() == null ? "" : customColumn.getPath().toString(), expression); + column = createNameColumn(columnDisplayModel, customColumn, customColumn.getPath() == null ? "" : customColumn.getPath().toString(), expression); } else { column = createCustomExportableColumn(columnDisplayModel, customColumn, columnPath, expression); } - - columns.add(column); + if (column != null) { + columns.add(column); + } } } return columns; @@ -477,14 +505,23 @@ private IModel createColumnDisplayModel(GuiObjectColumnType customColumn Model.of(customColumn.getName()))); } - private IColumn createCustomExportableColumn(IModel columnDisplayModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) { + protected IColumn createCustomExportableColumn(IModel columnDisplayModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) { return new AbstractExportableColumn<>(columnDisplayModel, getSortProperty(customColumn, columnPath, expression)) { private static final long serialVersionUID = 1L; @Override public void populateItem(org.apache.wicket.markup.repeater.Item> item, String componentId, IModel rowModel) { - item.add(new Label(componentId, getDataModel(rowModel))); + IModel model = getDataModel(rowModel); + if (model != null && model.getObject() instanceof Collection){ + RepeatingView listItems = new RepeatingView(componentId); + for (Object object : (Collection)model.getObject()) { + listItems.add(new Label(listItems.newChildId(), (IModel) () -> object)); + } + item.add(listItems); + } else { + item.add(new Label(componentId, model)); + } } @Override @@ -555,21 +592,22 @@ private IModel getExportableColumnDataModel(IModel rowModel, GuiObjectCol return new ReadOnlyModel<>(() -> loadExportableColumnDataModel(rowModel, customColumn, columnPath, expression)); } - private String loadExportableColumnDataModel(IModel rowModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) { + private Collection loadExportableColumnDataModel(IModel rowModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) { C value = getRowRealValue(rowModel.getObject()); if (value == null) { - return ""; + return Collections.singletonList(""); } Item item = findItem(value, columnPath); if (expression != null) { - return evaluateExpression(value, item, expression, customColumn); + Collection collection = evaluateExpression(value, item, expression, customColumn); + return getValuesString(collection, customColumn.getDisplayValue()); } if (item != null) { return evaluateItemValues(item, customColumn.getDisplayValue()); } - return ""; + return Collections.singletonList(""); } protected abstract C getRowRealValue(PO rowModelObject); @@ -581,7 +619,7 @@ private String loadExportableColumnDataModel(IModel rowModel, GuiObjectColum return null; } - private String evaluateExpression(C rowValue, Item columnItem, ExpressionType expression, GuiObjectColumnType customColumn) { + protected Collection evaluateExpression(C rowValue, Item columnItem, ExpressionType expression, GuiObjectColumnType customColumn) { Task task = getPageBase().createSimpleTask(OPERATION_EVALUATE_EXPRESSION); OperationResult result = task.getResult(); try { @@ -593,61 +631,94 @@ private String evaluateExpression(C rowValue, Item columnItem, ExpressionT Collection evaluatedValues = ExpressionUtil.evaluateStringExpression(variablesMap, getPageBase().getPrismContext(), expression, MiscSchemaUtil.getExpressionProfile(), getPageBase().getExpressionFactory(), "evaluate column expression", task, result); - String stringValue = null; - if (evaluatedValues != null) { - stringValue = evaluatedValues.iterator().next(); // TODO: what if more than one value is returned? - } - - return stringValue; + return evaluatedValues; } catch (Exception e) { LOGGER.error("Couldn't execute expression for {} column. Reason: {}", customColumn, e.getMessage(), e); result.recomputeStatus(); OperationResultStatusPresentationProperties props = OperationResultStatusPresentationProperties.parseOperationalResultStatus(result.getStatus()); - return getPageBase().createStringResource(props.getStatusLabelKey()).getString(); //TODO: this is not entirely correct + return Collections.singletonList(getPageBase().createStringResource(props.getStatusLabelKey()).getString()); //TODO: this is not entirely correct } } - private String evaluateItemValues(Item item, DisplayValueType displayValue) { - return getItemValuesString(item, displayValue, loadLookupTable(item)); + private List evaluateItemValues(Item item, DisplayValueType displayValue) { + return getValuesString(item, displayValue, loadLookupTable(item)); } - private String getItemValuesString(Item item, DisplayValueType displayValue, PrismObject lookupTable){ + private List getValuesString(Item item, DisplayValueType displayValue, PrismObject lookupTable){ if (DisplayValueType.NUMBER.equals(displayValue)) { + String number; //This is really ugly HACK FIXME TODO if (item.getDefinition() != null && UserType.F_LINK_REF.equivalent(item.getDefinition().getItemName())) { - return WebComponentUtil.countLinkFroNonDeadShadows((Collection) item.getRealValues()); + number = WebComponentUtil.countLinkFroNonDeadShadows((Collection) item.getRealValues()); + } else { + number = String.valueOf(item.getValues().size()); } - return String.valueOf(item.getValues().size()); + return Collections.singletonList(number); } return item.getValues().stream() .filter(Objects::nonNull) - .map(itemValue -> getStringValue(itemValue,lookupTable)) - .collect(Collectors.joining(", ")); + .map(itemValue -> getStringValue(itemValue, lookupTable)) + .collect(Collectors.toList()); } - private String getStringValue(PrismValue itemValue, PrismObject lookupTable) { - if (!(itemValue instanceof PrismPropertyValue)) { - return itemValue.toString(); + private List getValuesString(Collection collection, DisplayValueType displayValue){ + if (DisplayValueType.NUMBER.equals(displayValue)) { + return Collections.singletonList(String.valueOf(collection.size())); } - PrismPropertyValue prismPropertyValue = (PrismPropertyValue) itemValue; - if (lookupTable == null) { - if (isPolyString(prismPropertyValue.getTypeName())) { - return WebComponentUtil.getTranslatedPolyString((PolyString) prismPropertyValue.getValue()); - } - return String.valueOf(prismPropertyValue.getValue()); + return (List) collection.stream() + .filter(Objects::nonNull) + .map(object -> getStringValue(object, null)) + .collect(Collectors.toList()); + } + + private String getStringValue(Object object, PrismObject lookupTable) { + if (object == null) { + return ""; } - String lookupTableKey = prismPropertyValue.getValue().toString(); - LookupTableType lookupTableObject = lookupTable.asObjectable(); - String rowLabel = ""; - for (LookupTableRowType lookupTableRow : lookupTableObject.getRow()){ - if (lookupTableRow.getKey().equals(lookupTableKey)){ - return lookupTableRow.getLabel() != null ? lookupTableRow.getLabel().getOrig() : lookupTableRow.getValue(); + if (object instanceof PrismPropertyValue) { + PrismPropertyValue prismPropertyValue = (PrismPropertyValue) object; + if (lookupTable == null) { + if (isPolyString(prismPropertyValue.getTypeName())) { + return WebComponentUtil.getTranslatedPolyString((PolyString) prismPropertyValue.getValue()); + } + if (prismPropertyValue.getValue() instanceof Enum) { + return getPageBase().createStringResource((Enum)prismPropertyValue.getValue()).getString(); + } + return String.valueOf(prismPropertyValue.getValue()); + } + + String lookupTableKey = prismPropertyValue.getValue().toString(); + LookupTableType lookupTableObject = lookupTable.asObjectable(); + String rowLabel = ""; + for (LookupTableRowType lookupTableRow : lookupTableObject.getRow()) { + if (lookupTableRow.getKey().equals(lookupTableKey)) { + return lookupTableRow.getLabel() != null ? lookupTableRow.getLabel().getOrig() : lookupTableRow.getValue(); + } } + return rowLabel; } - return rowLabel; + if (object instanceof Enum) { + return getPageBase().createStringResource((Enum)object).getString(); + } + if (object instanceof ObjectType){ + return WebComponentUtil.getDisplayName(((ObjectType)object).asPrismObject()); + } + if (object instanceof PrismObject){ + return WebComponentUtil.getDisplayName((PrismObject) object); + } + if (object instanceof PrismObjectValue){ + return WebComponentUtil.getDisplayName(((PrismObjectValue) object).asPrismObject()); + } + if (object instanceof PrismReferenceValue) { + return WebComponentUtil.getDisplayName(((PrismReferenceValue) object).getRealValue(), true); + } + if (object instanceof ObjectReferenceType) { + return WebComponentUtil.getDisplayName(((ObjectReferenceType) object)); + } + return object.toString(); } private boolean isPolyString(QName typeName) { @@ -693,7 +764,7 @@ private List> initColumns() { if (others == null) { return columns; } else { - IColumn nameColumn = createNameColumn(null, null, null); + IColumn nameColumn = createNameColumn(null, null, null, null); if (nameColumn != null) { columns.add(nameColumn); } @@ -712,7 +783,7 @@ protected IColumn createCheckboxColumn(){ protected abstract IColumn createIconColumn(); - protected IColumn createNameColumn(IModel displayModel, String itemPath, ExpressionType expression) { + protected IColumn createNameColumn(IModel displayModel, GuiObjectColumnType customColumn, String itemPath, ExpressionType expression) { return null; } @@ -833,7 +904,7 @@ protected int getAutoRefreshInterval() { return 0; } - protected final CompiledObjectCollectionView getObjectCollectionView() { + protected CompiledObjectCollectionView getObjectCollectionView() { CompiledObjectCollectionView view = getWidgetCollectionView(); if (view != null) { return view; @@ -932,18 +1003,26 @@ protected Collection> getOptions(){ public void refreshTable(AjaxRequestTarget target) { BoxedTablePanel table = getTable(); if (searchModel.getObject().isTypeChanged()){ - table.getDataTable().getColumns().clear(); - //noinspection unchecked - table.getDataTable().getColumns().addAll(createColumns()); - ((WebMarkupContainer) table.get("box")).addOrReplace(initSearch("header")); - resetSearchModel(); - table.setCurrentPage(null); + resetTable(target); } else { saveSearchModel(getCurrentTablePaging()); } - target.add(table); - target.add(getPageBase().getFeedbackPanel()); + target.add(getFeedbackPanel()); + } + + public void resetTable(AjaxRequestTarget target) { + BoxedTablePanel table = getTable(); + table.getDataTable().getColumns().clear(); + //noinspection unchecked + table.getDataTable().getColumns().addAll(createColumns()); + ((WebMarkupContainer) table.get("box")).addOrReplace(initSearch("header")); + resetSearchModel(); + table.setCurrentPage(null); + } + + protected Component getFeedbackPanel() { + return getPageBase().getFeedbackPanel(); } public void resetSearchModel(){ @@ -1115,4 +1194,19 @@ protected void createReportPerformed(AjaxRequestTarget target) { protected GuiObjectListViewType getDefaultView() { return DefaultColumnUtils.getDefaultView(getType()); } + + protected void setDefaultSorting(ISelectableDataProvider provider){ + if (provider instanceof SortableDataProvider + && isCollectionViewPanel() && getObjectCollectionView().getPaging() != null + && getObjectCollectionView().getPaging().getOrderBy() != null) { + PagingType paging = getObjectCollectionView().getPaging(); + boolean ascending = !OrderDirectionType.DESCENDING.equals(paging.getOrderDirection()); + ItemPath orderBy = paging.getOrderBy().getItemPath(); + ItemName name = orderBy.lastName(); + if (name == null) { + return; + } + ((SortableDataProvider)provider).setSort(new SortParam(name.getLocalPart(), ascending)); + } + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumn.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumn.java index 7560f078232..1d77b665186 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumn.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumn.java @@ -31,7 +31,8 @@ public abstract class AbstractItemWrapperColumn> mainModel, ItemPath itemName, ColumnType columnType) { super(null); Validate.notNull(mainModel, "no model"); - Validate.notNull(mainModel.getObject(), "no ContainerWrappe from model"); + Validate.notNull(mainModel.getObject(), "no ContainerWrapper from model"); Validate.notNull(itemName, "no qName"); this.mainModel = mainModel; this.itemName = itemName; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumnPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumnPanel.java index ba856284ce4..9b66f897748 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumnPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/AbstractItemWrapperColumnPanel.java @@ -18,6 +18,7 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import com.evolveum.midpoint.gui.api.component.BasePanel; @@ -89,10 +90,22 @@ protected void populate(ListItem item) { case VALUE: item.add(createValuePanel(ID_VALUE, getModel(), item.getModelObject())); break; + case EXISTENCE_OF_VALUE: + IModel labelModel = Model.of(""); + if (existenceOfValue(item.getModelObject())) { + labelModel = getPageBase().createStringResource("AbstractItemWrapperColumnPanel.existValue"); + } + Label existence = new Label(ID_VALUE, labelModel); + item.add(existence); + break; } } protected abstract String createLabel(VW object); protected abstract Panel createLink(String id, IModel object); protected abstract Panel createValuePanel(String id, IModel model, VW object); + protected boolean existenceOfValue(VW object) { + Object realValue = object.getRealValue(); + return realValue != null; + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java index 98fcb25e46c..8e4b3bca426 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java @@ -381,36 +381,11 @@ private MainMenuItem createNodesItems() { } private MainMenuItem createReportsItems() { - MainMenuItem reportsMenu = createMainMenuItem("PageAdmin.menu.top.reports", GuiStyleConstants.CLASS_REPORT_ICON); - reportsMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.list", GuiStyleConstants.CLASS_REPORT_ICON, PageReports.class)); - - if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_REPORTS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, - AuthorizationConstants.AUTZ_UI_REPORTS_VIEW_URL)) { - - addCollectionsMenuItems(reportsMenu, ReportType.COMPLEX_TYPE, PageReports.class); - } - - if (classMatches(PageReport.class)) { - MenuItem edit = new MenuItem("PageAdmin.menu.top.reports.edit", - PageReport.class); - reportsMenu.addMenuItem(edit); - } - - if (classMatches(PageJasperReport.class)) { - MenuItem configure = new MenuItem("PageAdmin.menu.top.reports.configure", - PageJasperReport.class); - reportsMenu.addMenuItem(configure); - } - - reportsMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.created", PageCreatedReports.class)); - reportsMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.new", PageNewReport.class)); - - -// if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.AUDIT_READ.getUrl())) { - reportsMenu.addMenuItem(new MenuItem("PageAuditLogViewer.menuName", PageAuditLogViewer.class)); -// } - - return reportsMenu; + MainMenuItem reportMenu = createMainMenuItem("PageAdmin.menu.top.reports", GuiStyleConstants.CLASS_REPORT_ICON); + createBasicAssignmentHolderMenuItems(reportMenu, PageTypes.REPORT); + reportMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.created", PageCreatedReports.class)); + reportMenu.addMenuItem(new MenuItem("PageAuditLogViewer.menuName", PageAuditLogViewer.class)); + return reportMenu; } private SideBarMenuItem createConfigurationMenu(boolean experimentalFeaturesEnabled) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java index a3e3669c1bf..4b7d0673129 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/PageTypes.java @@ -12,6 +12,8 @@ import com.evolveum.midpoint.web.page.admin.cases.PageCases; import com.evolveum.midpoint.web.page.admin.orgs.PageOrgUnit; import com.evolveum.midpoint.web.page.admin.orgs.PageOrgs; +import com.evolveum.midpoint.web.page.admin.reports.PageReport; +import com.evolveum.midpoint.web.page.admin.reports.PageReports; import com.evolveum.midpoint.web.page.admin.resources.PageResource; import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard; import com.evolveum.midpoint.web.page.admin.resources.PageResources; @@ -35,7 +37,8 @@ public enum PageTypes { ORG("orgs", GuiStyleConstants.CLASS_OBJECT_ORG_ICON, PageOrgs.class, PageOrgUnit.class, OrgType.COMPLEX_TYPE), TASK("tasks", GuiStyleConstants.CLASS_OBJECT_TASK_ICON, PageTasks.class, PageTask.class, TaskType.COMPLEX_TYPE), RESOURCE("resources", GuiStyleConstants.CLASS_OBJECT_RESOURCE_ICON, PageResources.class, PageResourceWizard.class, ResourceType.COMPLEX_TYPE), - CASE("cases", GuiStyleConstants.EVO_CASE_OBJECT_ICON, PageCases.class, null, CaseType.COMPLEX_TYPE); + CASE("cases", GuiStyleConstants.EVO_CASE_OBJECT_ICON, PageCases.class, null, CaseType.COMPLEX_TYPE), + REPORT("reports", GuiStyleConstants.CLASS_REPORT_ICON, PageReports .class, PageReport.class, ReportType.COMPLEX_TYPE); private String identifier; private String icon; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java new file mode 100644 index 00000000000..aeee61092c6 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2010-2020 Evolveum and contributors + * + * This work is dual-licensed under the Apache License 2.0 + * and European Union Public License. See LICENSE file for details. + */ +package com.evolveum.midpoint.gui.impl.factory.panel; + +import com.evolveum.midpoint.gui.api.component.autocomplete.AutoCompleteReferenceRenderer; +import com.evolveum.midpoint.gui.api.factory.GuiComponentFactory; +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismReferenceWrapper; +import com.evolveum.midpoint.gui.api.registry.GuiComponentRegistry; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismReferenceValueWrapperImpl; +import com.evolveum.midpoint.report.api.ReportConstants; +import com.evolveum.midpoint.util.QNameUtil; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.midpoint.web.component.data.LinkedReferencePanel; +import com.evolveum.midpoint.web.component.search.ReferenceAutocomplete; +import com.evolveum.midpoint.web.component.search.ReferenceValueSearchPopupPanel; +import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; + +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; + +import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.model.Model; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * @author lskublik + */ +@Component +public class AutoCompleteReferencePanelFactory + implements GuiComponentFactory> { + + private static final Trace LOGGER = TraceManager.getTrace(AutoCompleteReferencePanelFactory.class); + + @Autowired private GuiComponentRegistry registry; + + @PostConstruct + public void register() { + registry.addToRegistry(this); + } + + @Override + public Integer getOrder() { + return 100; + } + + @Override + public > boolean match(IW wrapper) { + return QNameUtil.match(ObjectReferenceType.COMPLEX_TYPE, wrapper.getTypeName()) + && ReportConstants.NS_EXTENSION.equals(wrapper.getNamespace()) + && wrapper.getParent() == null; + } + + @Override + public org.apache.wicket.Component createPanel(PrismReferencePanelContext panelCtx) { + ReferenceAutocomplete panel = new ReferenceAutocomplete(panelCtx.getComponentId(), panelCtx.getRealValueModel(), + new AutoCompleteReferenceRenderer(), + panelCtx.getPageBase()); + panel.setOutputMarkupId(true); + panel.add(AttributeAppender.append("style", "padding-top:5px")); //ugly hack to be aligned with prism-property-label + return panel; + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java index a2db6bf3f08..98fa8e16097 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java @@ -10,6 +10,8 @@ import javax.annotation.PostConstruct; import javax.xml.namespace.QName; +import com.evolveum.midpoint.xml.ns._public.common.common_3.GuiObjectListViewType; + import org.apache.wicket.model.Model; import org.springframework.stereotype.Component; @@ -44,9 +46,10 @@ protected InputPanel getPanel(PrismPropertyPanelContext panelCtx) { List typesList; if (AssignmentType.F_FOCUS_TYPE.equals(panelCtx.getDefinitionName())) { typesList = WebComponentUtil.createFocusTypeList(); - } else if (ObjectCollectionType.F_TYPE.equals(panelCtx.getDefinitionName()) && - panelCtx.unwrapWrapperModel().getParent().getDefinition() != null && - ObjectCollectionType.class.equals(panelCtx.unwrapWrapperModel().getParent().getDefinition().getTypeClass())) { + } else if ((ObjectCollectionType.F_TYPE.equals(panelCtx.getDefinitionName()) || GuiObjectListViewType.F_TYPE.equals(panelCtx.getDefinitionName())) + && panelCtx.unwrapWrapperModel().getParent().getDefinition() != null && + (ObjectCollectionType.class.equals(panelCtx.unwrapWrapperModel().getParent().getDefinition().getTypeClass()) + || GuiObjectListViewType.class.equals(panelCtx.unwrapWrapperModel().getParent().getDefinition().getTypeClass()))) { typesList = WebComponentUtil.createContainerableTypesQnameList(); } else { typesList = WebComponentUtil.createObjectTypeList(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ParameterTypePanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ParameterTypePanelFactory.java new file mode 100644 index 00000000000..127a24b95bc --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ParameterTypePanelFactory.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2010-2020 Evolveum and contributors + * + * This work is dual-licensed under the Apache License 2.0 + * and European Union Public License. See LICENSE file for details. + */ +package com.evolveum.midpoint.gui.impl.factory.panel; + +import java.io.Serializable; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.xml.namespace.QName; + +import com.evolveum.midpoint.util.QNameUtil; +import com.evolveum.midpoint.web.component.input.TextPanel; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; + +import org.apache.commons.lang3.StringUtils; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.springframework.stereotype.Component; + +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.util.DOMUtil; +import com.evolveum.midpoint.web.component.input.DropDownChoicePanel; +import com.evolveum.midpoint.web.component.input.QNameObjectTypeChoiceRenderer; +import com.evolveum.midpoint.web.component.prism.InputPanel; +import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior; + +/** + * @author katkav + */ +@Component +public class ParameterTypePanelFactory extends DropDownChoicePanelFactory implements Serializable { + + @Override + public > boolean match(IW wrapper) { + return DOMUtil.XSD_QNAME.equals(wrapper.getTypeName()) + && SearchFilterParameterType.F_TYPE.equals(wrapper.getItemName()) + && wrapper.getParent().getDefinition() != null + && ParameterType.class.isAssignableFrom(wrapper.getParent().getDefinition().getTypeClass()); + } + + @Override + protected InputPanel getPanel(PrismPropertyPanelContext panelCtx) { + IModel qNameModel = new IModel() { + @Override + public String getObject() { + if (panelCtx.getRealValueModel().getObject() != null) { + return panelCtx.getRealValueModel().getObject().getLocalPart(); + } + return null; + } + + @Override + public void setObject(String object) { + if (StringUtils.isNotEmpty(object)){ + QName objectQName = getQName(object); + if (!QNameUtil.match(objectQName, panelCtx.getRealValueModel().getObject())) { + panelCtx.getRealValueModel().setObject(objectQName); + } + } else { + panelCtx.getRealValueModel().setObject(null); + } + } + }; + return new TextPanel(panelCtx.getComponentId(), qNameModel, String.class, false); + } + + private QName getQName(String object){ + if (QNameUtil.match(ObjectReferenceType.COMPLEX_TYPE, new QName(object))) { + return ObjectReferenceType.COMPLEX_TYPE; + } + if (QNameUtil.isUriQName(object)) { + return QNameUtil.uriToQName(object); + } + return new QName(object); + } + + @Override + public Integer getOrder() { + return 9000; + } + +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PrismPropertyPanelContext.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PrismPropertyPanelContext.java index 2f47d5b5cef..b88d355f427 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PrismPropertyPanelContext.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PrismPropertyPanelContext.java @@ -8,9 +8,11 @@ import com.evolveum.midpoint.gui.api.model.ReadOnlyModel; import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper; +import com.evolveum.midpoint.util.DisplayableValue; import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.StringResourceModel; + +import java.util.Collection; /** * @author katka @@ -27,6 +29,10 @@ public LookupTableType getPredefinedValues() { return unwrapWrapperModel().getPredefinedValues(); } + public Collection> getAllowedValues() { + return unwrapWrapperModel().getAllowedValues(); + } + public boolean hasValueEnumerationRef() { return unwrapWrapperModel().getValueEnumerationRef() != null; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java index eee4d69107d..109bd26ddb2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java @@ -7,11 +7,24 @@ package com.evolveum.midpoint.gui.impl.factory.panel; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.PostConstruct; import javax.xml.namespace.QName; +import com.evolveum.midpoint.util.DisplayableValue; + +import com.evolveum.midpoint.web.component.search.FilterSearchItem; +import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.model.PropertyModel; import org.springframework.stereotype.Component; import com.evolveum.midpoint.common.LocalizationService; @@ -43,21 +56,44 @@ public void register() { @Override protected InputPanel getPanel(PrismPropertyPanelContext panelCtx) { LookupTableType lookupTable = panelCtx.getPredefinedValues(); - if (lookupTable == null) { - return new TextPanel<>(panelCtx.getComponentId(), - panelCtx.getRealValueModel(), panelCtx.getTypeClass(), false); + if (lookupTable != null) { + return new AutoCompleteTextPanel(panelCtx.getComponentId(), + panelCtx.getRealValueModel(), panelCtx.getTypeClass(), panelCtx.hasValueEnumerationRef(), lookupTable) { + + private static final long serialVersionUID = 1L; + + @Override + public Iterator getIterator(String input) { + return (Iterator) prepareAutoCompleteList(input, lookupTable, panelCtx.getPageBase().getLocalizationService()).iterator(); + } + }; } - return new AutoCompleteTextPanel(panelCtx.getComponentId(), - panelCtx.getRealValueModel(), panelCtx.getTypeClass(), panelCtx.hasValueEnumerationRef(), lookupTable) { + Collection> allowedValues = panelCtx.getAllowedValues(); + if (CollectionUtils.isNotEmpty(allowedValues)) { + IModel>> choices = Model.ofList(allowedValues.stream().collect(Collectors.toCollection(ArrayList::new))); + IModel convertModel = new IModel>(){ + @Override + public DisplayableValue getObject() { + Object value = panelCtx.getRealValueModel().getObject(); + for (DisplayableValue dispValue : choices.getObject()) { + if (dispValue.getValue().equals(value)) { + return dispValue; + } + } + return null; + } - private static final long serialVersionUID = 1L; + @Override + public void setObject(DisplayableValue object) { + panelCtx.getRealValueModel().setObject(object.getValue()); + } + }; + return WebComponentUtil.createDropDownChoices(panelCtx.getComponentId(), convertModel, choices, true, panelCtx.getPageBase()); + } - @Override - public Iterator getIterator(String input) { - return (Iterator) prepareAutoCompleteList(input, lookupTable, panelCtx.getPageBase().getLocalizationService()).iterator(); - } - }; + return new TextPanel<>(panelCtx.getComponentId(), + panelCtx.getRealValueModel(), panelCtx.getTypeClass(), false); } protected List prepareAutoCompleteList(String input, LookupTableType lookupTable, LocalizationService localizationService) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/JasperTemplateModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/JasperTemplateModel.java deleted file mode 100644 index 47695d2bb5d..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/JasperTemplateModel.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ - -package com.evolveum.midpoint.gui.impl.model; - -import com.evolveum.midpoint.util.exception.SystemException; - -import org.apache.commons.codec.binary.Base64; -import org.apache.wicket.model.IModel; - -import java.nio.charset.StandardCharsets; - -/** - * @author skublik - */ -public class JasperTemplateModel implements IModel { - - private IModel model; - - public JasperTemplateModel(IModel model) { - this.model = model; - } - - @Override - public String getObject() { - if (model.getObject() == null) { - return null; - } - byte[] obj; - if (Base64.isBase64(model.getObject())) { - obj = Base64.decodeBase64(model.getObject()); - } else { - obj = model.getObject(); - } - - return new String(obj, StandardCharsets.UTF_8); - } - - @Override - public void setObject(String object) { - if (object == null) { - model.setObject(null); - return; - } - - byte[] val = object.getBytes(StandardCharsets.UTF_8); - model.setObject(val); - } - - @Override - public void detach() { - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java index c9068926551..451275ecff2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java @@ -78,7 +78,7 @@ protected Component createValuePanel(ListItem> ite PrismContainerValuePanel> panel = new PrismContainerValuePanel>("value", item.getModel(), settings) { @Override - protected void removeValue(PrismContainerValueWrapper valueToRemove, AjaxRequestTarget target) throws SchemaException { + protected void remove(PrismContainerValueWrapper valueToRemove, AjaxRequestTarget target) throws SchemaException { PrismContainerPanel.this.removeValue(valueToRemove, target); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java index 79f2226eb27..349187095b3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java @@ -283,7 +283,7 @@ public boolean isOn() { } @Override - protected void removeValue(CVW valueToRemove, AjaxRequestTarget target) throws SchemaException { + protected void remove(CVW valueToRemove, AjaxRequestTarget target) throws SchemaException { throw new UnsupportedOperationException("Must be implemented in calling panel"); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.java index 94b14552588..5929211a7f1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.java @@ -53,8 +53,8 @@ protected Component createValuePanel(ListItem> item PrismPropertyValuePanel panel = new PrismPropertyValuePanel("value", item.getModel(), getSettings()) { @Override - protected void removeValue(PrismPropertyValueWrapper valueToRemove, AjaxRequestTarget target) throws SchemaException { - PrismPropertyPanel.this.removeValue(valueToRemove, target); + protected void remove(PrismPropertyValueWrapper valueToRemove, AjaxRequestTarget target) throws SchemaException { + removeValue(valueToRemove, target); } }; item.add(panel); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyValuePanel.java index df83520838f..c90f502710f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyValuePanel.java @@ -51,7 +51,7 @@ protected PV createNewValue(PrismPropertyWrapper item } @Override - protected void removeValue(PrismPropertyValueWrapper valueToRemove, AjaxRequestTarget target) throws SchemaException { + protected void remove(PrismPropertyValueWrapper valueToRemove, AjaxRequestTarget target) throws SchemaException { throw new UnsupportedOperationException("Must be implemented in calling panel"); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferencePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferencePanel.java index 6a6578347f4..18ea1ed1697 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferencePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferencePanel.java @@ -47,7 +47,7 @@ protected void refreshPanel(AjaxRequestTarget target) { protected Component createValuePanel(ListItem> item) { PrismReferenceValuePanel valuePanel = new PrismReferenceValuePanel(ID_VALUE, item.getModel(), getSettings()) { @Override - protected void removeValue( + protected void remove( PrismReferenceValueWrapperImpl valueToRemove, AjaxRequestTarget target) throws SchemaException { PrismReferencePanel.this.removeValue(valueToRemove, target); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferenceValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferenceValuePanel.java index d048965fd10..87588775e4d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferenceValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferenceValuePanel.java @@ -118,7 +118,7 @@ private PrismReferenceWrapper getParentWrapper() { } @Override - protected void removeValue(PrismReferenceValueWrapperImpl valueToRemove, AjaxRequestTarget target) throws SchemaException { + protected void remove(PrismReferenceValueWrapperImpl valueToRemove, AjaxRequestTarget target) throws SchemaException { throw new UnsupportedOperationException("Must be implemented in calling panel"); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java index 76f0ea2a8ea..79d2923a491 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValuePanel.java @@ -87,7 +87,7 @@ private WebMarkupContainer createHeaderPanel() { @Override public void onClick(AjaxRequestTarget target) { try { - removeValue(PrismValuePanel.this.getModelObject(), target); + PrismValuePanel.this.remove(PrismValuePanel.this.getModelObject(), target); } catch (SchemaException e) { LOGGER.error("Cannot remove value: {}", getModelObject()); getSession().error("Cannot remove value " + getModelObject()); @@ -272,7 +272,7 @@ private O getObject() { protected abstract PV createNewValue(IW itemWrapper); //TODO move to the ItemPanel, exception handling - protected abstract void removeValue(VW valueToRemove, AjaxRequestTarget target) throws SchemaException; + protected abstract void remove(VW valueToRemove, AjaxRequestTarget target) throws SchemaException; private void showMetadataPerformed(VW value, AjaxRequestTarget target) { boolean showMetadata = !value.isShowMetadata(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/SingleContainerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/SingleContainerPanel.java index 53b086acd2d..a5bd4205a9f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/SingleContainerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/SingleContainerPanel.java @@ -9,6 +9,8 @@ import javax.xml.namespace.QName; +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; + import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -45,7 +47,7 @@ private void initLayout() { try { ItemPanelSettingsBuilder builder = new ItemPanelSettingsBuilder() - .visibilityHandler(wrapper -> getVisibility(wrapper.getPath())) + .visibilityHandler(wrapper -> getVisibility(wrapper)) .editabilityHandler(getEditabilityHandler()) .mandatoryHandler(getMandatoryHandler()); Panel panel = getPageBase().initItemPanel(ID_CONTAINER, getTypeName(), getModel(), builder.build()); @@ -62,7 +64,7 @@ protected QName getTypeName() { return typeName; } - protected ItemVisibility getVisibility(ItemPath itemPath) { + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { return ItemVisibility.AUTO; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ValueMetadataPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ValueMetadataPanel.java index 0b5abd8f78c..ce0625cfe85 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ValueMetadataPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ValueMetadataPanel.java @@ -84,7 +84,7 @@ protected PV createNewValue(PrismContainerWrapper ite } @Override - protected void removeValue(CVW valueToRemove, AjaxRequestTarget target) { + protected void remove(CVW valueToRemove, AjaxRequestTarget target) { } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java index 9af2c76d0ea..77bc05f795c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java @@ -28,7 +28,6 @@ import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.schema.util.ReportTypeUtil; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.MiscUtil; import com.evolveum.midpoint.util.exception.ObjectNotFoundException; @@ -37,7 +36,6 @@ import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; /** * Imports initial data objects as needed, ignoring already imported objects. @@ -103,10 +101,6 @@ private ImportResult importInitialObjectsResource( String objectText = IOUtils.toString(resourceInputStream, StandardCharsets.UTF_8); object = prismContext.parseObject(objectText); } - if (ReportType.class.equals(object.getCompileTimeClass())) { - //noinspection unchecked - ReportTypeUtil.applyDefinition((PrismObject) object, prismContext); - } return importObject(object, resource.getFilename(), task, mainResult, overwrite); } catch (Exception ex) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSearchDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSearchDataProvider.java index bc8b44d36d3..fe8e249d808 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSearchDataProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSearchDataProvider.java @@ -49,6 +49,10 @@ IModel> getSearchModel() { @Override public ObjectQuery getQuery() { + return search.getObject() == null ? null : search.getObject().createObjectQuery(getVariables(), getPageBase(), getCustomizeContentQuery()); + } + + protected VariablesMap getVariables() { VariablesMap expVariables = new VariablesMap(); for (Map.Entry entry : variables.entrySet()) { if (entry.getValue() == null) { @@ -57,7 +61,7 @@ public ObjectQuery getQuery() { expVariables.put(entry.getKey(), entry.getValue(), entry.getValue().getClass()); } } - return search.getObject() == null ? null : search.getObject().createObjectQuery(expVariables.isEmpty() ? null : expVariables, getPageBase(), getCustomizeContentQuery()); + return expVariables.isEmpty() ? null : expVariables; } protected ObjectQuery getCustomizeContentQuery() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java index d7c85361d03..86443a8f18b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java @@ -228,7 +228,7 @@ public WebMarkupContainer getFooter() { return (WebMarkupContainer) get(ID_BOX).get(ID_FOOTER); } - protected WebMarkupContainer createHeader(String headerId) { + protected Component createHeader(String headerId) { WebMarkupContainer header = new WebMarkupContainer(headerId); header.setVisible(false); return header; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchItemPanel.java index 535e1b69a57..cb1cd20b1d6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchItemPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchItemPanel.java @@ -157,30 +157,6 @@ protected IModel>> createBooleanChoices() { return Model.ofList(list); } - protected DropDownChoicePanel createDropDownChoices(String id, IModel model, IModel>> choices, boolean allowNull) { - return new DropDownChoicePanel(id, model, choices, new IChoiceRenderer() { - private static final long serialVersionUID = 1L; - - @Override - public Object getDisplayValue(DisplayableValue val) { - if (val.getValue() instanceof Enum) { - return getPageBase().createStringResource((Enum) val.getValue()).getString(); - } - return getPageBase().createStringResource(val.getLabel()).getString(); - } - - @Override - public String getIdValue(DisplayableValue val, int index) { - return Integer.toString(index); - } - - @Override - public DisplayableValue getObject(String id, IModel> choices) { - return StringUtils.isNotBlank(id) ? choices.getObject().get(Integer.parseInt(id)) : null; - } - }, allowNull); - } - protected AutoCompleteTextPanel createAutoCompetePanel(String id, IModel model, LookupTableType lookupTable) { AutoCompleteTextPanel autoCompletePanel = new AutoCompleteTextPanel(id, model, String.class, true, lookupTable) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/FilterSearchItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/FilterSearchItem.java index 779c097c487..9a0432fbf46 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/FilterSearchItem.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/FilterSearchItem.java @@ -7,6 +7,7 @@ package com.evolveum.midpoint.web.component.search; import java.io.Serializable; +import java.util.Collections; import java.util.List; import org.apache.commons.collections4.CollectionUtils; @@ -131,48 +132,17 @@ public List> getAllowedValues(PageBase pageBase) { if (allowedValues != null) { return allowedValues; } - - if (predefinedFilter == null || predefinedFilter.getParameter() == null - || predefinedFilter.getParameter().getAllowedValuesExpression() == null) { - return null; - } - Task task = pageBase.createSimpleTask("evaluate expression for allowed values"); - ExpressionType expression = predefinedFilter.getParameter().getAllowedValuesExpression(); - Object value = null; - try { - - value = ExpressionUtil.evaluateExpression(new VariablesMap(), null, - expression, MiscSchemaUtil.getExpressionProfile(), - pageBase.getExpressionFactory(), "evaluate expression for allowed values", task, task.getResult()); - } catch (Exception e) { - LOGGER.error("Couldn't execute expression " + expression, e); - pageBase.error(pageBase.createStringResource("FilterSearchItem.message.error.evaluateAllowedValuesExpression", expression).getString()); - return null; - } - if (value instanceof PrismPropertyValue) { - value = ((PrismPropertyValue) value).getRealValue(); - } - - if (!(value instanceof List)) { - LOGGER.error("Exception return unexpected type, expected List, but was " + (value == null ? null : value.getClass())); - pageBase.error(pageBase.createStringResource("FilterSearchItem.message.error.wrongType", expression).getString()); - return null; - } - - if (!((List) value).isEmpty()) { - if (!(((List) value).get(0) instanceof DisplayableValue)) { - LOGGER.error("Exception return unexpected type, expected List, but was " + (value == null ? null : value.getClass())); - pageBase.error(pageBase.createStringResource("FilterSearchItem.message.error.wrongType", expression).getString()); - return null; - } + if (predefinedFilter == null) { + return Collections.EMPTY_LIST; } - this.allowedValues = (List>) value; - return (List>) value; + List> values = WebComponentUtil.getAllowedValues(predefinedFilter.getParameter(), pageBase); + return values; } public LookupTableType getLookupTable(PageBase pageBase) { if (predefinedFilter != null && predefinedFilter.getParameter() != null - && predefinedFilter.getParameter().getAllowedValuesLookupTable() != null) { + && predefinedFilter.getParameter().getAllowedValuesLookupTable() != null + && predefinedFilter.getParameter().getAllowedValuesLookupTable().getOid() != null) { PrismObject lokupTable = WebComponentUtil.findLookupTable(predefinedFilter.getParameter().getAllowedValuesLookupTable().asReferenceValue(), pageBase); if (lokupTable != null) { return lokupTable.asObjectable(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java index 04ec0521258..d81662e78f0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceAutocomplete.java @@ -11,6 +11,7 @@ import java.util.Iterator; import java.util.List; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; import org.apache.commons.lang3.StringUtils; @@ -36,14 +37,16 @@ /** * @author honchar */ -public abstract class ReferenceAutocomplete extends AutoCompleteTextPanel { +public class ReferenceAutocomplete extends AutoCompleteTextPanel { private static final long serialVersionUID = 1L; private final PageBase pageBase; + private final IModel model; public ReferenceAutocomplete(String id, final IModel model, IAutoCompleteRenderer renderer, PageBase pageBase) { super(id, model, ObjectReferenceType.class, renderer); this.pageBase = pageBase; + this.model = model; } @Override @@ -82,7 +85,10 @@ protected boolean isAllowedNotFoundObjectRef() { } protected Class getReferenceTargetObjectType(){ - return (Class) AbstractRoleType.class; + if (model.getObject() == null || model.getObject().getType() == null) { + return (Class) ObjectType.class; + } + return (Class) WebComponentUtil.qnameToClass(pageBase.getPrismContext(), model.getObject().getType()); } protected int getMaxRowsCount() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java index 91e418e9c68..fbd73726e83 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java @@ -6,9 +6,12 @@ */ package com.evolveum.midpoint.web.component.search; +import java.util.Collections; import java.util.List; import javax.xml.namespace.QName; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; + import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.model.IModel; @@ -46,7 +49,10 @@ protected List getAllowedRelations() { @Override protected List getSupportedTargetList() { - return WebComponentUtil.createSupportedTargetTypeList((referenceDef).getTargetTypeName()); + if (referenceDef != null) { + return WebComponentUtil.createSupportedTargetTypeList(referenceDef.getTargetTypeName()); + } + return Collections.singletonList(ObjectType.COMPLEX_TYPE); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java index e1367088571..fbcad782935 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java @@ -28,6 +28,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.feedback.ComponentFeedbackMessageFilter; +import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -86,14 +87,6 @@ public void setObject(String object) { private static final long serialVersionUID = 1L; - @Override - protected Class getReferenceTargetObjectType() { - if (getModelObject().getType() == null) { - return (Class) ObjectType.class; - } - return (Class) WebComponentUtil.qnameToClass(getPageBase().getPrismContext(), getModelObject().getType()); - } - @Override protected boolean isAllowedNotFoundObjectRef() { return ReferenceValueSearchPopupPanel.this.isAllowedNotFoundObjectRef(); @@ -188,6 +181,7 @@ protected void onSelectPerformed(AjaxRequestTarget target, O object) { getPageBase().showMainPopup(objectBrowserPanel, target); } }; + selectObject.add(new VisibleBehaviour(() -> getPageBase().getMainPopup() instanceof WebMarkupContainer)); midpointForm.add(selectObject); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java index f0aa95cba97..47473ae364a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java @@ -266,6 +266,16 @@ public SearchItem addItem(SearchItemType predefinedFilter) { FilterSearchItem item = new FilterSearchItem(this, predefinedFilter); item.setDefinition(def); + if (predefinedFilter != null && predefinedFilter.getParameter() != null + && QNameUtil.match(predefinedFilter.getParameter().getType(), ObjectReferenceType.COMPLEX_TYPE)) { + ObjectReferenceType ref = new ObjectReferenceType(); + List supportedTargets = WebComponentUtil.createSupportedTargetTypeList(predefinedFilter.getParameter().getTargetType()); + if (supportedTargets.size() == 1) { + ref.setType(supportedTargets.iterator().next()); + } + item.setInput(new SearchValue<>(ref)); + } + items.add(item); availableDefinitions.remove(def); return item; @@ -438,15 +448,7 @@ private ObjectQuery createObjectQuerySimple(VariablesMap defaultVariables, PageB } } - VariablesMap variables = defaultVariables == null ? new VariablesMap() : defaultVariables; - for (FilterSearchItem item : getFilterItems()) { - SearchFilterParameterType functionParameter = item.getPredefinedFilter().getParameter(); - if (functionParameter != null && functionParameter.getType() != null) { - Class inputClass = pageBase.getPrismContext().getSchemaRegistry().determineClassForType(functionParameter.getType()); - TypedValue value = new TypedValue(item.getInput() != null ? item.getInput().getValue() : null, inputClass); - variables.put(functionParameter.getName(), value); - } - } + VariablesMap variables = getFilterVariables(defaultVariables, pageBase); for (FilterSearchItem item : getFilterItems()) { if (item.isEnabled() && item.isApplyFilter()) { @@ -500,6 +502,19 @@ private ObjectQuery createObjectQuerySimple(VariablesMap defaultVariables, PageB return query; } + public VariablesMap getFilterVariables(VariablesMap defaultVariables, PageBase pageBase) { + VariablesMap variables = defaultVariables == null ? new VariablesMap() : defaultVariables; + for (FilterSearchItem item : getFilterItems()) { + SearchFilterParameterType functionParameter = item.getPredefinedFilter().getParameter(); + if (functionParameter != null && functionParameter.getType() != null) { + Class inputClass = pageBase.getPrismContext().getSchemaRegistry().determineClassForType(functionParameter.getType()); + TypedValue value = new TypedValue(item.getInput() != null ? item.getInput().getValue() : null, inputClass); + variables.put(functionParameter.getName(), value); + } + } + return variables; + } + private ObjectFilter createFilterForSearchItem(PropertySearchItem item, PrismContext ctx) { if (!(item instanceof DateSearchItem) && (item.getValue() == null || item.getValue().getValue() == null)) { return null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java index ccc9c5121c1..ff15c3039c7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java @@ -238,7 +238,7 @@ public static Search createSearch( panelType, false ); } - public static Search createSearch( + private static Search createSearch( ContainerTypeSearchItem type, String collectionViewName, List fixedSearchItems, ResourceShadowDiscriminator discriminator, ModelServiceLocator modelServiceLocator, List availableItemPath, boolean useDefsFromSuperclass, boolean useObjectCollection, Search.PanelType panelType, boolean isOidSearchEnabled) { @@ -283,7 +283,38 @@ public static Search createSearch( return search; } - public static void processSearchItemDefFromCompiledView(List configuredSearchItemDefs, Search search, PrismContainerDefinition containerDef) { + public static Search createSearchForReport(Class type, List parameters, ModelServiceLocator modelServiceLocator) { + ContainerTypeSearchItem typeItem = new ContainerTypeSearchItem<>(new SearchValue<>(type, "")); + Search search = new Search(typeItem, new ArrayList<>(), false, SearchBoxModeType.BASIC, Collections.singletonList(SearchBoxModeType.BASIC), false); + + SchemaRegistry registry = modelServiceLocator.getPrismContext().getSchemaRegistry(); + PrismContainerDefinition objDef = registry.findContainerDefinitionByCompileTimeClass(type); + + final List configuredSearchItemDefs = new ArrayList<>(); + parameters.forEach(parameter -> { + SearchItemType searchItemType = new SearchItemType(); + searchItemType.setParameter(parameter); + searchItemType.setVisibleByDefault(true); + if (parameter.getDisplay() != null) { + if (parameter.getDisplay().getLabel() != null) { + searchItemType.setDisplayName(parameter.getDisplay().getLabel()); + } else { + searchItemType.setDisplayName(new PolyStringType(parameter.getName())); + } + if (parameter.getDisplay().getHelp() != null) { + searchItemType.setDescription( + modelServiceLocator.getLocalizationService().translate(parameter.getDisplay().getHelp().toPolyString())); + } + } + configuredSearchItemDefs.add(new SearchItemDefinition(searchItemType)); + return; + }); + processSearchItemDefFromCompiledView(configuredSearchItemDefs, search, objDef); + search.setCanConfigure(false); + return search; + } + + private static void processSearchItemDefFromCompiledView(List configuredSearchItemDefs, Search search, PrismContainerDefinition containerDef) { configuredSearchItemDefs.forEach(searchItemDef -> { search.addItemToAllDefinitions(searchItemDef); if (searchItemDef.isVisibleByDefault()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFilterPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFilterPanel.java index b03ae95109a..41105383128 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFilterPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFilterPanel.java @@ -8,10 +8,15 @@ import com.evolveum.midpoint.gui.api.component.autocomplete.AutoCompleteTextPanel; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.prism.MutableItemDefinition; +import com.evolveum.midpoint.prism.MutablePrismReferenceDefinition; +import com.evolveum.midpoint.prism.Referencable; +import com.evolveum.midpoint.report.api.ReportConstants; import com.evolveum.midpoint.util.DisplayableValue; import com.evolveum.midpoint.web.component.input.CheckPanel; import com.evolveum.midpoint.web.component.input.TextPanel; import com.evolveum.midpoint.web.component.prism.InputPanel; +import com.evolveum.midpoint.web.component.util.VisibleBehaviour; import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour; import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior; @@ -19,6 +24,8 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ParameterType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchFilterParameterType; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Validate; import org.apache.wicket.Component; @@ -59,6 +66,7 @@ protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) { } }); checkPanel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + checkPanel.add(new VisibleBehaviour(() -> canRemoveSearchItem())); checkPanel.setOutputMarkupId(true); searchItemContainer.add(checkPanel); @@ -75,10 +83,18 @@ protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) { IModel>> choices = null; switch (inputType) { case REFERENCE: - getModelObject().setInput(new SearchValue<>(new ObjectReferenceType())); + SearchFilterParameterType parameter = getModelObject().getPredefinedFilter().getParameter(); + MutablePrismReferenceDefinition def = null; + if (parameter != null) { + Class clazz = getPrismContext().getSchemaRegistry().determineClassForType(parameter.getType()); + QName type = getPrismContext().getSchemaRegistry().determineTypeForClass(clazz); + def = getPrismContext().definitionFactory().createReferenceDefinition( + new QName(parameter.getName()), type); + def.setTargetTypeName(parameter.getTargetType()); + } inputPanel = new ReferenceValueSearchPanel(ID_SEARCH_ITEM_FIELD, new PropertyModel<>(getModel(), FilterSearchItem.F_INPUT_VALUE), - null){ + def){ @Override protected void referenceValueUpdated(ObjectReferenceType ort, AjaxRequestTarget target) { searchPerformed(target); @@ -94,7 +110,8 @@ protected void referenceValueUpdated(ObjectReferenceType ort, AjaxRequestTarget createEnumChoices((Class) inputClass) : Model.ofList(getModelObject().getAllowedValues(getPageBase())); } if (choices != null) { - inputPanel = createDropDownChoices(ID_SEARCH_ITEM_FIELD, new PropertyModel<>(getModel(), FilterSearchItem.F_INPUT), choices, false); + inputPanel = WebComponentUtil.createDropDownChoices( + ID_SEARCH_ITEM_FIELD, new PropertyModel(getModel(), FilterSearchItem.F_INPUT), (IModel)choices, true, getPageBase()); ((InputPanel) inputPanel).getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior() { @Override protected void onUpdate(AjaxRequestTarget target) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html index bd7469de101..836dcacf3d1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html @@ -7,31 +7,30 @@ -->
-
-
- - - -
+
+ + + +
-
+
  @@ -41,8 +40,8 @@
- +
-
+
[Status indicator here]
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java index d99ed18acb8..ab41825215b 100755 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java @@ -388,7 +388,7 @@ protected void addStateButtons(RepeatingView stateButtonsView) { }; opButtonPanel.setOutputMarkupId(true); - opButtonPanel.add(new VisibleBehaviour(() -> isEditingFocus() && opButtonPanel.buttonsExist())); + opButtonPanel.add(new VisibleBehaviour(() -> isOperationalButtonsVisible() && opButtonPanel.buttonsExist())); AjaxSelfUpdatingTimerBehavior behavior = new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(getRefreshInterval())) { private static final long serialVersionUID = 1L; @@ -409,6 +409,10 @@ protected boolean shouldTrigger() { add(opButtonPanel); } + protected Boolean isOperationalButtonsVisible() { + return isEditingFocus(); + } + public boolean isRefreshEnabled() { return false; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java index 9ef6eca1713..16f88bba310 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java @@ -146,7 +146,7 @@ protected IColumn createIconColumn() { } @Override - protected IColumn createNameColumn(IModel displayModel, String itemPath, ExpressionType expression) { + protected IColumn createNameColumn(IModel displayModel, GuiObjectColumnType customColumn, String itemPath, ExpressionType expression) { return CaseWorkItemsPanel.this.createNameColumn(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollection.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollection.java index 290f4194d34..deff0714f50 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollection.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/objectCollection/PageObjectCollection.java @@ -148,9 +148,9 @@ public WebMarkupContainer createPanel(String panelId) { return new SingleContainerPanel(panelId, createModel(getObjectModel(), ObjectCollectionType.F_BASE_COLLECTION), CollectionRefSpecificationType.COMPLEX_TYPE) { @Override - protected ItemVisibility getVisibility(ItemPath itemPath) { + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { if (ItemPath.create(ObjectCollectionType.F_BASE_COLLECTION, CollectionRefSpecificationType.F_BASE_COLLECTION_REF) - .isSuperPathOrEquivalent(itemPath)) { + .isSuperPathOrEquivalent(itemWrapper.getPath())) { return ItemVisibility.HIDDEN; } return ItemVisibility.AUTO; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgUnit.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgUnit.html index ab21847ec88..74e7258ed24 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgUnit.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgUnit.html @@ -10,29 +10,6 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.html deleted file mode 100644 index da0b214909e..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -
- -
- - -
- - - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.java deleted file mode 100644 index a503cd31838..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.java +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright (c) 2010-2015 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports; - -import java.util.ArrayList; -import java.util.List; - -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; -import com.evolveum.midpoint.prism.delta.DeltaFactory; -import com.evolveum.midpoint.util.MiscUtil; -import com.evolveum.midpoint.web.component.form.MidpointForm; -import com.evolveum.midpoint.web.page.admin.PageAdmin; - -import org.apache.wicket.RestartResponseException; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.extensions.markup.html.tabs.AbstractTab; -import org.apache.wicket.extensions.markup.html.tabs.ITab; -import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.util.string.StringValue; - -import com.evolveum.midpoint.gui.api.model.LoadableModel; -import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; -import com.evolveum.midpoint.gui.impl.model.JasperTemplateModel; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.delta.ObjectDelta; -import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.security.api.AuthorizationConstants; -import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; -import com.evolveum.midpoint.web.application.AuthorizationAction; -import com.evolveum.midpoint.web.application.PageDescriptor; -import com.evolveum.midpoint.web.component.AjaxSubmitButton; -import com.evolveum.midpoint.web.component.TabbedPanel; -import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration; -import com.evolveum.midpoint.web.page.admin.reports.component.AceEditorPanel; -import com.evolveum.midpoint.web.page.admin.reports.component.JasperReportConfigurationPanel; -import com.evolveum.midpoint.web.page.admin.reports.component.ReportConfigurationPanel; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; -import com.evolveum.midpoint.web.util.OnePageParameterEncoder; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; - -/** - * @author shood - */ -@PageDescriptor(url = "/admin/jasperReport", encoder = OnePageParameterEncoder.class, action = { - @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORTS_ALL_URL, - label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, - description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION), - @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORT_URL, - label = "PageReport.auth.report.label", - description = "PageReport.auth.report.description")}) -public class PageJasperReport extends PageAdmin { - - private static final Trace LOGGER = TraceManager.getTrace(PageJasperReport.class); - - private static final String DOT_CLASS = PageJasperReport.class.getName() + "."; - private static final String OPERATION_LOAD_REPORT = DOT_CLASS + "loadReport"; - private static final String OPERATION_SAVE_REPORT = DOT_CLASS + "saveReport"; - private static final String OPERATION_VALIDATE_REPORT = DOT_CLASS + "validateReport"; - - private static final String ID_MAIN_FORM = "mainForm"; - private static final String ID_TAB_PANEL = "tabPanel"; - private static final String ID_SAVE_BUTTON = "save"; - private static final String ID_CANCEL_BUTTON = "cancel"; - - private LoadableModel model; - - public PageJasperReport() { - model = new LoadableModel(false) { - - @Override - protected ReportDto load() { - return loadReport(); - } - }; - } - - public PageJasperReport(final ReportDto reportDto) { - model = new LoadableModel(reportDto, false) { - - @Override - protected ReportDto load() { - // never called - return reportDto; - } - }; - } - - private ReportDto loadReport() { - StringValue reportOid = getPageParameters().get(OnePageParameterEncoder.PARAMETER); - - Task task = createSimpleTask(OPERATION_LOAD_REPORT); - OperationResult result = task.getResult(); - PrismObject prismReport = WebModelServiceUtils.loadObject(ReportType.class, reportOid.toString(), - this, task, result); - - if (prismReport == null) { - LOGGER.error("Couldn't load report."); - throw new RestartResponseException(PageReports.class); - } - - return new ReportDto(prismReport.asObjectable()); - -// return prismReport; - } - - @Override - protected void onInitialize() { - super.onInitialize(); - initLayout(); - } - - private void initLayout() { - Form mainForm = new MidpointForm(ID_MAIN_FORM); - add(mainForm); -// ReportEngineSelectionType reportEngineType = model.getObject().getReportEngineType(); - - List tabs = new ArrayList<>(); - tabs.add(new AbstractTab(createStringResource("PageReport.basic")) { - - private static final long serialVersionUID = 1L; - - @Override - public WebMarkupContainer getPanel(String panelId) { - return new ReportConfigurationPanel(panelId, model); - } - }); - if(model.getObject().getObject().asObjectable().getJasper() != null) { - tabs.add(new AbstractTab(createStringResource("PageReport.jasperTemplate")) { - - private static final long serialVersionUID = 1L; - @Override - public WebMarkupContainer getPanel(String panelId) { - return new JasperReportConfigurationPanel(panelId, model); -// IModel title = PageReport.this.createStringResource("PageReport.jasperTemplate"); -// IModel data = new Base64Model(new PrismPropertyModel<>(model, ReportType.F_TEMPLATE)); -// return new AceEditorPanel(panelId, title, data); - } - }); - tabs.add(new AbstractTab(createStringResource("PageReport.jasperTemplateStyle")) { - - private static final long serialVersionUID = 1L; - @Override - public WebMarkupContainer getPanel(String panelId) { - IModel title = PageJasperReport.this.createStringResource("PageReport.jasperTemplateStyle"); - IModel data = new JasperTemplateModel(new PropertyModel(model, "templateStyle")); - return new AceEditorPanel(panelId, title, data); - } - }); - } - -// tabs.add(new AbstractTab(createStringResource("PageReport.fullXml")) { -// -// @Override -// public WebMarkupContainer getPanel(String panelId) { -// IModel title = PageReport.this.createStringResource("PageReport.fullXml"); -// -// AceEditorPanel panel = new AceEditorPanel(panelId, title, createFullXmlModel()); -// panel.getEditor().add(createFullXmlValidator()); -// return panel; -// } -// }); - - TabbedPanel reportTabPanel = WebComponentUtil.createTabPanel(ID_TAB_PANEL, this, tabs, null); - reportTabPanel.setOutputMarkupId(true); - - mainForm.add(reportTabPanel); - - initButtons(mainForm); - } - -// private IValidator createFullXmlValidator() { -// return (IValidator) validatable -> { -// String value = validatable.getValue(); -// -// OperationResult result = new OperationResult(OPERATION_VALIDATE_REPORT); -// Holder reportHolder = new Holder<>(null); -// -// OpResult opResult; -// try { -// validateObject(value, reportHolder, PrismContext.LANG_XML, true, ReportType.class, result); -// -// if (!result.isAcceptable()) { -// result.recordFatalError("Could not validate object", result.getCause()); -// opResult = OpResult.getOpResult((PageBase)getPage(),result); -// validatable.error(new RawValidationError(opResult)); -// } -// } catch (Exception e) { -// LOGGER.error("Validation problem occurred." + e.getMessage()); -// result.recordFatalError("Could not validate object.", e); -// try { -// opResult = OpResult.getOpResult((PageBase) getPage(), result); -// validatable.error(new RawValidationError(opResult)); -// } catch (Exception ex) { -// error(ex); -// } -// } -// }; -// } - -// private IModel createFullXmlModel() { -// return new IModel() { -// -// @Override -// public String getObject() { -// PrismObject report = model.getObject().getObject(); -// if (report == null) { -// return null; -// } -// -// try { -// return getPrismContext().serializeObjectToString(report, PrismContext.LANG_XML); -// } catch (SchemaException ex) { -// getSession().error(getString("PageReport.message.cantSerializeFromObjectToString") + ex); -// throw new RestartResponseException(PageError.class); -// } -// } -// -// @Override -// public void setObject(String object) { -// OperationResult result = new OperationResult(OPERATION_VALIDATE_REPORT); -// Holder reportHolder = new Holder<>(null); -// -// try { -// validateObject(object, reportHolder, PrismContext.LANG_XML, true, ReportType.class, result); -// model.getObject().setObject(reportHolder.getValue().asPrismObject()); -// } catch (Exception e){ -// LOGGER.error("Could not set object. Validation problem occurred." + result.getMessage()); -// result.recordFatalError("Could not set object. Validation problem occurred,", e); -// showResult(result, "Could not set object. Validation problem occurred."); -// } -// } -// -// @Override -// public void detach() { -// } -// }; -// } - - private void initButtons(Form mainForm) { - AjaxSubmitButton save = new AjaxSubmitButton(ID_SAVE_BUTTON, createStringResource("PageBase.button.save")) { - - @Override - protected void onError(AjaxRequestTarget target) { - target.add(getFeedbackPanel()); - } - - @Override - protected void onSubmit(AjaxRequestTarget target) { - onSavePerformed(target); - } - }; - mainForm.add(save); - - AjaxSubmitButton cancel = new AjaxSubmitButton(ID_CANCEL_BUTTON, createStringResource("PageBase.button.cancel")) { - - @Override - protected void onError(AjaxRequestTarget target) { - target.add(getFeedbackPanel()); - } - - @Override - protected void onSubmit(AjaxRequestTarget target) { - onCancelPerformed(target); - } - }; - mainForm.add(cancel); - } - - protected void onSavePerformed(AjaxRequestTarget target) { - Task task = createSimpleTask(OPERATION_SAVE_REPORT); - OperationResult result = task.getResult(); - try { - - //TODO TODO TODO - PrismObject newReport = model.getObject().getObject(); - ObjectDelta delta = null; - if(model.getObject().getObject().asObjectable().getJasper() != null) { - if (newReport.getOid() == null) { - getPrismContext().adopt(newReport); - delta = DeltaFactory.Object.createAddDelta(newReport); - delta.setPrismContext(getPrismContext()); - } else { - PrismObject oldReport = WebModelServiceUtils.loadObject(ReportType.class, - newReport.getOid(), this, task, result); - - if (oldReport != null) { - delta = oldReport.diff(newReport); - } - } - } else { - IModel> newPrismReport = model.getObject().getNewReportModel(); - delta = newPrismReport.getObject().getObjectDelta(); - } - if (delta != null) { - getPrismContext().adopt(delta); - getModelService().executeChanges(MiscUtil.createCollection(delta), null, task, result); - } - - } catch (Exception e) { - result.recordFatalError(getString("PageReport.message.couldNotSaveReport"), e); - - } finally { - result.computeStatusIfUnknown(); - } - - if (WebComponentUtil.isSuccessOrHandledError(result)) { - showResult(result); - redirectBack(); - } else { - showResult(result); - target.add(getFeedbackPanel()); - } - } - - protected void onCancelPerformed(AjaxRequestTarget target) { - redirectBack(); - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.html deleted file mode 100644 index 5bd1c95691d..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -
- -
- - -
-
-
- -
-
- -
-
-
-
- -
-
- -
- - -
- - -

-
-
- -
- - -
- - - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java deleted file mode 100644 index 2adb35080dd..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Copyright (C) 2010-2020 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports; - -import java.io.FileInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; - -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.input.ReaderInputStream; -import org.apache.commons.lang3.StringUtils; -import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior; -import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.Radio; -import org.apache.wicket.markup.html.form.RadioGroup; -import org.apache.wicket.markup.html.form.upload.FileUpload; -import org.apache.wicket.markup.html.form.upload.FileUploadField; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.util.file.File; - -import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.security.api.AuthorizationConstants; -import com.evolveum.midpoint.util.logging.LoggingUtils; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; -import com.evolveum.midpoint.web.application.AuthorizationAction; -import com.evolveum.midpoint.web.application.PageDescriptor; -import com.evolveum.midpoint.web.component.AceEditor; -import com.evolveum.midpoint.web.component.AjaxSubmitButton; -import com.evolveum.midpoint.web.component.form.MidpointForm; -import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; -import com.evolveum.midpoint.web.page.admin.PageAdmin; -import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; -import com.evolveum.midpoint.web.security.MidPointApplication; -import com.evolveum.midpoint.web.security.WebApplicationConfiguration; - -@PageDescriptor(url = "/admin/reports/create", action = { - @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORTS_ALL_URL, - label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, - description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION), - @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORTS_REPORT_CREATE_URL, - label = "PageNewReport.auth.reports.label", - description = "PageNewReport.auth.reports.description") }) -public class PageNewReport extends PageAdmin { - - private static final Trace LOGGER = TraceManager.getTrace(PageNewReport.class); - - private static final String ID_MAIN_FORM = "mainForm"; - private static final String ID_BUTTON_BAR = "buttonBar"; - private static final String ID_IMPORT_RADIO_GROUP = "importRadioGroup"; - private static final String ID_FILE_RADIO = "fileRadio"; - private static final String ID_XML_RADIO = "xmlRadio"; - private static final String ID_IMPORT_FILE_BUTTON = "importFileButton"; - private static final String ID_IMPORT_XML_BUTTON = "importXmlButton"; - private static final String ID_INPUT = "input"; - private static final String ID_INPUT_ACE = "inputAce"; - private static final String ID_ACE_EDITOR = "aceEditor"; - private static final String ID_INPUT_FILE_LABEL = "inputFileLabel"; - private static final String ID_INPUT_FILE = "inputFile"; - private static final String ID_FILE_INPUT = "fileInput"; - - private static final String OPERATION_IMPORT_REPORT_XML = "Import Report from XML"; - private static final String OPERATION_IMPORT_REPORT = "Import Report from file"; - - private static final Integer INPUT_FILE = 1; - private static final Integer INPUT_XML = 2; - - private final Model xmlEditorModel; - - public PageNewReport() { - xmlEditorModel = new Model<>(null); - - initLayout(); - } - - private void initLayout() { - Form mainForm = new MidpointForm(ID_MAIN_FORM); - add(mainForm); - - final WebMarkupContainer input = new WebMarkupContainer(ID_INPUT); - input.setOutputMarkupId(true); - mainForm.add(input); - - final WebMarkupContainer buttonBar = new WebMarkupContainer(ID_BUTTON_BAR); - buttonBar.setOutputMarkupId(true); - mainForm.add(buttonBar); - - final IModel groupModel = new Model<>(INPUT_FILE); - RadioGroup importRadioGroup = new RadioGroup<>(ID_IMPORT_RADIO_GROUP, groupModel); - importRadioGroup.add(new AjaxFormChoiceComponentUpdatingBehavior() { - @Override - protected void onUpdate(AjaxRequestTarget target) { - target.add(input); - target.add(buttonBar); - } - }); - mainForm.add(importRadioGroup); - - Radio fileRadio = new Radio<>(ID_FILE_RADIO, new Model<>(INPUT_FILE), importRadioGroup); - importRadioGroup.add(fileRadio); - - Radio xmlRadio = new Radio<>(ID_XML_RADIO, new Model<>(INPUT_XML), importRadioGroup); - importRadioGroup.add(xmlRadio); - - WebMarkupContainer inputAce = new WebMarkupContainer(ID_INPUT_ACE); - addVisibleForInputType(inputAce, INPUT_XML, groupModel); - input.add(inputAce); - - AceEditor aceEditor = new AceEditor(ID_ACE_EDITOR, xmlEditorModel); - aceEditor.setOutputMarkupId(true); - inputAce.add(aceEditor); - - WebMarkupContainer inputFileLabel = new WebMarkupContainer(ID_INPUT_FILE_LABEL); - addVisibleForInputType(inputFileLabel, INPUT_FILE, groupModel); - input.add(inputFileLabel); - - WebMarkupContainer inputFile = new WebMarkupContainer(ID_INPUT_FILE); - addVisibleForInputType(inputFile, INPUT_FILE, groupModel); - input.add(inputFile); - - FileUploadField fileInput = new FileUploadField(ID_FILE_INPUT); - inputFile.add(fileInput); - - initButtons(buttonBar, groupModel); - } - - private void addVisibleForInputType(Component comp, final Integer type, final IModel groupModel) { - comp.add(new VisibleEnableBehaviour() { - @Override - public boolean isVisible() { - return type.equals(groupModel.getObject()); - } - }); - } - - private void initButtons(WebMarkupContainer buttonBar, IModel inputType) { - AjaxSubmitButton saveFileButton = new AjaxSubmitButton(ID_IMPORT_FILE_BUTTON, - createStringResource("PageNewReport.button.import")) { - - @Override - protected void onSubmit(AjaxRequestTarget target) { - importReportFromFilePerformed(target); - } - - @Override - protected void onError(AjaxRequestTarget target) { - target.add(getFeedbackPanel()); - } - }; - addVisibleForInputType(saveFileButton, INPUT_FILE, inputType); - buttonBar.add(saveFileButton); - - AjaxSubmitButton saveXmlButton = new AjaxSubmitButton(ID_IMPORT_XML_BUTTON, - createStringResource("PageNewReport.button.import")) { - - @Override - protected void onSubmit(AjaxRequestTarget target) { - importReportFromStreamPerformed(target); - } - - @Override - protected void onError(AjaxRequestTarget target) { - target.add(getFeedbackPanel()); - } - }; - addVisibleForInputType(saveXmlButton, INPUT_XML, inputType); - buttonBar.add(saveXmlButton); - } - - private void importReportFromFilePerformed(AjaxRequestTarget target) { - OperationResult result = new OperationResult(OPERATION_IMPORT_REPORT); - - FileUploadField file = (FileUploadField) get(createComponentPath(ID_MAIN_FORM, ID_INPUT, ID_INPUT_FILE, ID_FILE_INPUT)); - final FileUpload uploadedFile = file.getFileUpload(); - if (uploadedFile == null) { - error(getString("PageNewReport.message.nullFile")); - target.add(getFeedbackPanel()); - - return; - } - - File newFile = null; - try { - // Create new file - MidPointApplication application = getMidpointApplication(); - WebApplicationConfiguration config = application.getWebApplicationConfiguration(); - File folder = new File(config.getImportFolder()); - if (!folder.exists() || !folder.isDirectory()) { - folder.mkdir(); - } - - newFile = new File(folder, uploadedFile.getClientFileName()); - // Check new file, delete if it already exists - if (newFile.exists()) { - newFile.delete(); - } - // Save file - newFile.createNewFile(); - FileUtils.copyInputStreamToFile(uploadedFile.getInputStream(), newFile); - - InputStreamReader reader = new InputStreamReader(new FileInputStream(newFile), StandardCharsets.UTF_8); - try (InputStream stream = new ReaderInputStream(reader, reader.getEncoding())) { - byte[] reportIn = IOUtils.toByteArray(stream); - - setResponsePage(new PageJasperReport(new ReportDto(Base64.encodeBase64(reportIn)))); - } - } catch (Exception ex) { - result.recordFatalError(getString("PageImportObject.message.savePerformed.fatalError"), ex); - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't import file", ex); - } finally { - FileUtils.deleteQuietly(newFile); - } - - showResult(result); - target.add(getFeedbackPanel()); - } - - private void importReportFromStreamPerformed(AjaxRequestTarget target) { - String xml = xmlEditorModel.getObject(); - if (StringUtils.isEmpty(xml)) { - error(getString("PageNewReport.message.emptyXml")); - target.add(getFeedbackPanel()); - - return; - } - - OperationResult result = new OperationResult(OPERATION_IMPORT_REPORT_XML); - try { - setResponsePage(new PageJasperReport(new ReportDto(Base64.encodeBase64(xml.getBytes())))); - } catch (Exception ex) { - result.recordFatalError(getString("PageNewReport.message.importReportFromStreamPerformed.fatalError"), ex); - LoggingUtils.logUnexpectedException(LOGGER, "Error occurred during xml import", ex); - } - - if (result.isSuccess()) { - xmlEditorModel.setObject(null); - } - - showResult(result); - target.add(getFeedbackPanel()); - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html index 74e7258ed24..a94ec33f38f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html @@ -9,7 +9,16 @@ - +
+
+
+

+ +

+
+
+
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java index 28f6f97acca..525e573eed7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java @@ -7,43 +7,45 @@ package com.evolveum.midpoint.web.page.admin.reports; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; +import java.util.*; import com.evolveum.midpoint.gui.api.component.tabs.PanelTab; -import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; -import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; -import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; -import com.evolveum.midpoint.prism.Containerable; +import com.evolveum.midpoint.gui.api.factory.wrapper.PrismObjectWrapperFactory; +import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext; +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.midpoint.gui.api.prism.wrapper.*; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.prism.PrismContainer; import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.prism.path.ItemName; import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.schema.ObjectDeltaOperation; -import com.evolveum.midpoint.schema.result.OperationResultStatus; import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.util.logging.LoggingUtils; -import com.evolveum.midpoint.web.component.ObjectBasicPanel; +import com.evolveum.midpoint.util.DisplayableValue; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.web.component.AjaxButton; import com.evolveum.midpoint.web.component.ObjectSummaryPanel; -import com.evolveum.midpoint.web.component.objectdetails.AbstractObjectMainPanel; -import com.evolveum.midpoint.web.component.prism.ItemVisibility; -import com.evolveum.midpoint.web.component.progress.ProgressPanel; -import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; +import com.evolveum.midpoint.web.component.TabbedPanel; +import com.evolveum.midpoint.web.component.input.DropDownChoicePanel; +import com.evolveum.midpoint.web.component.prism.ValueStatus; +import com.evolveum.midpoint.web.component.search.SearchValue; +import com.evolveum.midpoint.web.component.util.VisibleBehaviour; import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails; -import com.evolveum.midpoint.web.page.admin.reports.component.EngineReportTabPanel; -import com.evolveum.midpoint.web.page.admin.reports.component.ReportMainPanel; +import com.evolveum.midpoint.web.page.admin.reports.component.*; +import com.evolveum.midpoint.web.page.admin.server.TaskBasicTabPanel; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; +import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.extensions.markup.html.tabs.AbstractTab; -import org.apache.wicket.extensions.markup.html.tabs.ITab; +import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; +import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import com.evolveum.midpoint.schema.result.OperationResult; @@ -52,11 +54,8 @@ import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.application.AuthorizationAction; import com.evolveum.midpoint.web.application.PageDescriptor; -import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration; -import javax.xml.namespace.QName; - /** * @author lazyman */ @@ -66,13 +65,30 @@ description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION), @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_REPORT_URL, label = "PageReport.auth.report.label", - description = "PageReport.auth.report.description")}) + description = "PageReport.auth.report.description") }) public class PageReport extends PageAdminObjectDetails { private static final Trace LOGGER = TraceManager.getTrace(PageReport.class); + private static final String ID_TABLE_CONTAINER = "tableContainer"; + private static final String ID_TABLE_BOX = "tableBox"; + private static final String ID_REPORT_TABLE = "reportTable"; + + private static final List> TYPE_OF_REPORTS; + private static final String DOT_CLASS = PageReports.class.getName() + "."; + private static final String OPERATION_UPDATE_WRAPPER = DOT_CLASS + "updateReportWrapper"; + private static final String OPERATION_RUN_REPORT = DOT_CLASS + "runReport"; + private static final String OPERATION_IMPORT_REPORT = DOT_CLASS + "importReport"; + + static { + TYPE_OF_REPORTS = Arrays.asList( + new SearchValue<>(SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value(), "CollectionReports.title"), + new SearchValue<>(SystemObjectsType.ARCHETYPE_DASHBOARD_REPORT.value(), "DashboardReports.title")); + } + private Boolean runReport = false; - private String oid; + private IModel isShowingPreview = Model.of(Boolean.FALSE); + private IModel> archetypeOid; public PageReport() { initialize(null); @@ -87,14 +103,54 @@ public PageReport(final PrismObject userToEdit) { initialize(userToEdit); } - public PageReport(final PrismObject unitToEdit, boolean isNewObject) { + public PageReport(final PrismObject unitToEdit, boolean isNewObject) { initialize(unitToEdit, isNewObject); } - public PageReport(final PrismObject unitToEdit, boolean isNewObject, boolean isReadonly) { + public PageReport(final PrismObject unitToEdit, boolean isNewObject, boolean isReadonly) { initialize(unitToEdit, isNewObject, isReadonly); } + @Override + protected void initializeModel(PrismObject objectToEdit, boolean isNewObject, boolean isReadonly) { + super.initializeModel(objectToEdit, isNewObject, isReadonly); + ReportType report = getObjectModel().getObject().getObject().asObjectable(); + archetypeOid = new Model(); + if (WebComponentUtil.hasArchetypeAssignment(report, SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value())) { + archetypeOid.setObject(getDisplayValue(SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value())); + } else if (WebComponentUtil.hasArchetypeAssignment(report, SystemObjectsType.ARCHETYPE_DASHBOARD_REPORT.value())) { + archetypeOid.setObject(getDisplayValue(SystemObjectsType.ARCHETYPE_DASHBOARD_REPORT.value())); + } + } + + @Override + protected void initLayout() { + super.initLayout(); + + WebMarkupContainer tableContainer = new WebMarkupContainer(ID_TABLE_CONTAINER); + tableContainer.setOutputMarkupId(true); + add(tableContainer); + + ReportObjectsListPanel reportTable = new ReportObjectsListPanel(ID_REPORT_TABLE, Model.of(getReport())); + reportTable.setOutputMarkupId(true); + + WebMarkupContainer tableBox = new WebMarkupContainer(ID_TABLE_BOX); + tableBox.add(new VisibleBehaviour(() -> isShowingPreview.getObject() && reportTable.hasView())); + tableBox.setOutputMarkupId(true); + tableContainer.add(tableBox); + + tableBox.add(reportTable); + } + + private SearchValue getDisplayValue(String oid) { + for (DisplayableValue value : TYPE_OF_REPORTS) { + if (oid.equals(value.getValue())) { + return (SearchValue) value; + } + } + return null; + } + @Override public Class getCompileTimeClass() { return ReportType.class; @@ -121,29 +177,54 @@ public void continueEditing(AjaxRequestTarget target) { @Override public void finishProcessing(AjaxRequestTarget target, Collection> executedDeltas, boolean returningFromAsync, OperationResult result) { - if(runReport && !result.isError()) { + if (runReport && !result.isError()) { showResult(result); Task task = createSimpleTask("run_task"); - try { - PrismObject report; - if (getObjectModel().getObject().getOid() != null) { - report = getObjectModel().getObject().getObject(); + PrismObject report; + if (getObjectModel().getObject().getOid() != null) { + report = getObjectModel().getObject().getObject(); + } else { + report = (PrismObject) executedDeltas.iterator().next().getObjectDelta().getObjectToAdd(); + } + if (hasParameters(report.asObjectable())) { + try { + getReportManager().runReport(report, null, task, result); + } catch (Exception ex) { + result.recordFatalError(ex); + } finally { + result.computeStatusIfUnknown(); + } + showResult(result); + if (!isKeepDisplayingResults()) { + redirectBack(); } else { - report = (PrismObject) executedDeltas.iterator().next().getObjectDelta().getObjectToAdd(); + target.add(getFeedbackPanel()); } - getReportManager().runReport(report, null, task, result); - } catch (Exception ex) { - result.recordFatalError(ex); - } finally { - result.computeStatusIfUnknown(); - } - - showResult(result); - if (!isKeepDisplayingResults()) { - redirectBack(); } else { - target.add(getFeedbackPanel()); + + RunReportPopupPanel runReportPopupPanel = new RunReportPopupPanel(getMainPopupBodyId(), report.asObjectable()) { + + private static final long serialVersionUID = 1L; + + protected void runConfirmPerformed(AjaxRequestTarget target, ReportType reportType, PrismContainer reportParam) { + try { + getReportManager().runReport(reportType.asPrismObject(), reportParam, task, result); + } catch (Exception ex) { + result.recordFatalError(ex); + } finally { + result.computeStatusIfUnknown(); + } + hideMainPopup(target); + showResult(result); + if (!isKeepDisplayingResults()) { + redirectBack(); + } else { + target.add(getFeedbackPanel()); + } + } + }; + showMainPopup(runReportPopupPanel, target); } this.runReport = false; } else if (!isKeepDisplayingResults()) { @@ -152,12 +233,16 @@ public void finishProcessing(AjaxRequestTarget target, Collection createMainPanel(String id) { + protected ReportMainPanel createMainPanel(String id) { return new ReportMainPanel(id, getObjectModel(), this); } - public void saveAndRunPerformed(AjaxRequestTarget target){ + public void saveAndRunPerformed(AjaxRequestTarget target) { this.runReport = true; savePerformed(target); } @@ -166,4 +251,260 @@ protected boolean isChangeArchetypeAllowed() { return false; } + @Override + protected void initOperationalButtons(RepeatingView repeatingView) { + String selectHeaderId = repeatingView.newChildId(); + String selectTypeId = repeatingView.newChildId(); + String refreshId = repeatingView.newChildId(); + String showPreviewId = repeatingView.newChildId(); + String showPreviewInPopupId = repeatingView.newChildId(); + + Label label = new Label(selectHeaderId, createStringResource("PageReport.typeOfReport")); + label.add(AttributeAppender.append("style", "padding-right: 0px; padding-top: 4px;")); + label.add(new VisibleBehaviour(() -> archetypeOid.getObject() == null || archetypeOid.getObject().getValue() == null)); + repeatingView.add(label); + + DropDownChoicePanel dropDownPanel = WebComponentUtil.createDropDownChoices(selectTypeId, archetypeOid, Model.ofList(TYPE_OF_REPORTS), true, this); + dropDownPanel.add(new VisibleBehaviour(() -> archetypeOid.getObject() == null || archetypeOid.getObject().getValue() == null)); + dropDownPanel.getBaseFormComponent().add(new AjaxFormComponentUpdatingBehavior("change") { + @Override + protected void onUpdate(AjaxRequestTarget target) { + addArchetype(target); + target.add(dropDownPanel); + target.add(repeatingView.get(showPreviewInPopupId)); + target.add(repeatingView.get(showPreviewId)); + target.add(getOperationalButtonsPanel()); + refreshEngineTab(target); + target.add(getMainPanel().getTabbedPanel()); + target.add(getMainPanel()); + target.add(getFeedbackPanel()); + } + }); + dropDownPanel.add(AttributeAppender.append("style", "margin-top: -7px; margin-left: -12px;")); + dropDownPanel.setOutputMarkupId(true); + repeatingView.add(dropDownPanel); + + AjaxButton refresh = new AjaxButton(refreshId, createStringResource("pageCreateCollectionReport.button.refresh")) { + @Override + public void onClick(AjaxRequestTarget target) { + ReportObjectsListPanel table = getReportTable(); + table.getPageStorage().setSearch(null); + table.resetSearchModel(); + table.resetTable(target); + table.refreshTable(target); + table.checkView(); + target.add(table); + target.add(getTableBox()); + target.add(getTableContainer()); + target.add(getFeedbackPanel()); + } + }; + refresh.add(new VisibleBehaviour(() -> isShowingPreview.getObject())); + refresh.add(AttributeAppender.append("class", "btn-info btn-sm")); + refresh.setOutputMarkupId(true); + repeatingView.add(refresh); + + AjaxButton showPreview = new AjaxButton(showPreviewId, createStringResource("pageCreateCollectionReport.button.showPreview.${}", isShowingPreview)) { + @Override + public void onClick(AjaxRequestTarget target) { + isShowingPreview.setObject(!isShowingPreview.getObject()); + ReportObjectsListPanel table = getReportTable(); + if (isShowingPreview.getObject()) { + table.getPageStorage().setSearch(null); + table.resetSearchModel(); + table.resetTable(target); + table.refreshTable(target); + table.checkView(); + } + target.add(getTableBox()); + if (isShowingPreview.getObject() && table.hasView()) { + info(createStringResource("PageReport.message.shownedReportPreview").getString()); + } + target.add(getTableContainer()); + target.add(this); + target.add(repeatingView.get(showPreviewInPopupId)); + target.add(repeatingView.get(refreshId)); + target.add(getOperationalButtonsPanel()); + target.add(getFeedbackPanel()); + } + }; + showPreview.add(new VisibleBehaviour(() -> isCollectionReport())); + showPreview.add(AttributeAppender.append("class", "btn-default btn-sm")); + showPreview.setOutputMarkupId(true); + repeatingView.add(showPreview); + + AjaxButton showPreviewInPopup = new AjaxButton(showPreviewInPopupId, createStringResource("pageCreateCollectionReport.button.showPreviewInPopup")) { + @Override + public void onClick(AjaxRequestTarget target) { + RunReportPopupPanel reportPopup = new RunReportPopupPanel(getMainPopupBodyId(), getReport(), false) { + @Override + public StringResourceModel getTitle() { + return createStringResource("PageReport.reportPreview"); + } + }; + showMainPopup(reportPopup, target); + target.add(getOperationalButtonsPanel()); + } + }; + showPreviewInPopup.add(new VisibleBehaviour(() -> isCollectionReport() && !isShowingPreview.getObject())); + showPreviewInPopup.add(AttributeAppender.append("class", "btn-default btn-sm")); + showPreviewInPopup.setOutputMarkupId(true); + repeatingView.add(showPreviewInPopup); + + AjaxButton runReport = new AjaxButton(repeatingView.newChildId(), createStringResource("pageCreateCollectionReport.button.runOriginalReport")) { + @Override + public void onClick(AjaxRequestTarget target) { + runReportPerformed(target, getOriginalReport(), PageReport.this); + } + }; + runReport.add(new VisibleBehaviour(() -> isEditingFocus() && !WebComponentUtil.isImportReport(getOriginalReport()))); + runReport.add(AttributeAppender.append("class", "btn-info btn-sm")); + runReport.setOutputMarkupId(true); + repeatingView.add(runReport); + + AjaxButton importReport = new AjaxButton(repeatingView.newChildId(), createStringResource("pageCreateCollectionReport.button.importOriginalReport")) { + @Override + public void onClick(AjaxRequestTarget target) { + importReportPerformed(target, getOriginalReport(), PageReport.this); + } + }; + importReport.add(new VisibleBehaviour(() -> isEditingFocus() && WebComponentUtil.isImportReport(getOriginalReport()))); + importReport.add(AttributeAppender.append("class", "btn-info btn-sm")); + importReport.setOutputMarkupId(true); + repeatingView.add(importReport); + } + + private ReportType getOriginalReport() { + return getObjectWrapper().getObjectOld().asObjectable(); + } + + public static void importReportPerformed(AjaxRequestTarget target, ReportType report, PageBase pageBase) { + ImportReportPopupPanel importReportPopupPanel = new ImportReportPopupPanel(pageBase.getMainPopupBodyId(), report) { + + private static final long serialVersionUID = 1L; + + protected void importConfirmPerformed(AjaxRequestTarget target, ReportDataType reportImportData) { + PageReport.importConfirmPerformed(target, report, reportImportData, pageBase); + pageBase.hideMainPopup(target); + + } + }; + pageBase.showMainPopup(importReportPopupPanel, target); + } + + private static void importConfirmPerformed(AjaxRequestTarget target, ReportType reportType, ReportDataType reportImportData, PageBase pageBase) { + OperationResult result = new OperationResult(OPERATION_IMPORT_REPORT); + Task task = pageBase.createSimpleTask(OPERATION_IMPORT_REPORT); + + try { + pageBase.getReportManager().importReport(reportType.asPrismObject(), reportImportData.asPrismObject(), task, result); + } catch (Exception ex) { + result.recordFatalError(ex); + } finally { + result.computeStatusIfUnknown(); + } + + pageBase.showResult(result); + target.add(pageBase.getFeedbackPanel()); + } + + public static void runReportPerformed(AjaxRequestTarget target, ReportType report, PageBase pageBase) { + + if (hasParameters(report)) { + runConfirmPerformed(target, report, null, pageBase); + return; + } + + RunReportPopupPanel runReportPopupPanel = new RunReportPopupPanel(pageBase.getMainPopupBodyId(), report) { + + private static final long serialVersionUID = 1L; + + protected void runConfirmPerformed(AjaxRequestTarget target, ReportType reportType, PrismContainer reportParam) { + PageReport.runConfirmPerformed(target, reportType, reportParam, pageBase); + pageBase.hideMainPopup(target); + } + }; + pageBase.showMainPopup(runReportPopupPanel, target); + + } + + private static void runConfirmPerformed(AjaxRequestTarget target, ReportType reportType, PrismContainer reportParam, PageBase pageBase) { + OperationResult result = new OperationResult(OPERATION_RUN_REPORT); + Task task = pageBase.createSimpleTask(OPERATION_RUN_REPORT); + + try { + pageBase.getReportManager().runReport(reportType.asPrismObject(), reportParam, task, result); + } catch (Exception ex) { + result.recordFatalError(ex); + } finally { + result.computeStatusIfUnknown(); + } + + pageBase.showResult(result); + target.add(pageBase.getFeedbackPanel()); + } + + private void refreshEngineTab(AjaxRequestTarget target) { + Component panel = getMainPanel().getTabbedPanel().get(TabbedPanel.TAB_PANEL_ID); + if (panel instanceof EngineReportTabPanel) { + ((PanelTab) getMainPanel().getTabbedPanel().getTabs().getObject().get( + getMainPanel().getTabbedPanel().getSelectedTab())).resetPanel(); + getMainPanel().getTabbedPanel().setSelectedTab(getMainPanel().getTabbedPanel().getSelectedTab()); + target.add(getMainPanel().getTabbedPanel()); + target.add(getMainPanel()); + } + } + + private void addArchetype(AjaxRequestTarget target) { + WebComponentUtil.addNewArchetype(getObjectWrapper(), archetypeOid.getObject().getValue(), target, PageReport.this); + PrismObjectWrapperFactory wrapperFactory = findObjectWrapperFactory(getReport().asPrismObject().getDefinition()); + Task task = createSimpleTask(OPERATION_UPDATE_WRAPPER); + OperationResult result = task.getResult(); + WrapperContext ctx = new WrapperContext(task, result); + try { + wrapperFactory.updateWrapper(getObjectWrapper(), ctx); + + //TODO ugly hack: after updateWrapper method is called, previously set assignment item + // are marked as NOT_CHANGED with the same value. + + PrismContainerWrapper assignmentWrapper = getObjectWrapper().findContainer(ItemPath.create(TaskType.F_ASSIGNMENT)); + for (PrismContainerValueWrapper assignmentWrapperValue : assignmentWrapper.getValues()) { + if (WebComponentUtil.isArchetypeAssignment(assignmentWrapperValue.getRealValue())) { + assignmentWrapperValue.setStatus(ValueStatus.ADDED); + } + } + + } catch (SchemaException e) { + LOGGER.error("Unexpected problem occurs during updating wrapper. Reason: {}", e.getMessage(), e); + } + } + + private ReportType getReport() { + return getObjectWrapper().getObject().asObjectable(); + } + + @Override + protected Boolean isOperationalButtonsVisible() { + return true; + } + + private boolean isCollectionReport() { + if (archetypeOid.getObject() != null) { + return SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value().equals(archetypeOid.getObject().getValue()); + } + return false; + } + + private ReportObjectsListPanel getReportTable() { + return (ReportObjectsListPanel) get(createComponentPath(ID_TABLE_CONTAINER, ID_TABLE_BOX, ID_REPORT_TABLE)); + } + + private Component getTableBox() { + return get(createComponentPath(ID_TABLE_CONTAINER, ID_TABLE_BOX)); + } + + private Component getTableContainer() { + return get(ID_TABLE_CONTAINER); + } + } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java index af84fb5b7c5..fccf7803424 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java @@ -9,8 +9,8 @@ import com.evolveum.midpoint.gui.api.GuiStyleConstants; import com.evolveum.midpoint.gui.api.component.MainObjectListPanel; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder; -import com.evolveum.midpoint.prism.PrismContainer; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.security.api.AuthorizationConstants; import com.evolveum.midpoint.task.api.Task; @@ -28,7 +28,6 @@ import com.evolveum.midpoint.web.page.admin.PageAdmin; import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration; import com.evolveum.midpoint.web.page.admin.reports.component.ImportReportPopupPanel; -import com.evolveum.midpoint.web.page.admin.reports.component.RunReportPopupPanel; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; @@ -63,9 +62,6 @@ public class PageReports extends PageAdmin { private static final String ID_MAIN_FORM = "mainForm"; private static final String ID_TABLE = "table"; - private static final String DOT_CLASS = PageReports.class.getName() + "."; - private static final String OPERATION_RUN_REPORT = DOT_CLASS + "runReport"; - public PageReports() { super(); } @@ -85,11 +81,7 @@ private void initLayout() { protected void objectDetailsPerformed(AjaxRequestTarget target, ReportType reportType) { PageParameters pageParameters = new PageParameters(); pageParameters.add(OnePageParameterEncoder.PARAMETER, reportType.getOid()); - if (reportType.getJasper() != null) { - navigateToNext(PageJasperReport.class, pageParameters); - } else { - navigateToNext(PageReport.class, pageParameters); - } + navigateToNext(PageReport.class, pageParameters); } @Override @@ -130,7 +122,7 @@ public InlineMenuItemAction initAction() { @Override public void onClick(AjaxRequestTarget target) { ReportType report = getRowModel().getObject().getValue(); - runReportPerformed(target, report); + PageReport.runReportPerformed(target, report, PageReports.this); } }; } @@ -161,7 +153,7 @@ public InlineMenuItemAction initAction() { @Override public void onClick(AjaxRequestTarget target) { ReportType report = getRowModel().getObject().getValue(); - importReportPerformed(target, report); + PageReport.importReportPerformed(target, report, PageReports.this); } }; } @@ -238,80 +230,13 @@ public boolean isHeaderMenuItem(){ } private boolean isImportReport(IModel> rowModel) { - ReportBehaviorType behavior = rowModel.getObject().getValue().getBehavior(); - return behavior != null && DirectionTypeType.IMPORT.equals(behavior.getDirection()); - } - - private void importReportPerformed(AjaxRequestTarget target, ReportType report) { - ImportReportPopupPanel importReportPopupPanel = new ImportReportPopupPanel(getMainPopupBodyId(), report) { - - private static final long serialVersionUID = 1L; - - protected void importConfirmPerformed(AjaxRequestTarget target, ReportDataType reportImportData) { - PageReports.this.importConfirmPerformed(target, report, reportImportData); - hideMainPopup(target); - - } - }; - showMainPopup(importReportPopupPanel, target); - } - - private void importConfirmPerformed(AjaxRequestTarget target, ReportType reportType, ReportDataType reportImportData) { - OperationResult result = new OperationResult(OPERATION_RUN_REPORT); - Task task = createSimpleTask(OPERATION_RUN_REPORT); - - try { - getReportManager().importReport(reportType.asPrismObject(), reportImportData.asPrismObject(), task, result); - } catch (Exception ex) { - result.recordFatalError(ex); - } finally { - result.computeStatusIfUnknown(); - } - - showResult(result); - target.add(getFeedbackPanel()); - } - - private void runConfirmPerformed(AjaxRequestTarget target, ReportType reportType, PrismContainer reportParam) { - OperationResult result = new OperationResult(OPERATION_RUN_REPORT); - Task task = createSimpleTask(OPERATION_RUN_REPORT); - - try { - getReportManager().runReport(reportType.asPrismObject(), reportParam, task, result); - } catch (Exception ex) { - result.recordFatalError(ex); - } finally { - result.computeStatusIfUnknown(); - } - - showResult(result); - target.add(getFeedbackPanel()); - } - - protected void runReportPerformed(AjaxRequestTarget target, ReportType report) { - - if(report.getJasper() == null) { - runConfirmPerformed(target, report, null); - return; - } - - RunReportPopupPanel runReportPopupPanel = new RunReportPopupPanel(getMainPopupBodyId(), report) { - - private static final long serialVersionUID = 1L; - - protected void runConfirmPerformed(AjaxRequestTarget target, ReportType reportType, PrismContainer reportParam) { - PageReports.this.runConfirmPerformed(target, reportType, reportParam); - hideMainPopup(target); - - } - }; - showMainPopup(runReportPopupPanel, target); - + ReportType report = rowModel.getObject().getValue(); + return WebComponentUtil.isImportReport(report); } private void configurePerformed(AjaxRequestTarget target, ReportType report) { PageParameters params = new PageParameters(); params.add(OnePageParameterEncoder.PARAMETER, report.getOid()); - navigateToNext(PageJasperReport.class, params); + navigateToNext(PageReport.class, params); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java index b4b0b5cbcd8..bacb854c55b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java @@ -15,6 +15,8 @@ import com.evolveum.midpoint.audit.api.AuditEventRecord; +import com.evolveum.midpoint.xml.ns._public.common.common_3.GuiObjectColumnType; + import org.apache.commons.lang3.StringUtils; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; @@ -108,7 +110,7 @@ protected List createInlineMenu() { } @Override - protected IColumn, String> createNameColumn(IModel displayModel, String itemPath, ExpressionType expression) { + protected IColumn, String> createNameColumn(IModel displayModel, GuiObjectColumnType customColumn, String itemPath, ExpressionType expression) { return AuditLogViewerPanel.this.createNameColumn(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DashboardReportBasicConfigurationPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DashboardReportBasicConfigurationPanel.html deleted file mode 100644 index d94723c7f80..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DashboardReportBasicConfigurationPanel.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
-

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
- - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DashboardReportBasicConfigurationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DashboardReportBasicConfigurationPanel.java deleted file mode 100644 index 194088228e7..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DashboardReportBasicConfigurationPanel.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.component; - -import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.gui.api.factory.wrapper.PrismObjectWrapperFactory; -import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext; -import com.evolveum.midpoint.gui.api.page.PageBase; -import com.evolveum.midpoint.gui.api.prism.ItemStatus; -import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper; -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; -import com.evolveum.midpoint.gui.impl.prism.panel.ItemPanelSettings; -import com.evolveum.midpoint.gui.impl.prism.panel.ItemPanelSettingsBuilder; -import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; -import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; -import com.evolveum.midpoint.web.component.form.TextAreaFormGroup; -import com.evolveum.midpoint.web.component.form.TextFormGroup; -import com.evolveum.midpoint.web.component.form.ValueChoosePanel; -import com.evolveum.midpoint.web.component.objectdetails.AssignmentHolderTypeDetailsTabPanel; -import com.evolveum.midpoint.web.component.prism.ItemVisibility; -import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; -import com.evolveum.midpoint.web.page.login.PageLogin; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; - -import org.apache.wicket.RestartResponseException; -import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.model.PropertyModel; - -import java.util.Arrays; -import java.util.List; - -import javax.xml.namespace.QName; - -/** - * @author skublik - * - */ -public class DashboardReportBasicConfigurationPanel extends BasePanel { - - private static final Trace LOGGER = TraceManager.getTrace(DashboardReportBasicConfigurationPanel.class); - - private static final String ID_PANEL = "panel"; - private static final String ID_EXPORT = "export"; - private static final String ID_DASHBOARD = "dashboard"; - private static final String ID_COLLECTION = "collection"; - private static final String ID_NAME = "name"; - private static final String ID_DESCRIPTION = "description"; -// private static final String ID_DASHBOARD = "dashboard"; - private static final String ID_LABEL_SIZE = "col-md-2"; - private static final String ID_INPUT_SIZE = "col-md-10"; - - public DashboardReportBasicConfigurationPanel(String id, IModel model) { - super(id, model); - } - - @Override - protected void onInitialize() { - super.onInitialize(); - initLayout(); - } - - protected void initLayout() { - Task task = getPageBase().createSimpleTask("Create report wrapper"); - PrismObjectWrapperFactory factory = getPageBase().findObjectWrapperFactory(getModel().getObject().getObject().getDefinition()); - - WrapperContext context = new WrapperContext(task, task.getResult()); - context.setCreateIfEmpty(true); - PrismObjectWrapper objectWrapper = null; - try { - objectWrapper = factory.createObjectWrapper(getModel().getObject().getObject(), ItemStatus.NOT_CHANGED, context); - - IModel> objectWrapperModel = Model.of(objectWrapper); - ItemPanelSettingsBuilder builder = new ItemPanelSettingsBuilder().visibilityHandler(this::getBasicTabVisibity); - add (getPageBase().initItemPanel(ID_PANEL, FileFormatConfigurationType.COMPLEX_TYPE, - objectWrapperModel, builder.build())); - getModel().getObject().setNewReportModel(objectWrapperModel); - Panel fileFormat = getPageBase().initItemPanel(ID_EXPORT, FileFormatConfigurationType.COMPLEX_TYPE, - PrismContainerWrapperModel.fromContainerWrapper(objectWrapperModel, ReportType.F_FILE_FORMAT), new ItemPanelSettingsBuilder().build()); - add(fileFormat); - Panel dashboard = getPageBase().initItemPanel(ID_DASHBOARD, DashboardReportEngineConfigurationType.COMPLEX_TYPE, - PrismContainerWrapperModel.fromContainerWrapper(objectWrapperModel, ItemPath.create(ReportType.F_DASHBOARD)), new ItemPanelSettingsBuilder().build()); - add(dashboard); - Panel collection = getPageBase().initItemPanel(ID_COLLECTION, ObjectCollectionReportEngineConfigurationType.COMPLEX_TYPE, - PrismContainerWrapperModel.fromContainerWrapper(objectWrapperModel, ItemPath.create(ReportType.F_OBJECT_COLLECTION)), new ItemPanelSettingsBuilder().build()); - add(collection); - } catch (SchemaException e) { - LOGGER.error("Could not create report details panel. Reason: {}", e.getMessage(), e); - } - } - -// TextFormGroup name = new TextFormGroup(ID_NAME, new PropertyModel<>(getModel(), ID_NAME), -// createStringResource("ObjectType.name"), ID_LABEL_SIZE, ID_INPUT_SIZE, true); -// add(name); -// -// TextAreaFormGroup description = new TextAreaFormGroup(ID_DESCRIPTION, -// new PropertyModel<>(getModel(), ID_DESCRIPTION), -// createStringResource("ObjectType.description"), ID_LABEL_SIZE, ID_INPUT_SIZE, false); -// add(description); -// -// ValueChoosePanel panel = -// new ValueChoosePanel(ID_DASHBOARD, -// new PropertyModel(getModel(), ReportDto.F_DASHBOARD_REF)) { -// -// private static final long serialVersionUID = 1L; -// -// @Override -// public List getSupportedTypes() { -// return Arrays.asList(DashboardType.COMPLEX_TYPE); -// } -// -// -// @Override -// protected Class getDefaultType(List supportedTypes) { -// return (Class) DashboardType.class; -// } -// -// }; -// add(panel); -// -// } - - private ItemVisibility getBasicTabVisibity(ItemWrapper itemWrapper) { - if(itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_DESCRIPTION)) - || itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_NAME)) - || itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_DOCUMENTATION))) { - - return ItemVisibility.AUTO; - } - - return ItemVisibility.HIDDEN; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.html index 42b864c3334..b4ea41f7093 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.java index 8b83383d1bb..c356254357e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/EngineReportTabPanel.java @@ -1,37 +1,22 @@ /* - * Copyright (c) 2010-2019 Evolveum and contributors + * Copyright (c) 2010-2021 Evolveum and contributors * * This work is dual-licensed under the Apache License 2.0 * and European Union Public License. See LICENSE file for details. */ package com.evolveum.midpoint.web.page.admin.reports.component; -import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.*; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; -import com.evolveum.midpoint.gui.impl.prism.wrapper.ItemWrapperImpl; -import com.evolveum.midpoint.prism.Containerable; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.web.component.ObjectBasicPanel; -import com.evolveum.midpoint.web.component.form.DropDownFormGroup; -import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; +import com.evolveum.midpoint.web.component.prism.ItemVisibility; import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.ChoiceRenderer; -import org.apache.wicket.markup.html.form.IChoiceRenderer; -import org.apache.wicket.markup.html.list.ListItem; -import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; - -import java.util.ArrayList; -import java.util.List; /** * @author skublik @@ -39,14 +24,7 @@ public class EngineReportTabPanel extends ObjectBasicPanel { - private static final Trace LOGGER = TraceManager.getTrace(EngineReportTabPanel.class); - -// private static final String ID_REPORT_TYPE = "reportType"; - private static final String ID_ENGINES = "engines"; - private static final String ID_ENGINE = "engine"; - -// private static final String ID_LABEL_SIZE = "col-md-2"; -// private static final String ID_INPUT_SIZE = "col-md-10"; + private static final String ID_PANEL = "panel"; public EngineReportTabPanel(String id, IModel> model) { super(id, model); @@ -54,76 +32,38 @@ public EngineReportTabPanel(String id, IModel> mo @Override protected void initLayout() { - List engines = getEngines(); -// IChoiceRenderer renderer = new ChoiceRenderer("displayName", "typeClass"){ -// @Override -// public Object getDisplayValue(ItemWrapper object) { -// if (object.getDisplayName() == null) { -// return ""; -// } -// return getPageBase().createStringResource(object.getDisplayName()).getString(); -// } -// }; -// -// IModel engine = getActualEngine(engines); -// DropDownFormGroup reportTypePanel = new DropDownFormGroup(ID_REPORT_TYPE, engine, Model.ofList(engines), renderer, -// createStringResource("EngineReportTabPanel.TypeOfReport"), ID_LABEL_SIZE, ID_INPUT_SIZE, false); -// reportTypePanel.setOutputMarkupId(true); - - ListView engineView = new ListView(ID_ENGINES, Model.ofList(engines)) { - @Override - protected void populateItem(ListItem listItem) { - PrismContainerWrapperModel model = - PrismContainerWrapperModel.fromContainerWrapper(EngineReportTabPanel.this.getModel(), listItem.getModelObject().getPath()); - SingleContainerPanel enginePanel = new SingleContainerPanel(ID_ENGINE, model, listItem.getModelObject().getTypeName()); -// enginePanel.add(new VisibleEnableBehaviour(){ -// -// @Override -// public boolean isVisible() { -// return engine.getObject() != null && listItem.getModelObject().getPath().equivalent(engine.getObject().getPath()); -// } -// }); - listItem.add(enginePanel); - } - }; - - engineView.setOutputMarkupId(true); - add(engineView); - -// reportTypePanel.getInput().add(new AjaxFormComponentUpdatingBehavior("change"){ -// -// @Override -// protected void onUpdate(AjaxRequestTarget ajaxRequestTarget) { -//// ajaxRequestTarget.add(reportTypePanel); -// ajaxRequestTarget.add(EngineReportTabPanel.this); -// } -// }); -// reportTypePanel.add(new VisibleEnableBehaviour(){ -// @Override -// public boolean isVisible() { -// return engine.getObject() == null; -// } -// }); -// add(reportTypePanel); - } - - private IModel getActualEngine(List engines) { - for (ItemWrapper engine : engines) { - if (engine instanceof ItemWrapperImpl && !((ItemWrapperImpl)engine).getOldItem().isEmpty()){ - return Model.of(engine); - } + if (WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_DASHBOARD_REPORT.value())) { + add(new SingleContainerPanel(ID_PANEL, PrismContainerWrapperModel.fromContainerWrapper( + getModel(), ItemPath.create(ReportType.F_DASHBOARD)), DashboardReportEngineConfigurationType.COMPLEX_TYPE) { + @Override + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + if (!ItemPath.create(ReportType.F_DASHBOARD, DashboardReportEngineConfigurationType.F_DASHBOARD_REF).equivalent(itemWrapper.getPath()) + && !ItemPath.create(ReportType.F_DASHBOARD, DashboardReportEngineConfigurationType.F_SHOW_ONLY_WIDGETS_TABLE).equivalent(itemWrapper.getPath())) { + return ItemVisibility.HIDDEN; + } + return super.getVisibility(itemWrapper); + } + }); + } else if(WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value())) { + add(new SingleContainerPanel(ID_PANEL, PrismContainerWrapperModel.fromContainerWrapper( + getModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION)), ObjectCollectionReportEngineConfigurationType.COMPLEX_TYPE) { + @Override + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + if (!ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_CONDITION).equivalent(itemWrapper.getPath()) + && !ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_USE_ONLY_REPORT_VIEW).equivalent(itemWrapper.getPath())) { + return ItemVisibility.HIDDEN; + } + return super.getVisibility(itemWrapper); + } + }); + } else { + warn(getPageBase().createStringResource("PageReport.message.selectTypeOfReport").getString()); + add(new WebMarkupContainer(ID_PANEL)); } - return Model.of(); } - private List getEngines() { - List items = new ArrayList<>(); - for (ItemWrapper item : getModel ().getObject().getValue().getContainers()) { - if (item.getTypeClass() != null && AbstractReportEngineConfigurationType.class.isAssignableFrom(item.getTypeClass())) { - items.add(item); - } - } - return items; + private ReportType getReport() { + return getModelObject().getObject().asObjectable(); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html index 55b3b992787..dc1ea33d6c0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html @@ -62,7 +62,7 @@

- +

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java index c2fcd8c97f4..e687233306b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java @@ -43,7 +43,6 @@ import com.evolveum.midpoint.web.component.AjaxSubmitButton; import com.evolveum.midpoint.web.component.dialog.Popupable; import com.evolveum.midpoint.web.component.input.TextPanel; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; @@ -53,7 +52,7 @@ /** * @author lskublik */ -public class ImportReportPopupPanel extends BasePanel implements Popupable { +public class ImportReportPopupPanel extends BasePanel implements Popupable { private static final long serialVersionUID = 1L; @@ -71,11 +70,9 @@ public class ImportReportPopupPanel extends BasePanel implements Popu private static final String ID_NAME_FOR_DATA = "reportDataName"; private static final String ID_FILE_AS_NAME = "fileAsString"; - private ReportType report; public ImportReportPopupPanel(String id, @NotNull ReportType report) { - super(id); - this.report = report; + super(id, Model.of(report)); } @Override @@ -147,7 +144,7 @@ private void importConfirmPerformed(AjaxRequestTarget target, Model name String dataName; if (nameModel == null || StringUtils.isEmpty(nameModel.getObject())) { - dataName = this.report.getName().getOrig() + "-IMPORT " + getDataTime(); + dataName = getModelObject().getName().getOrig() + "-IMPORT " + getDataTime(); } else { dataName = nameModel.getObject(); } @@ -227,7 +224,7 @@ private void importConfirmPerformed(AjaxRequestTarget target, Model name reportImportData.setFilePath(newFilePath); ObjectReferenceType reportRef = new ObjectReferenceType(); reportRef.setType(ReportType.COMPLEX_TYPE); - reportRef.setOid(report.getOid()); + reportRef.setOid(getModelObject().getOid()); reportImportData.setReportRef(reportRef); Collection> deltas = Collections.singleton(reportImportData.asPrismObject().createAddDelta()); Task task = getPageBase().createSimpleTask(OPERATION_CREATE_REPORT_DATA); @@ -271,7 +268,7 @@ public int getWidth() { @Override public int getHeight() { - return 305; + return 100; } @Override @@ -281,7 +278,7 @@ public String getWidthUnit(){ @Override public String getHeightUnit(){ - return "px"; + return "%"; } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportBasicConfigurationPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportBasicConfigurationPanel.html deleted file mode 100644 index d33b6aee00e..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportBasicConfigurationPanel.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - -
-
-

- -
-
-
- -
-
-

-
-
-
-
-
-
- - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportBasicConfigurationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportBasicConfigurationPanel.java deleted file mode 100644 index e080e3c27b2..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportBasicConfigurationPanel.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.component; - -import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.web.component.form.DropDownFormGroup; -import com.evolveum.midpoint.web.component.form.TextAreaFormGroup; -import com.evolveum.midpoint.web.component.form.TextFormGroup; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; -import com.evolveum.midpoint.xml.ns._public.common.common_3.JasperExportType; - -import org.apache.wicket.markup.html.form.ChoiceRenderer; -import org.apache.wicket.markup.html.form.EnumChoiceRenderer; -import org.apache.wicket.markup.html.form.IChoiceRenderer; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.PropertyModel; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author shood - * @author lazyman - * - */ -public class JasperReportBasicConfigurationPanel extends BasePanel { - - private static final String ID_NAME = "name"; - private static final String ID_DESCRIPTION = "description"; - private static final String ID_EXPORT_TYPE = "exportType"; - private static final String ID_VIRTUALIZER = "virtualizer"; - private static final String ID_VIRTUALIZER_KICKON = "virtualizerKickOn"; - private static final String ID_MAXPAGES = "maxPages"; - private static final String ID_PROPERTIES = "properties"; - private static final String ID_USE_HIBERNATE_SESSION = "useHibernateSession"; - private static final String ID_ORIENTATION = "orientation"; - private static final String ID_TIMEOUT = "timeout"; - - private static final String ID_SEARCH_ON_RESOURCE = "searchOnResource"; - private static final String ID_LABEL_SIZE = "col-md-4"; - private static final String ID_INPUT_SIZE = "col-md-8"; - - public JasperReportBasicConfigurationPanel(String id, IModel model) { - super(id, model); - initLayout(); - } - - protected void initLayout() { - TextFormGroup name = new TextFormGroup(ID_NAME, new PropertyModel<>(getModel(), ID_NAME), - createStringResource("ObjectType.name"), ID_LABEL_SIZE, ID_INPUT_SIZE, true); - add(name); - - TextAreaFormGroup description = new TextAreaFormGroup(ID_DESCRIPTION, - new PropertyModel<>(getModel(), ID_DESCRIPTION), - createStringResource("ObjectType.description"), ID_LABEL_SIZE, ID_INPUT_SIZE, false); - add(description); - - IModel choices = WebComponentUtil.createReadonlyValueModelFromEnum(JasperExportType.class, e -> e != JasperExportType.JXL); - IChoiceRenderer renderer = new EnumChoiceRenderer(); - DropDownFormGroup exportType = new DropDownFormGroup(ID_EXPORT_TYPE, new PropertyModel(getModel(), ReportDto.F_EXPORT_TYPE), choices, renderer, - createStringResource("ReportType.export"), ID_LABEL_SIZE, ID_INPUT_SIZE, true); - add(exportType); - - TextFormGroup virtualizerKickOn = null; - DropDownFormGroup virtualizer = new DropDownFormGroup(ID_VIRTUALIZER, new PropertyModel(getModel(), ReportDto.F_VIRTUALIZER), - createVirtualizerListModel(), new ChoiceRenderer(), - createStringResource("ReportType.virtualizer"), ID_LABEL_SIZE, ID_INPUT_SIZE, false); - //virtualizer.add(new VirtualizerAjaxFormUpdatingBehaviour(virtualizerKickOn)); - add(virtualizer); - - virtualizerKickOn = new TextFormGroup(ID_VIRTUALIZER_KICKON, new PropertyModel<>(getModel(), ReportDto.F_VIRTUALIZER_KICKON), - createStringResource("ReportType.virtualizerKickOn"), ID_LABEL_SIZE, "col-md-4", false); - add(virtualizerKickOn); - - TextFormGroup maxPages = new TextFormGroup(ID_MAXPAGES, new PropertyModel<>(getModel(), ReportDto.F_MAXPAGES), - createStringResource("ReportType.maxPages"), ID_LABEL_SIZE, "col-md-4", false); - add(maxPages); - - TextFormGroup timeout = new TextFormGroup(ID_TIMEOUT, new PropertyModel<>(getModel(), ReportDto.F_TIMEOUT), - createStringResource("ReportType.timeout"), ID_LABEL_SIZE, "col-md-4", false); - add(timeout); - } - - private IModel> createVirtualizerListModel() { - final List virtualizerList = new ArrayList(); - - virtualizerList.add("JRFileVirtualizer"); - virtualizerList.add("JRSwapFileVirtualizer"); - virtualizerList.add("JRGzipVirtualizer"); - - return new IModel>() { - - @Override - public List getObject() { - return virtualizerList; - } - }; - } - - /* - private static class VirtualizerAjaxFormUpdatingBehaviour extends AjaxFormComponentUpdatingBehavior { - - Component virtualizerKickOn; - - public VirtualizerAjaxFormUpdatingBehaviour(Component virtualizerKickOn) { - super("change"); - this.virtualizerKickOn = virtualizerKickOn; - } - - @Override - protected void onUpdate(AjaxRequestTarget target) { - if (virtualizerKickOn != null) { - virtualizerKickOn.setVisible(!virtualizerKickOn.isVisible()); // just demo - target.add(virtualizerKickOn); - } - - } - } - */ -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html deleted file mode 100644 index bd858d826b8..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - -
-
-

- -
- -
- - - - -
-
-
-

- -
- -
- - - - -
-
-
- -
- -
- - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java deleted file mode 100644 index 596128453e7..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java +++ /dev/null @@ -1,375 +0,0 @@ -/* - * Copyright (C) 2010-2020 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.component; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; -import org.apache.wicket.behavior.AttributeAppender; -import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; -import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; -import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; -import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; -import org.apache.wicket.markup.html.form.FormComponent; -import org.apache.wicket.markup.repeater.Item; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.validation.IValidatable; -import org.apache.wicket.validation.IValidator; -import org.apache.wicket.validation.ValidationError; - -import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.gui.impl.model.JasperTemplateModel; -import com.evolveum.midpoint.web.component.AjaxButton; -import com.evolveum.midpoint.web.component.data.BoxedTablePanel; -import com.evolveum.midpoint.web.component.data.column.*; -import com.evolveum.midpoint.web.component.input.TextPanel; -import com.evolveum.midpoint.web.component.util.ListDataProvider; -import com.evolveum.midpoint.web.component.util.Selectable; -import com.evolveum.midpoint.web.page.admin.reports.dto.JasperReportFieldDto; -import com.evolveum.midpoint.web.page.admin.reports.dto.JasperReportParameterDto; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; - -public class JasperReportConfigurationPanel extends BasePanel { - - private static final long serialVersionUID = 1L; - - private static final String ID_PARAMETERS_TABLE = "parametersTable"; - private static final String ID_FIELDS_TABLE = "fieldsTable"; - private static final String ID_BUTTON_ADD_PARAMETER = "addParameter"; - private static final String ID_BUTTON_ADD_FIELD = "addField"; - private static final String ID_QUERY = "query"; - private static final String ID_TEMPLATE = "template"; - private static final String ID_DELETE_PARAMETER = "deleteParameter"; - private static final String ID_DELETE_FIELD = "deleteField"; - - public JasperReportConfigurationPanel(String id, IModel model) { - super(id, model); - initLayout(); - } - - protected void initLayout() { - AceEditorPanel queryPanel = new AceEditorPanel(ID_QUERY, - createStringResource("JasperReportConfigurationPanel.reportQuery"), - new PropertyModel<>(getModel(), "jasperReportDto.query")); - add(queryPanel); - - initParametersTable(); - initFieldsTable(); - - IModel data = new JasperTemplateModel(new PropertyModel<>(getModel(), "jasperReportDto.jasperReportXml")); - AceEditorPanel templateEditor = new AceEditorPanel(ID_TEMPLATE, - createStringResource("PageReport.jasperTemplate"), data, 300); - add(templateEditor); - } - - private void initParametersTable() { - ISortableDataProvider provider = new ListDataProvider<>(this, - new PropertyModel<>(getModel(), "jasperReportDto.parameters")); - BoxedTablePanel table = new BoxedTablePanel<>(ID_PARAMETERS_TABLE, provider, initParameterColumns()); - table.setOutputMarkupId(true); - add(table); - - AjaxButton addParameter = new AjaxButton(ID_BUTTON_ADD_PARAMETER, - createStringResource("JasperReportConfigurationPanel.addParameter")) { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - addParameterPerformed(target); - } - }; - add(addParameter); - - AjaxButton deleteParameter = new AjaxButton(ID_DELETE_PARAMETER, - createStringResource("JasperReportConfigurationPanel.deleteParameter")) { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - deleteParameterPerformed(target); - } - }; - add(deleteParameter); - - } - - private void initFieldsTable() { - ISortableDataProvider provider = new ListDataProvider<>(this, - new PropertyModel<>(getModel(), "jasperReportDto.fields")); - BoxedTablePanel table = new BoxedTablePanel<>(ID_FIELDS_TABLE, provider, initFieldColumns()); - table.setOutputMarkupId(true); - add(table); - - AjaxButton addParameter = new AjaxButton(ID_BUTTON_ADD_FIELD, - createStringResource("JasperReportConfigurationPanel.addField")) { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - addFieldPerformed(target); - } - }; - add(addParameter); - - AjaxButton deleteParameter = new AjaxButton(ID_DELETE_FIELD, - createStringResource("JasperReportConfigurationPanel.deleteField")) { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - deleteFieldPerformed(target); - } - }; - add(deleteParameter); - } - - private void addParameterPerformed(AjaxRequestTarget target) { - ReportDto dto = getModel().getObject(); - JasperReportParameterDto parameter = new JasperReportParameterDto(); - parameter.setEditing(true); - dto.getJasperReportDto().getParameters().add(parameter); - - BoxedTablePanel parametersTable = getParametersTable(); - adjustParametersTablePage(parametersTable, dto); - target.add(getParametersTable()); - } - - private void deleteParameterPerformed(AjaxRequestTarget target) { - getModelObject().getJasperReportDto().getParameters().removeIf(Selectable::isSelected); - target.add(getParametersTable()); - } - - private void addFieldPerformed(AjaxRequestTarget target) { - ReportDto dto = getModel().getObject(); - JasperReportFieldDto parameter = new JasperReportFieldDto(); - parameter.setEditing(true); - dto.getJasperReportDto().getFields().add(parameter); - - BoxedTablePanel fieldsTable = getFieldsTable(); - adjustFieldsTablePage(fieldsTable, dto); - target.add(getFieldsTable()); - } - - private void deleteFieldPerformed(AjaxRequestTarget target) { - getModelObject().getJasperReportDto().getFields().removeIf(Selectable::isSelected); - target.add(getFieldsTable()); - } - - @SuppressWarnings("unchecked") - private void adjustParametersTablePage(BoxedTablePanel parametersTable, ReportDto dto) { - if (parametersTable != null && dto.getJasperReportDto().getParameters().size() % 10 == 1 - && dto.getJasperReportDto().getParameters().size() != 1) { - DataTable table = parametersTable.getDataTable(); - - if (table != null) { - table.setCurrentPage(dto.getJasperReportDto().getParameters().size() / 10); - } - } - } - - @SuppressWarnings("unchecked") - private void adjustFieldsTablePage(BoxedTablePanel parametersTable, ReportDto dto) { - if (parametersTable != null && dto.getJasperReportDto().getFields().size() % 10 == 1 - && dto.getJasperReportDto().getFields().size() != 1) { - DataTable table = parametersTable.getDataTable(); - - if (table != null) { - table.setCurrentPage(dto.getJasperReportDto().getFields().size() / 10); - } - } - } - - private List> initParameterColumns() { - List> columns = new ArrayList<>(); - IColumn column = new CheckBoxHeaderColumn<>(); - columns.add(column); - - // name editing column - columns.add(buildEditableLinkColumn("JasperReportConfigurationPanel.parameterName", null, "name", true)); - - // class editing column - columns.add( - buildEditableLinkColumn("JasperReportConfigurationPanel.parameterClass", null, "typeAsString", true)); - columns.add( - buildEditableLinkColumn("JasperReportConfigurationPanel.nestedClass", null, "nestedTypeAsString", true)); - - columns.add(new AjaxLinkColumn(createStringResource("JasperReportConfigurationPanel.properties")) { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target, - IModel rowModel) { - showPropertiesPopup(target, rowModel); - } - - @Override - protected IModel createLinkModel(IModel rowModel) { - return createStringResource("JasperReportConfigurationPanel.configure"); - } - - }); - - CheckBoxColumn forPrompting = new CheckBoxColumn( - createStringResource("JasperReportConfigurationPanel.forPrompting"), "forPrompting") { - - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(Item> cellItem, String componentId, - IModel rowModel) { - IsolatedCheckBoxPanel checkBox = new IsolatedCheckBoxPanel(componentId, - new PropertyModel<>(rowModel, getPropertyExpression()), new Model<>(true)); - cellItem.add(checkBox); - } - }; - - columns.add(forPrompting); - - return columns; - } - - private void showPropertiesPopup(AjaxRequestTarget target, - IModel rowModel) { - - ParameterPropertiesPopupPanel propertiesPopup = new ParameterPropertiesPopupPanel(getPageBase().getMainPopupBodyId(), new PropertyModel<>(rowModel, "properties")); - getPageBase().showMainPopup(propertiesPopup, target); - - } - - private EditableAjaxLinkColumn buildEditableLinkColumn( - String resource, String resourceParam, String property, final Boolean mandatory) { - return new EditableAjaxLinkColumn(createStringResource(resource, resourceParam), - property) { - - private static final long serialVersionUID = 1L; - - @Override - protected Component createInputPanel(String componentId, final IModel model) { - return createTextPanel(componentId, model, getPropertyExpression(), mandatory); - - } - - @Override - public void onClick(AjaxRequestTarget target, IModel rowModel) { - parameterEditPerformed(target, rowModel); - } - }; - } - - private void parameterEditPerformed(AjaxRequestTarget target, IModel rowModel) { - JasperReportParameterDto parameter = rowModel.getObject(); - parameter.setEditing(true); - target.add(getParametersTable()); - } - - @SuppressWarnings("unchecked") - private BoxedTablePanel getParametersTable() { - return (BoxedTablePanel) get(ID_PARAMETERS_TABLE); - } - - private List> initFieldColumns() { - List> columns = new ArrayList<>(); - IColumn column = new CheckBoxHeaderColumn<>(); - columns.add(column); - - // name editing column - columns.add(new EditableAjaxLinkColumn( - createStringResource("JasperReportConfigurationPanel.fieldName"), "name") { - - private static final long serialVersionUID = 1L; - - @Override - protected Component createInputPanel(String componentId, final IModel model) { - return createTextPanel(componentId, model, getPropertyExpression(), true); - - } - - @Override - public void onClick(AjaxRequestTarget target, IModel rowModel) { - fieldEditPerformed(target, rowModel); - } - }); - - // class editing column - columns.add(new EditableAjaxLinkColumn( - createStringResource("JasperReportConfigurationPanel.fieldClass"), "typeAsString") { - - private static final long serialVersionUID = 1L; - - @Override - protected Component createInputPanel(String componentId, IModel model) { - return createTextPanel(componentId, model, getPropertyExpression(), true); - } - - @Override - public void onClick(AjaxRequestTarget target, IModel rowModel) { - fieldEditPerformed(target, rowModel); - } - }); - - return columns; - } - - private void fieldEditPerformed(AjaxRequestTarget target, IModel rowModel) { - JasperReportFieldDto parameter = rowModel.getObject(); - parameter.setEditing(true); - target.add(getFieldsTable()); - } - - @SuppressWarnings("unchecked") - private BoxedTablePanel getFieldsTable() { - return (BoxedTablePanel) get(ID_FIELDS_TABLE); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private Component createTextPanel(String componentId, final IModel model, String expression, - final Boolean mandatory) { - TextPanel textPanel = new TextPanel<>(componentId, new PropertyModel<>(model, expression)); - FormComponent input = textPanel.getBaseFormComponent(); - input.add(new AttributeAppender("style", "width: 100%")); - input.add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); - input.add(new IValidator() { - - private static final long serialVersionUID = 1L; - - @Override - public void validate(IValidatable validatable) { - if (!mandatory) { - return; - } - if (validatable.getValue() == null) { - validatable.error(new ValidationError("JasperReportConfigurationPanel.errormsg")); - } - } - - }); - return textPanel; - } - - private static class EmptyOnBlurAjaxFormUpdatingBehaviour extends AjaxFormComponentUpdatingBehavior { - - private static final long serialVersionUID = 1L; - - public EmptyOnBlurAjaxFormUpdatingBehaviour() { - super("blur"); - } - - @Override - protected void onUpdate(AjaxRequestTarget target) { - } - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.html deleted file mode 100644 index 8acae7f8d3e..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - -

- -

- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- -

- -

- - - - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.java deleted file mode 100644 index 10dc96847ea..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2010-2017 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.component; - -import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.model.StringResourceModel; - -import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.gui.api.component.form.CheckBoxPanel; -import com.evolveum.midpoint.web.component.AjaxButton; -import com.evolveum.midpoint.web.component.dialog.Popupable; -import com.evolveum.midpoint.web.component.input.TextPanel; -import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour; -import com.evolveum.midpoint.web.page.admin.reports.dto.JasperReportParameterPropertiesDto; - -public class ParameterPropertiesPopupPanel extends BasePanel implements Popupable { - - private static final long serialVersionUID = 1L; - - private static final String ID_KEY = "propertyKey"; - private static final String ID_LABEL = "propertyLabel"; - private static final String ID_TARGET_TYPE = "propertyTargetType"; - private static final String ID_REQUIRED = "propertyRequired"; -// private static final String ID_MULTIVALUE = "propertyMultivalue"; - - private static final String ID_BUTTON_UPDATE = "update"; - -// private static final Trace LOGGER = TraceManager.getTrace(ParameterPropertiesPopupPanel.class); - - public ParameterPropertiesPopupPanel(String id, IModel model) { - super(id, model); - initLayout(); - } - - private void initLayout() { - - addTextPanel(ID_KEY, "key"); - addTextPanel(ID_LABEL, "label"); - addTextPanel(ID_TARGET_TYPE, "targetType"); - CheckBoxPanel multivalue = new CheckBoxPanel(ID_REQUIRED, new PropertyModel<>(getModel(), "mandatory")); - add(multivalue); -// CheckBoxPanel multivalue = new CheckBoxPanel(ID_MULTIVALUE, new PropertyModel<>(getModel(), "multivalue"), Model.of(Boolean.TRUE)); -// add(multivalue); - - AjaxButton update = new AjaxButton(ID_BUTTON_UPDATE) { - - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - getPageBase().hideMainPopup(target); - IModel model = ParameterPropertiesPopupPanel.this.getModel(); - updateProperties(model.getObject(), target); - } - }; - - add(update); - - } - - private void addTextPanel(String id, String expression){ - TextPanel keyPanel = new TextPanel<>(id, new PropertyModel<>(getModel(), expression)); - keyPanel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); - add(keyPanel); - } - - protected void updateProperties(JasperReportParameterPropertiesDto properties, AjaxRequestTarget target) { - - } - - @Override - public int getWidth() { - return 800; - } - - @Override - public int getHeight() { - return 450; - } - - @Override - public String getWidthUnit(){ - return "px"; - } - - @Override - public String getHeightUnit(){ - return "px"; - } - - @Override - public StringResourceModel getTitle() { - return createStringResource("JasperReportParameterProperties.title"); - } - - @Override - public Component getComponent() { - return this; - } - -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html deleted file mode 100644 index 7919e4c18ae..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - -
- - diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java deleted file mode 100644 index fefe601b516..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.component; - -import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; - -import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; - -import org.apache.wicket.model.IModel; -import org.jetbrains.annotations.NotNull; - -/** - * @author skublik - * - */ -public class ReportConfigurationPanel extends BasePanel { - - private static final String ID_BASIC_PANEL = "basicPanel"; - - public ReportConfigurationPanel(String id, IModel model) { - super(id, model); - initLayout(); - } - - protected void initLayout() { - @NotNull ReportType report = getModel().getObject().getObject().asObjectable(); - - if(report.getJasper() != null) { - add(new JasperReportBasicConfigurationPanel(ID_BASIC_PANEL, getModel())); - } else { - add(new DashboardReportBasicConfigurationPanel(ID_BASIC_PANEL, getModel())); - } - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportMainPanel.java index 1df1cb07225..090802cce68 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportMainPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportMainPanel.java @@ -1,35 +1,60 @@ /* - * Copyright (c) 2010-2019 Evolveum and contributors + * Copyright (c) 2010-2021 Evolveum and contributors * * This work is dual-licensed under the Apache License 2.0 * and European Union Public License. See LICENSE file for details. */ package com.evolveum.midpoint.web.page.admin.reports.component; +import com.evolveum.midpoint.gui.api.component.DisplayNamePanel; import com.evolveum.midpoint.gui.api.component.tabs.PanelTab; import com.evolveum.midpoint.gui.api.model.LoadableModel; +import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper; import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.gui.impl.component.BasicMultivalueContainerListPanel; +import com.evolveum.midpoint.gui.impl.component.MultivalueContainerDetailsPanel; +import com.evolveum.midpoint.gui.impl.component.data.column.AbstractItemWrapperColumn; +import com.evolveum.midpoint.gui.impl.component.data.column.PrismPropertyWrapperColumn; +import com.evolveum.midpoint.gui.impl.factory.panel.ItemRealValueModel; import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel; import com.evolveum.midpoint.prism.Containerable; +import com.evolveum.midpoint.prism.PrismContainerDefinition; import com.evolveum.midpoint.prism.path.ItemPath; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.component.AjaxSubmitButton; import com.evolveum.midpoint.web.component.ObjectBasicPanel; import com.evolveum.midpoint.web.component.objectdetails.AbstractObjectMainPanel; import com.evolveum.midpoint.web.component.prism.ItemVisibility; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; import com.evolveum.midpoint.web.model.PrismContainerWrapperModel; +import com.evolveum.midpoint.web.model.PrismPropertyWrapperModel; import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails; import com.evolveum.midpoint.web.page.admin.reports.PageReport; -import com.evolveum.midpoint.xml.ns._public.common.common_3.FileFormatConfigurationType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; +import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.list.ListItem; +import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.markup.repeater.RepeatingView; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.jetbrains.annotations.NotNull; import javax.xml.namespace.QName; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -39,10 +64,19 @@ public class ReportMainPanel extends AbstractObjectMainPanel { private static final long serialVersionUID = 1L; + private static final Trace LOGGER = TraceManager.getTrace(ReportMainPanel.class); + private static final String ID_SAVE_AND_RUN = "saveAndRun"; + private final PageBase pageBase; + public ReportMainPanel(String id, LoadableModel> objectModel, PageAdminObjectDetails parentPage) { super(id, objectModel, parentPage); + pageBase = parentPage; + } + + public PageBase getPageBase() { + return pageBase; } @Override @@ -62,7 +96,7 @@ private void initLayoutSaveAndRunButton(PageAdminObjectDetails paren @Override protected void onSubmit(AjaxRequestTarget target) { - ((PageReport)getDetailsPage()).saveAndRunPerformed(target); + ((PageReport) getDetailsPage()).saveAndRunPerformed(target); } @Override @@ -100,7 +134,7 @@ public void reloadSavePreviewButtons(AjaxRequestTarget target) { } - private List getTabs(PageAdminObjectDetails parentPage){ + private List getTabs(PageAdminObjectDetails parentPage) { List tabs = new ArrayList<>(); tabs.add(new PanelTab(parentPage.createStringResource("pageReport.basic.title")) { @@ -108,7 +142,7 @@ private List getTabs(PageAdminObjectDetails parentPage){ @Override public WebMarkupContainer createPanel(String panelId) { - return new ObjectBasicPanel(panelId, getObjectModel()){ + return new ObjectBasicPanel(panelId, getObjectModel()) { @Override protected QName getType() { return ReportType.COMPLEX_TYPE; @@ -116,7 +150,7 @@ protected QName getType() { @Override protected ItemVisibility getBasicTabVisibility(ItemWrapper itemWrapper) { - if(itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_LIFECYCLE_STATE)) + if (itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_LIFECYCLE_STATE)) || itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_DIAGNOSTIC_INFORMATION)) || itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_DEFAULT_SCRIPT_CONFIGURATION)) || itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ItemPath.EMPTY_PATH, ReportType.F_POST_REPORT_SCRIPT))) { @@ -136,6 +170,8 @@ public WebMarkupContainer createPanel(String panelId) { return new EngineReportTabPanel(panelId, getObjectModel()); } }); + tabs.addAll(createTabsForCollectionReports()); + tabs.addAll(createTabsForDashboardReports()); tabs.add(new PanelTab(parentPage.createStringResource("pageReport.export.title")) { @@ -144,10 +180,10 @@ public WebMarkupContainer createPanel(String panelId) { @Override public WebMarkupContainer createPanel(String panelId) { PrismContainerWrapperModel model = PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), ReportType.F_FILE_FORMAT); - return new SingleContainerPanel(panelId, model, FileFormatConfigurationType.COMPLEX_TYPE){ + return new SingleContainerPanel(panelId, model, FileFormatConfigurationType.COMPLEX_TYPE) { @Override - protected ItemVisibility getVisibility(ItemPath itemPath) { - if(itemPath.isSubPathOrEquivalent(ItemPath.create(ReportType.F_FILE_FORMAT, FileFormatConfigurationType.F_HTML))) { + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + if (itemWrapper.getPath().isSubPathOrEquivalent(ItemPath.create(ReportType.F_FILE_FORMAT, FileFormatConfigurationType.F_HTML))) { return ItemVisibility.HIDDEN; } return ItemVisibility.AUTO; @@ -158,4 +194,390 @@ protected ItemVisibility getVisibility(ItemPath itemPath) { return tabs; } + + private List createTabs() { + + if (WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value())) { + return createTabsForCollectionReports(); + } else if (WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_DASHBOARD_REPORT.value())) { + return createTabsForDashboardReports(); + } + warn(getPageBase().createStringResource("PageReport.message.selectTypeOfReport").getString()); + return Collections.EMPTY_LIST; + } + + private ReportType getReport() { + return getObjectModel().getObject().getObject().asObjectable(); + } + + private List createTabsForDashboardReports() { + List tabs = new ArrayList<>(); + + tabs.add(new PanelTab(getPageBase().createStringResource("DashboardReportEngineConfigurationType.view")) { + + @Override + public WebMarkupContainer createPanel(String panelId) { + return new SingleContainerPanel(panelId, PrismContainerWrapperModel.fromContainerWrapper( + getObjectModel(), ItemPath.create(ReportType.F_DASHBOARD, DashboardReportEngineConfigurationType.F_VIEW)), GuiObjectListViewType.COMPLEX_TYPE); + } + + @Override + public boolean isVisible() { + return WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_DASHBOARD_REPORT.value()); + } + }); + + return tabs; + } + + private List createTabsForCollectionReports() { + List tabs = new ArrayList<>(); + + tabs.add(new PanelTab(getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.collection")) { + + @Override + public WebMarkupContainer createPanel(String panelId) { + return new SingleContainerPanel(panelId, PrismContainerWrapperModel.fromContainerWrapper( + getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_COLLECTION)), GuiObjectListViewType.COMPLEX_TYPE); + } + + @Override + public boolean isVisible() { + return WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value()); + } + }); + + tabs.add(new PanelTab(getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.view")) { + + @Override + public WebMarkupContainer createPanel(String panelId) { + RepeatingView panel = new RepeatingView(panelId); + PrismPropertyWrapperModel propertyModel = PrismPropertyWrapperModel.fromContainerWrapper(getObjectModel(), + ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_VIEW, GuiObjectListViewType.F_TYPE)); + try { + Panel propertyPanel = getPageBase().initItemPanel(panel.newChildId(), propertyModel.getObject().getTypeName(), propertyModel, null); + panel.add(propertyPanel); + } catch (SchemaException e) { + LOGGER.error("Couldn't create panel for type element in view"); + } + panel.add(createObjectListForColumns(panel.newChildId())); + return panel; + } + + @Override + public boolean isVisible() { + return WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value()); + } + }); + + tabs.add(new PanelTab(getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.parameter")) { + + @Override + public WebMarkupContainer createPanel(String panelId) { + return createObjectListForParameters(panelId); + } + + @Override + public boolean isVisible() { + return WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value()); + } + }); + + tabs.add(new PanelTab(getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.subreport")) { + + @Override + public WebMarkupContainer createPanel(String panelId) { + return createObjectListForSubreports(panelId); + } + + @Override + public boolean isVisible() { + return WebComponentUtil.hasArchetypeAssignment(getReport(), SystemObjectsType.ARCHETYPE_COLLECTION_REPORT.value()); + } + }); + + return tabs; + } + + private WebMarkupContainer createObjectListForParameters(String panelId) { + return new BasicMultivalueContainerListPanel<>(panelId, SearchFilterParameterType.class) { + + @Override + protected MultivalueContainerDetailsPanel getMultivalueContainerDetailsPanel(ListItem> item) { + return createDetailsPanelForParameter(ID_ITEM_DETAILS, item); + } + + @Override + protected String getContainerNameForNewButton() { + return getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.parameter").getString(); + } + + @Override + protected IModel> getContainerModel() { + return PrismContainerWrapperModel.fromContainerWrapper( + getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_PARAMETER)); + } + + @Override + protected List, String>> createDefaultColumns() { + return createColumnsForParameters(); + } + }; + } + + private MultivalueContainerDetailsPanel createDetailsPanelForParameter(String panelId, ListItem> item) { + return new MultivalueContainerDetailsPanel<>(panelId, item.getModel(), true) { + @Override + protected DisplayNamePanel createDisplayNamePanel(String displayNamePanelId) { + return new DisplayNamePanel<>(displayNamePanelId, new ItemRealValueModel<>(getModel())) { + @Override + protected IModel createHeaderModel() { + return () -> { + SearchFilterParameterType parameter = getModelObject(); + String name = parameter.getName(); + if (parameter.getDisplay() != null && parameter.getDisplay().getLabel() != null) { + name = WebComponentUtil.getTranslatedPolyString(parameter.getDisplay().getLabel()); + } + return name; + }; + } + + @Override + protected String createImageModel() { + return "fa fa-sliders"; + } + }; + } + + @Override + protected ItemVisibility getBasicTabVisibity(ItemWrapper itemWrapper) { + if (ItemPath.create(itemWrapper.getParent().getPath(), SearchFilterParameterType.F_DISPLAY).equivalent(itemWrapper.getPath())) { + return ItemVisibility.HIDDEN; + } + return super.getBasicTabVisibity(itemWrapper); + } + + @Override + protected @NotNull List createTabs() { + List tabs = new ArrayList<>(); + tabs.add(new PanelTab(createStringResource("SearchFilterParameterType.display")) { + @Override + public WebMarkupContainer createPanel(String panelId) { + return new SingleContainerPanel<>(panelId, + PrismContainerWrapperModel.fromContainerValueWrapper(getModel(), SearchFilterParameterType.F_DISPLAY), DisplayType.COMPLEX_TYPE) { + + @Override + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + if (ItemPath.create(itemWrapper.getParent().getPath(), DisplayType.F_LABEL).equivalent(itemWrapper.getPath()) + || ItemPath.create(itemWrapper.getParent().getPath(), DisplayType.F_HELP).equivalent(itemWrapper.getPath())) { + return super.getVisibility(itemWrapper); + } + return ItemVisibility.HIDDEN; + } + }; + } + }); + return tabs; + } + }; + } + + private List, String>> createColumnsForParameters() { + PrismContainerWrapperModel containerModel = PrismContainerWrapperModel.fromContainerWrapper( + getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_PARAMETER)); + List, String>> columns = new ArrayList<>(); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, SearchFilterParameterType.F_NAME, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-sm-3 col-md-2"; + } + }); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, SearchFilterParameterType.F_TYPE, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-md-3"; + } + }); + + PrismContainerDefinition def = containerModel.getObject().getComplexTypeDefinition().findContainerDefinition(SearchFilterParameterType.F_DISPLAY); + columns.add(new PrismPropertyWrapperColumn(Model.of(def), DisplayType.F_LABEL, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public IModel getDataModel(IModel rowModel) { + return PrismPropertyWrapperModel.fromContainerValueWrapper(rowModel, ItemPath.create(SearchFilterParameterType.F_DISPLAY, DisplayType.F_LABEL)); + } + }); + return columns; + } + + private WebMarkupContainer createObjectListForSubreports(String panelId) { + return new BasicMultivalueContainerListPanel<>(panelId, SubreportParameterType.class) { + + @Override + protected MultivalueContainerDetailsPanel getMultivalueContainerDetailsPanel(ListItem> item) { + return createDetailsPanelForSubreport(ID_ITEM_DETAILS, item); + } + + @Override + protected String getContainerNameForNewButton() { + return getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.subreport").getString(); + } + + @Override + protected IModel> getContainerModel() { + return PrismContainerWrapperModel.fromContainerWrapper( + ReportMainPanel.this.getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_SUBREPORT)); + } + + @Override + protected List, String>> createDefaultColumns() { + return createColumnsForSubreports(); + } + }; + } + + private MultivalueContainerDetailsPanel createDetailsPanelForSubreport(String panelId, ListItem> item) { + return new MultivalueContainerDetailsPanel<>(panelId, item.getModel(), true) { + @Override + protected DisplayNamePanel createDisplayNamePanel(String displayNamePanelId) { + return new DisplayNamePanel<>(displayNamePanelId, new ItemRealValueModel<>(getModel())) { + @Override + protected IModel createHeaderModel() { + return () -> getModelObject().getName(); + } + + @Override + protected String createImageModel() { + return "fa fa-sliders"; + } + }; + } + }; + } + + private List, String>> createColumnsForSubreports() { + PrismContainerWrapperModel containerModel = PrismContainerWrapperModel.fromContainerWrapper( + getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_SUBREPORT)); + List, String>> columns = new ArrayList<>(); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, SubreportParameterType.F_NAME, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-sm-3 col-md-2"; + } + }); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, SubreportParameterType.F_TYPE, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-md-3"; + } + }); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, SubreportParameterType.F_EXPRESSION, AbstractItemWrapperColumn.ColumnType.EXISTENCE_OF_VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-sm-3 col-md-2"; + } + }); + + return columns; + } + + private WebMarkupContainer createObjectListForColumns(String panelId) { + return new BasicMultivalueContainerListPanel<>(panelId, GuiObjectColumnType.class) { + + @Override + protected MultivalueContainerDetailsPanel getMultivalueContainerDetailsPanel(ListItem> item) { + return createDetailsPanelForColumn(ID_ITEM_DETAILS, item); + } + + @Override + protected String getContainerNameForNewButton() { + return getPageBase().createStringResource("GuiObjectListViewType.column").getString(); + } + + @Override + protected IModel> getContainerModel() { + return PrismContainerWrapperModel.fromContainerWrapper( + ReportMainPanel.this.getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_VIEW, GuiObjectListViewType.F_COLUMN)); + } + + @Override + protected Component createHeader(String headerId) { + Label label = new Label(headerId, getPageBase().createStringResource("EngineReportTabPanel.columns")); + label.add(AttributeAppender.append("style", "padding-bottom:10px; font-size: 16px; font-weight: 600; color: #3c8dbc;")); + return label; + } + + @Override + protected List, String>> createDefaultColumns() { + return createColumnsForColumns(); + } + }; + } + + private MultivalueContainerDetailsPanel createDetailsPanelForColumn(String panelId, ListItem> item) { + return new MultivalueContainerDetailsPanel<>(panelId, item.getModel(), true) { + @Override + protected DisplayNamePanel createDisplayNamePanel(String displayNamePanelId) { + return new DisplayNamePanel<>(displayNamePanelId, new ItemRealValueModel<>(getModel())) { + @Override + protected IModel createHeaderModel() { + return () -> { + GuiObjectColumnType column = getModelObject(); + String name = column.getName(); + if (column.getDisplay() != null && column.getDisplay().getLabel() != null) { + name = WebComponentUtil.getTranslatedPolyString(column.getDisplay().getLabel()); + } + return name; + }; + } + + @Override + protected String createImageModel() { + return "fa fa-columns"; + } + }; + } + }; + } + + private List, String>> createColumnsForColumns() { + PrismContainerWrapperModel containerModel = PrismContainerWrapperModel.fromContainerWrapper( + getObjectModel(), ItemPath.create(ReportType.F_OBJECT_COLLECTION, ObjectCollectionReportEngineConfigurationType.F_VIEW, GuiObjectListViewType.F_COLUMN)); + List, String>> columns = new ArrayList<>(); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, GuiObjectColumnType.F_NAME, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-sm-3 col-md-2"; + } + }); + + columns.add(new PrismPropertyWrapperColumn( + containerModel, GuiObjectColumnType.F_PATH, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public String getCssClass() { + return "col-md-3"; + } + }); + + PrismContainerDefinition def = containerModel.getObject().getComplexTypeDefinition().findContainerDefinition(GuiObjectColumnType.F_DISPLAY); + columns.add(new PrismPropertyWrapperColumn(Model.of(def), DisplayType.F_LABEL, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) { + @Override + public IModel getDataModel(IModel rowModel) { + return PrismPropertyWrapperModel.fromContainerValueWrapper(rowModel, ItemPath.create(GuiObjectColumnType.F_DISPLAY, DisplayType.F_LABEL)); + } + }); + + return columns; + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportObjectsListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportObjectsListPanel.java new file mode 100644 index 00000000000..d37d84dd443 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportObjectsListPanel.java @@ -0,0 +1,313 @@ +package com.evolveum.midpoint.web.page.admin.reports.component; + +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.gui.impl.component.ContainerableListPanel; +import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView; +import com.evolveum.midpoint.model.common.util.DefaultColumnUtils; +import com.evolveum.midpoint.prism.Containerable; +import com.evolveum.midpoint.prism.Item; +import com.evolveum.midpoint.prism.Referencable; +import com.evolveum.midpoint.prism.path.ItemPath; +import com.evolveum.midpoint.prism.query.ObjectQuery; +import com.evolveum.midpoint.schema.GetOperationOptions; +import com.evolveum.midpoint.schema.SelectorOptions; +import com.evolveum.midpoint.schema.constants.ExpressionConstants; +import com.evolveum.midpoint.schema.expression.VariablesMap; +import com.evolveum.midpoint.schema.result.OperationResult; +import com.evolveum.midpoint.task.api.Task; +import com.evolveum.midpoint.util.exception.*; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.midpoint.web.component.data.ISelectableDataProvider; +import com.evolveum.midpoint.web.component.data.SelectableBeanContainerDataProvider; +import com.evolveum.midpoint.web.component.search.*; +import com.evolveum.midpoint.web.component.util.SelectableBean; +import com.evolveum.midpoint.web.component.util.VisibleBehaviour; +import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusPresentationProperties; +import com.evolveum.midpoint.web.session.ObjectListStorage; +import com.evolveum.midpoint.web.session.PageStorage; +import com.evolveum.midpoint.web.session.UserProfileStorage; + +import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; + +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.model.IModel; + +import javax.xml.namespace.QName; +import java.util.*; + +/** + * @author lskublik + */ + +public class ReportObjectsListPanel extends ContainerableListPanel> { + + private static final Trace LOGGER = TraceManager.getTrace(ReportObjectsListPanel.class); + + private IModel report; + private CompiledObjectCollectionView view; + private Map variables = new HashMap<>(); + private ObjectListStorage pageStorage; + + public ReportObjectsListPanel(String id, IModel report) { + super(id, null); + this.report = report; + } + + @Override + protected void onInitialize() { + initView(); + super.onInitialize(); + this.add(new VisibleBehaviour(() -> view != null)); + } + + @Override + protected Class getDefaultType() { + return view == null ? (Class) ObjectType.class : view.getTargetClass(getPrismContext()); + } + + private void initView() { + try { + Task task = getPageBase().createSimpleTask("create compiled view"); + view = getPageBase().getReportManager().createCompiledView(getReport().getObjectCollection(), true, task, task.getResult()); + } catch (Exception e) { + LOGGER.error("Couldn't create compiled view for report " + getReport(), e); + } + } + + private ReportType getReport() { + return report.getObject(); + } + + @Override + protected UserProfileStorage.TableId getTableId() { + return null; + } + + @Override + protected C getRowRealValue(SelectableBean rowModelObject) { + if (rowModelObject == null) { + return null; + } + return rowModelObject.getValue(); + } + + @Override + protected IColumn, String> createIconColumn() { + return null; + } + + @Override + protected IColumn, String> createCheckboxColumn() { + return null; + } + + @Override + protected CompiledObjectCollectionView getObjectCollectionView() { + return view; + } + + @Override + protected boolean isCollectionViewPanel() { + return view != null; + } + + @Override + protected ISelectableDataProvider> createProvider() { + SelectableBeanContainerDataProvider provider = new SelectableBeanContainerDataProvider<>(this, getSearchModel(), null, false) { + + @Override + public List> createDataObjectWrappers(Class type, ObjectQuery query, Collection> options, Task task, OperationResult result) + throws CommunicationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, ExpressionEvaluationException { + Collection> defaultOptions = DefaultColumnUtils.createOption(getObjectCollectionView().getTargetClass(getPrismContext()), getSchemaService()); + QName qNameType = WebComponentUtil.containerClassToQName(getPrismContext(), type); + VariablesMap variables = new VariablesMap(); + if (getSearchModel().getObject() != null) { + variables.putAll(getSearchModel().getObject().getFilterVariables(getVariables(), getPageBase())); + processReferenceVariables(variables); + } + List list = (List) getModelInteractionService().searchObjectsFromCollection(getReport().getObjectCollection().getCollection(), qNameType, defaultOptions, query.getPaging(), variables, task, result); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Query {} resulted in {} objects", type.getSimpleName(), list.size()); + } + + List> data = new ArrayList>(); + for (C object : list) { + data.add(createDataObjectWrapper(object)); + } + return data; + } + + @Override + protected Integer countObjects(Class type, ObjectQuery query, Collection> currentOptions, Task task, OperationResult result) + throws CommunicationException, ObjectNotFoundException, SchemaException, SecurityViolationException, ConfigurationException, ExpressionEvaluationException { + Collection> defaultOptions = DefaultColumnUtils.createOption(getObjectCollectionView().getTargetClass(getPrismContext()), getSchemaService()); + QName qNameType = WebComponentUtil.containerClassToQName(getPrismContext(), type); + VariablesMap variables = new VariablesMap(); + if (getSearchModel().getObject() != null) { + variables.putAll(getSearchModel().getObject().getFilterVariables(getVariables(), getPageBase())); + processReferenceVariables(variables); + } + return getModelInteractionService().countObjectsFromCollection(getReport().getObjectCollection().getCollection(), qNameType, defaultOptions, null, variables, task, result); + } + + @Override + public ObjectQuery getQuery() { + //fake query because of we need paging in method createDataObjectWrappers + return getPrismContext().queryFor(ObjectType.class).build(); + } + }; + if (provider.getSort() == null && hasView()) { + if (ObjectType.class.isAssignableFrom(getDefaultType())) { + provider.setSort("name", SortOrder.ASCENDING); + } else if (AuditEventRecordType.class.isAssignableFrom(getDefaultType())) { + provider.setSort("timestamp", SortOrder.ASCENDING); + } + } + return provider; + } + + private void processVariables(VariablesMap variablesMap) { + for (Map.Entry entry : variables.entrySet()) { + if (!variablesMap.containsKey(entry.getKey())) { + if (entry.getValue() == null) { + variablesMap.put(entry.getKey(), null, String.class); + } else if (entry.getValue() instanceof Item) { + variablesMap.put(entry.getKey(), (Item)entry.getValue(), ((Item)entry.getValue()).getDefinition()); + } else { + variablesMap.put(entry.getKey(), entry.getValue(), entry.getValue().getClass()); + } + } + } + processReferenceVariables(variablesMap); + } + + @Override + protected SearchFormPanel initSearch(String headerId) { + return new SearchFormPanel<>(headerId, getSearchModel()) { + @Override + protected void searchPerformed(AjaxRequestTarget target) { + refreshTable(target); + } + }; + } + + @Override + protected Search createSearch(Class type) { + return SearchFactory.createSearchForReport(type, + getReport().getObjectCollection() == null ? Collections.emptyList() : getReport().getObjectCollection().getParameter(), + getPageBase()); + } + + @Override + protected IColumn, String> createNameColumn(IModel displayModel, GuiObjectColumnType customColumn, String itemPath, ExpressionType expression) { + return createCustomExportableColumn(displayModel, customColumn, itemPath == null ? null : ItemPath.create(itemPath), expression); + } + + @Override + protected List, String>> createDefaultColumns() { + return null; + } + + @Override + protected void customProcessNewRowItem(org.apache.wicket.markup.repeater.Item item, IModel> model) { + if (model == null || model.getObject() == null || model.getObject().getValue() == null) { + return; + } + VariablesMap variables = getSearchModel().getObject().getFilterVariables(null, getPageBase()); + variables.put(ExpressionConstants.VAR_OBJECT, model.getObject().getValue(), model.getObject().getValue().getClass()); + if (report.getObject() != null && report.getObject().getObjectCollection() != null + && report.getObject().getObjectCollection().getSubreport() != null + && !report.getObject().getObjectCollection().getSubreport().isEmpty()) { + Task task = getPageBase().createSimpleTask("evaluate subreports"); + processReferenceVariables(variables); + VariablesMap subreportsVariables = getPageBase().getReportManager().evaluateSubreportParameters(report.getObject().asPrismObject(), variables, task, task.getResult()); + variables.putAll(subreportsVariables); + } + this.variables.clear(); + for (String key : variables.keySet()) { + this.variables.put(key, variables.get(key).getValue()); + } + } + + private void processReferenceVariables(VariablesMap variablesMap) { + if (variablesMap.isEmpty()) { + return; + } + List keysForRemoving = new ArrayList<>(); + variablesMap.keySet().forEach(key -> { + Object value = variablesMap.get(key).getValue(); + if (value instanceof Referencable && ((Referencable) value).getOid() == null) { + keysForRemoving.add(key); + } + }); + keysForRemoving.forEach((key -> { + variablesMap.remove(key); + variablesMap.put(key, null, ObjectReferenceType.class); + })); + } + + @Override + protected Collection evaluateExpression(C rowValue, com.evolveum.midpoint.prism.Item columnItem, ExpressionType expression, GuiObjectColumnType customColumn) { + Task task = getPageBase().createSimpleTask(OPERATION_EVALUATE_EXPRESSION); + OperationResult result = task.getResult(); + try { + VariablesMap variablesMap = new VariablesMap(); + if (columnItem == null) { + variablesMap.put(ExpressionConstants.VAR_INPUT, null, String.class); + } else { + variablesMap.put(ExpressionConstants.VAR_INPUT, columnItem, columnItem.getDefinition()); + } + processVariables(variablesMap); + if (!variablesMap.containsKey(ExpressionConstants.VAR_OBJECT)) { + variablesMap.put(ExpressionConstants.VAR_OBJECT, rowValue, rowValue.asPrismContainerValue().getDefinition()); + + } + Object object = getPageBase().getReportManager().evaluateScript(getReport().asPrismObject(), expression, variablesMap, "evaluate column expression", task, result); + if (object instanceof Collection) { + return (Collection)object; + } + return Collections.singletonList(object); + } catch (Exception e) { + LOGGER.error("Couldn't execute expression for {} column. Reason: {}", customColumn, e.getMessage(), e); + result.recomputeStatus(); + OperationResultStatusPresentationProperties props = OperationResultStatusPresentationProperties.parseOperationalResultStatus(result.getStatus()); + return Collections.singletonList(getPageBase().createStringResource(props.getStatusLabelKey()).getString()); //TODO: this is not entirely correct + } + } + + public VariablesMap getReportVariables() { + VariablesMap variablesMap = getSearchModel().getObject().getFilterVariables(null, getPageBase()); + processReferenceVariables(variablesMap); + return variablesMap; + } + + @Override + public PageStorage getPageStorage() { + if (pageStorage == null) { + pageStorage = new ObjectListStorage(); + } + return pageStorage; + } + + public boolean hasView(){ + return view != null; + } + + public void checkView() { + if (!hasView()) { + getSession().warn(PageBase.createStringResourceStatic(null, "ReportObjectsListPanel.message.defineType").getString()); + } + } + + @Override + public void resetTable(AjaxRequestTarget target) { + initView(); + super.resetTable(target); + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html index e47d98122b3..d72b82b4b85 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html @@ -10,56 +10,22 @@
-
-
-
+
+
+

- +

-
-
- -
-
- - - - - - - - -
-
- - - - - -
- - -
-
-
-
- - - - -
-
-
-
-
-
-

- + + + + + +

+

+ +

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java index fd38330a776..17cae4d1b51 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java @@ -6,139 +6,103 @@ */ package com.evolveum.midpoint.web.page.admin.reports.component; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; +import java.util.*; -import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; +import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext; +import com.evolveum.midpoint.gui.api.prism.ItemStatus; +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper; +import com.evolveum.midpoint.gui.impl.component.ContainerableListPanel; +import com.evolveum.midpoint.gui.impl.prism.panel.ItemPanelSettingsBuilder; import com.evolveum.midpoint.prism.*; +import com.evolveum.midpoint.schema.expression.VariablesMap; +import com.evolveum.midpoint.web.component.AjaxButton; import com.evolveum.midpoint.web.component.form.MidpointForm; +import com.evolveum.midpoint.web.component.util.VisibleBehaviour; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.wicket.Component; -import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.feedback.ComponentFeedbackMessageFilter; import org.apache.wicket.feedback.FeedbackMessage; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; -import com.evolveum.midpoint.audit.api.AuditEventStage; -import com.evolveum.midpoint.audit.api.AuditEventType; import com.evolveum.midpoint.gui.api.component.BasePanel; -import com.evolveum.midpoint.gui.api.component.autocomplete.AutoCompleteTextPanel; -import com.evolveum.midpoint.gui.api.model.LoadableModel; -import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.prism.path.ItemPath; -import com.evolveum.midpoint.prism.polystring.PolyString; -import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.report.api.ReportConstants; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.schema.constants.SchemaConstants; -import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.security.api.MidPointPrincipal; import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.component.AjaxSubmitButton; import com.evolveum.midpoint.web.component.dialog.Popupable; -import com.evolveum.midpoint.web.component.input.DatePanel; -import com.evolveum.midpoint.web.component.input.TextPanel; import com.evolveum.midpoint.web.component.message.FeedbackAlerts; -import com.evolveum.midpoint.web.component.prism.InputPanel; -import com.evolveum.midpoint.web.component.util.VisibleBehaviour; -import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; -import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour; -import com.evolveum.midpoint.web.page.admin.reports.dto.JasperReportParameterDto; -import com.evolveum.midpoint.web.page.admin.reports.dto.JasperReportParameterPropertiesDto; -import com.evolveum.midpoint.web.page.admin.reports.dto.JasperReportValueDto; -import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDto; import com.evolveum.midpoint.web.security.util.SecurityUtils; -import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventStageType; -import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventTypeType; -import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; -public class RunReportPopupPanel extends BasePanel implements Popupable { +import org.jetbrains.annotations.NotNull; + +public class RunReportPopupPanel extends BasePanel implements Popupable { private static final long serialVersionUID = 1L; private static final Trace LOGGER = TraceManager.getTrace(RunReportPopupPanel.class); - private static final String DOT_CLASS = RunReportPopupPanel.class.getName() + "."; - private static final String OPERATION_LOAD_RESOURCES = DOT_CLASS + "createResourceList"; - private static final String ID_MAIN_FORM = "mainForm"; - private static final String ID_RUN = "runReport"; + private static final String ID_TITLE = "title"; + private static final String ID_RUN_BUTTON = "runReport"; + private static final String ID_CANCEL_BUTTON = "cancel"; private static final String ID_POPUP_FEEDBACK = "popupFeedback"; - private static final Integer AUTO_COMPLETE_BOX_SIZE = 10; - - private static final String ID_VALUE_LIST = "valueList"; - private static final String ID_ADD_BUTTON = "add"; - private static final String ID_REMOVE_BUTTON = "remove"; + private static final String ID_PARAMETERS = "parameters"; + private static final String ID_PARAMETER = "parameter"; + private static final String ID_TABLE = "table"; - private static final String ID_PARAMETERS = "paramTable"; - - private IModel reportModel; + private final boolean isRunnable; public RunReportPopupPanel(String id, final ReportType reportType) { - super(id); - - reportModel = new LoadableModel(false) { - - private static final long serialVersionUID = 1L; + this(id, reportType, true); + } - @Override - protected ReportDto load() { - return new ReportDto(reportType, true); - } - }; + public RunReportPopupPanel(String id, final ReportType reportType, boolean isRunnable) { + super(id, Model.of(reportType)); + this.isRunnable = isRunnable; + } + @Override + protected void onInitialize() { + super.onInitialize(); initLayout(); } protected void initLayout() { - Form mainForm = new MidpointForm<>(ID_MAIN_FORM); add(mainForm); + mainForm.add(new Label(ID_TITLE, getTitle())); - ListView paramListView = new ListView(ID_PARAMETERS, new PropertyModel<>(reportModel, "jasperReportDto.parameters")) { - - private static final long serialVersionUID = 1L; - + FeedbackAlerts feedback = new FeedbackAlerts(ID_POPUP_FEEDBACK); + ReportObjectsListPanel table = new ReportObjectsListPanel(ID_TABLE, getModel()){ @Override - protected void populateItem(ListItem paramItem) { - paramItem.add(createParameterPanel(paramItem.getModel())); - + protected Component getFeedbackPanel() { + return feedback; } }; - paramListView.setOutputMarkupId(true); - mainForm.add(paramListView); - - FeedbackAlerts feedback = new FeedbackAlerts(ID_POPUP_FEEDBACK); - feedback.setFilter(new ComponentFeedbackMessageFilter(paramListView){ + table.setOutputMarkupId(true); + mainForm.add(table); + feedback.setFilter(new ComponentFeedbackMessageFilter(table) { private static final long serialVersionUID = 1L; @@ -150,316 +114,39 @@ public boolean accept(FeedbackMessage message) { feedback.setOutputMarkupId(true); mainForm.add(feedback); - AjaxSubmitButton addButton = new AjaxSubmitButton(ID_RUN, + AjaxSubmitButton runButton = new AjaxSubmitButton(ID_RUN_BUTTON, createStringResource("runReportPopupContent.button.run")) { private static final long serialVersionUID = 1L; @Override - protected void onError(AjaxRequestTarget target) { - FeedbackAlerts feedback = (FeedbackAlerts) getForm().get(ID_POPUP_FEEDBACK); - target.add(feedback); - } - - @Override - protected void onSubmit(AjaxRequestTarget target) { - runConfirmPerformed(target, reportModel); + protected void onError(AjaxRequestTarget target) { + FeedbackAlerts feedback = (FeedbackAlerts) getForm().get(ID_POPUP_FEEDBACK); + target.add(feedback); } - }; - mainForm.add(addButton); - - } - - private WebMarkupContainer createParameterPanel(final IModel parameterModel) { - WebMarkupContainer paramPanel = new WebMarkupContainer("paramPanel"); - paramPanel.setOutputMarkupId(true); - String paramValue = new PropertyModel(parameterModel, "name").getObject(); - StringResourceModel paramDisplay = PageBase.createStringResourceStatic(RunReportPopupPanel.this, "runReportPopupContent.param.name." + paramValue); - - paramPanel.add(new Label("name", paramDisplay)); // use display name rather than property name - - WebMarkupContainer required = new WebMarkupContainer("required"); - JasperReportParameterPropertiesDto properties = parameterModel.getObject().getProperties(); - boolean mandatory = (properties != null && properties.getMandatory()); - required.add(new VisibleBehaviour(() -> mandatory)); - paramPanel.add(required); - - String paramClass = new PropertyModel(parameterModel, "nestedTypeAsString").getObject(); - if (StringUtils.isBlank(paramClass)) { - paramClass = new PropertyModel(parameterModel, "typeAsString").getObject(); - } - paramClass = paramClass == null ? "" : paramClass.substring(paramClass.lastIndexOf(".") + 1); - paramPanel.add(new Label("type", paramClass)); - - ListView listView = new ListView(ID_VALUE_LIST, new PropertyModel<>(parameterModel, "value")) { - - private static final long serialVersionUID = 1L; @Override - protected void populateItem(ListItem item) { - item.add(createInputMarkup(item.getModel(), parameterModel.getObject(), mandatory, paramDisplay)); - - } - - }; - listView.setOutputMarkupId(true); - - paramPanel.add(listView); - return paramPanel; - } - - private WebMarkupContainer createInputMarkup(final IModel valueModel, JasperReportParameterDto param, boolean required, IModel name) { - param.setEditing(true); - WebMarkupContainer paramValueMarkup = new WebMarkupContainer("valueMarkup"); - paramValueMarkup.setOutputMarkupId(true); - - InputPanel input = createTypedInputPanel("inputValue", valueModel, "value", param); - input.getBaseFormComponent().setRequired(required); - input.getBaseFormComponent().setLabel(name); - paramValueMarkup.add(input); - - //buttons - AjaxLink addButton = new AjaxLink(ID_ADD_BUTTON) { - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) { - addValue(paramValueMarkup, param, target); + protected void onSubmit(AjaxRequestTarget target) { + runConfirmPerformed(target); } }; - addButton.add(new VisibleEnableBehaviour() { - private static final long serialVersionUID = 1L; + runButton.setOutputMarkupId(true); + runButton.add(new VisibleBehaviour(() -> isRunnable)); + mainForm.add(runButton); - @Override - public boolean isVisible() { - return isAddButtonVisible(param); - } - }); - paramValueMarkup.add(addButton); + AjaxButton cancelButton = new AjaxButton(ID_CANCEL_BUTTON, + createStringResource("userBrowserDialog.button.cancelButton")) { - AjaxLink removeButton = new AjaxLink(ID_REMOVE_BUTTON) { private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target) { - removeValue(paramValueMarkup, param, valueModel.getObject(), target); + getPageBase().hideMainPopup(target); } }; - removeButton.add(new VisibleEnableBehaviour() { - private static final long serialVersionUID = 1L; - - @Override - public boolean isVisible() { - return isRemoveButtonVisible(); - } - }); - paramValueMarkup.add(removeButton); - return paramValueMarkup; - } - - private InputPanel createTypedInputPanel(String componentId, IModel model, String expression, JasperReportParameterDto param) { - InputPanel panel; - Class type; - try { - if (param.isMultiValue()) { - type = param.getNestedType(); - } else { - type = param.getType(); - } - } catch (ClassNotFoundException e) { - getSession().error("Could not find parameter type definition. Check the configuration."); - throw new RestartResponseException(getPageBase()); - } - - if (type.isEnum()) { - panel = WebComponentUtil.createEnumPanel(type, componentId, new PropertyModel<>(model, expression), this); - } else if (XMLGregorianCalendar.class.isAssignableFrom(type)) { - panel = new DatePanel(componentId, new PropertyModel<>(model, expression)); - } else if (param.getProperties() != null && param.getProperties().getTargetType() != null) { // render autocomplete box - LookupTableType lookup = new LookupTableType(); - //TODO: displayName - panel = new AutoCompleteTextPanel(componentId, new PropertyModel<>(model, expression), String.class, true, lookup) { - - private static final long serialVersionUID = 1L; - - @Override - public Iterator getIterator(String input) { - return prepareAutoCompleteList(input, lookup, param).iterator(); - } - }; - } else { - panel = new TextPanel<>(componentId, new PropertyModel<>(model, expression), type); - } - List components = panel.getFormComponents(); - for (FormComponent component : components) { - component.add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); - } - - panel.setOutputMarkupId(true); - return panel; - } - - private void addValue(WebMarkupContainer paramValueMarkup, JasperReportParameterDto valueModel, AjaxRequestTarget target) { - valueModel.addValue(); - //reload just current parameter container panel - target.add(paramValueMarkup.findParent(ListView.class).findParent(WebMarkupContainer.class)); + cancelButton.setOutputMarkupId(true); + mainForm.add(cancelButton); } - private ListView getParametersView(){ - return (ListView) get(createComponentPath(ID_MAIN_FORM, ID_PARAMETERS)); - } - - private boolean isAddButtonVisible(JasperReportParameterDto valueDecs) { - try { - return valueDecs.isMultiValue(); - } catch (ClassNotFoundException e) { - return false; - } - } - - private void removeValue(WebMarkupContainer paramValueMarkup, JasperReportParameterDto valueModel, - JasperReportValueDto object, AjaxRequestTarget target) { - valueModel.removeValue(object); - //reload just current parameter container panel - target.add(paramValueMarkup.findParent(ListView.class).findParent(WebMarkupContainer.class)); - } - - private boolean isRemoveButtonVisible() { - return true; - } - - private List createLookupTableRows(JasperReportParameterDto param, String input) { - ItemPath label = null; - ItemPath key = null; - List rows = new ArrayList<>(); - - JasperReportParameterPropertiesDto properties = param.getProperties(); - - if (properties == null) { - return null; - } - - String pLabel = properties.getLabel(); - if (pLabel != null) { - label = ItemPath.create(pLabel); - } - String pKey = properties.getKey(); - if (pKey != null) { - key = ItemPath.create(pKey); - } - - String pTargetType = properties.getTargetType(); - Class targetType = null; - if (pTargetType != null) { - try { - targetType = (Class) Class.forName(pTargetType); - } catch (ClassNotFoundException e) { - error("Error while creating lookup table for input parameter: " + param.getName() + ", " + e.getClass().getSimpleName() + " (" + e.getMessage() + ")"); - - } - } - - if (label != null && targetType != null && input != null) { - OperationResult result = new OperationResult(OPERATION_LOAD_RESOURCES); - Task task = createSimpleTask(OPERATION_LOAD_RESOURCES); - - Collection> objects; - ObjectQuery query = getPrismContext().queryFor(targetType) - .item(new QName(SchemaConstants.NS_C, pLabel)).startsWith(input) - .matching(new QName(SchemaConstants.NS_MATCHING_RULE, "origIgnoreCase")) - .maxSize(AUTO_COMPLETE_BOX_SIZE) - .build(); - try { - objects = getPageBase().getModelService().searchObjects(targetType, query, SelectorOptions.createCollection(GetOperationOptions.createNoFetch()), task, result); - - for (PrismObject o : objects) { - Object realKeyValue = null; - PrismProperty labelItem = o.findProperty(label); - - //TODO: e.g. support not only for property, but also ref, container.. - if (labelItem == null || labelItem.isEmpty()) { - continue; - } - PrismProperty keyItem = o.findProperty(key); - if ("oid".equals(pKey)) { - realKeyValue = o.getOid(); - } - if (realKeyValue == null && (keyItem == null || keyItem.isEmpty())) { - continue; - } - - //TODO: support for single/multivalue value - if (!labelItem.isSingleValue()) { - continue; - } - - Object realLabelValue = labelItem.getRealValue(); - realKeyValue = (realKeyValue == null) ? keyItem.getRealValue() : realKeyValue; - - // TODO: take definition into account -// QName typeName = labelItem.getDefinition().getTypeName(); - - LookupTableRowType row = new LookupTableRowType(); - - if (realKeyValue != null) { - row.setKey(convertObjectToPolyStringType(realKeyValue).getOrig()); - } else { - throw new SchemaException("Cannot create lookup table with null key for label: " + realLabelValue); - } - - row.setLabel(convertObjectToPolyStringType(realLabelValue)); - - rows.add(row); - } - - return rows; - } catch (SchemaException | ObjectNotFoundException | SecurityViolationException | CommunicationException | ConfigurationException | ExpressionEvaluationException e) { - error("Error while creating lookup table for input parameter: " + param.getName() + ", " + e.getClass().getSimpleName() + " (" + e.getMessage() + ")"); - } - - } - return rows; - } - - private PolyStringType convertObjectToPolyStringType(Object o) { - if (o instanceof PolyString) { - return new PolyStringType((PolyString) o); - } else if (o instanceof PolyStringType) { - return (PolyStringType) o; - } else if (o instanceof String) { - return new PolyStringType((String) o); - } else { - return new PolyStringType(o.toString()); - } - } - - private List prepareAutoCompleteList(String input, LookupTableType lookupTable, JasperReportParameterDto param) { - List values = new ArrayList<>(); - - if (lookupTable == null) { - return values; - } - - List rows = createLookupTableRows(param, input); - - if (rows == null) { - return values; - } - if (lookupTable.getRow() != null) { - lookupTable.getRow().addAll(rows); - } - - for (LookupTableRowType row : rows) { - values.add(WebComponentUtil.getOrigStringFromPoly(row.getLabel())); - - if (values.size() > AUTO_COMPLETE_BOX_SIZE) { - break; - } - } - - return values; - } - - public Task createSimpleTask(String operation, PrismObject owner) { Task task = getPageBase().getTaskManager().createTaskInstance(operation); @@ -483,71 +170,78 @@ public Task createSimpleTask(String operation) { return createSimpleTask(operation, user != null ? user.getFocus().asPrismObject() : null); } - private void runConfirmPerformed(AjaxRequestTarget target, IModel model) { - ReportDto reportDto = model.getObject(); - - PrismContainerDefinition paramContainerDef = getPrismContext().getSchemaRegistry().findContainerDefinitionByElementName(ReportConstants.REPORT_PARAMS_PROPERTY_NAME); - PrismContainer paramContainer; + private void runConfirmPerformed(AjaxRequestTarget target) { + PrismContainerValue reportParamValue; + @NotNull PrismContainer parameterContainer; try { - paramContainer = paramContainerDef.instantiate(); + PrismContainerDefinition paramContainerDef = getPrismContext().getSchemaRegistry() + .findContainerDefinitionByElementName(ReportConstants.REPORT_PARAMS_PROPERTY_NAME); + parameterContainer = paramContainerDef.instantiate(); + ReportParameterType reportParam = new ReportParameterType(); - PrismContainerValue reportParamValue = reportParam.asPrismContainerValue(); + reportParamValue = reportParam.asPrismContainerValue(); reportParamValue.revive(getPrismContext()); - paramContainer.add(reportParamValue); - - List params = getParametersView().getModelObject(); - for (JasperReportParameterDto paramDto : params) { - if (paramDto.getValue() == null) { + parameterContainer.add(reportParamValue); + } catch (SchemaException e) { + LOGGER.error("Couldn't create container for report parameters"); + return; + } + VariablesMap variablesMap = getTable().getReportVariables(); + for (SearchFilterParameterType parameter : getModelObject().getObjectCollection().getParameter()) { + if (variablesMap.get(parameter.getName()) != null && variablesMap.getValue(parameter.getName()) != null) { + Class clazz = getPrismContext().getSchemaRegistry().determineClassForType(parameter.getType()); + QName type = getPrismContext().getSchemaRegistry().determineTypeForClass(clazz); + if (Containerable.class.isAssignableFrom(clazz)) { + LOGGER.error("Couldn't create container item for parameter " + parameter); continue; } - List values = paramDto.getValue(); - Class paramClass = paramDto.getType(); - - boolean multivalue = false; - if (List.class.isAssignableFrom(paramClass)) { - paramClass = paramDto.getNestedType(); - if (paramClass == null) { - getSession().error("Nested type for list must be defined!"); - target.add(getPageBase().getFeedbackPanel()); - return; + MutableItemDefinition def; + if (Referencable.class.isAssignableFrom(clazz)) { + def = getPrismContext().definitionFactory().createReferenceDefinition( + new QName(ReportConstants.NS_EXTENSION, parameter.getName()), type); + ((MutablePrismReferenceDefinition) def).setTargetTypeName(parameter.getTargetType()); + } else { + List values = WebComponentUtil.getAllowedValues(parameter, getPageBase()); + if (CollectionUtils.isNotEmpty(values)) { + def = getPrismContext().definitionFactory().createPropertyDefinition( + new QName(ReportConstants.NS_EXTENSION, parameter.getName()), type, values, null); + } else { + def = getPrismContext().definitionFactory().createPropertyDefinition( + new QName(ReportConstants.NS_EXTENSION, parameter.getName()), type); } } - - QName typeName = getPrismContext().getSchemaRegistry().determineTypeForClass(paramClass); - MutablePrismPropertyDefinition def = getPrismContext().definitionFactory().createPropertyDefinition( - new QName(ReportConstants.NS_EXTENSION, paramDto.getName()), typeName); def.setDynamic(true); def.setRuntimeSchema(true); - def.toMutable().setMaxOccurs(multivalue ? -1 : 1); // TODO multivalue is always 'false' here ... + def.setMaxOccurs(1); + def.setMinOccurs(0); + if (parameter.getDisplay() != null) { + String displayName = WebComponentUtil.getTranslatedPolyString(parameter.getDisplay().getLabel()); + def.setDisplayName(displayName); + String help = WebComponentUtil.getTranslatedPolyString(parameter.getDisplay().getHelp()); + def.setHelp(help); + } + if (parameter.getAllowedValuesLookupTable() != null) { + def.setValueEnumerationRef(parameter.getAllowedValuesLookupTable().asReferenceValue()); + } - PrismProperty prop = def.instantiate(); - for (JasperReportValueDto paramValue : values) { - Object realValue = paramValue.getValue(); - if (realValue == null) { - continue; - } - if (AuditEventType.class.isAssignableFrom(paramClass)) { - paramClass = AuditEventTypeType.class; - realValue = AuditEventType.toSchemaValue((AuditEventType) realValue); - } else if (AuditEventStage.class.isAssignableFrom(paramClass)) { - paramClass = AuditEventStageType.class; - realValue = AuditEventStage.toSchemaValue((AuditEventStage) realValue); + try { + Item item = def.instantiate(); + if (item instanceof PrismReference) { + ObjectReferenceType ref = (ObjectReferenceType) variablesMap.getValue(parameter.getName()); + item.add(ref.asReferenceValue()); + } else { + PrismPropertyValue value = getPrismContext().itemFactory().createPropertyValue(); + value.setValue(variablesMap.getValue(parameter.getName())); + item.add(value); } + reportParamValue.add(item); - prop.addRealValue(realValue); - } - if (!prop.isEmpty()) { - reportParamValue.add(prop); + } catch (SchemaException e) { + LOGGER.error("Couldn't create item for parameter " + parameter); } } - } catch (SchemaException | ClassNotFoundException e) { - OperationResult result = new OperationResult("Parameters serialization"); - result.recordFatalError(getString("RunReportPopupPanel.message.runConfirmPerformed.fatalError")); - getPageBase().showResult(result); - return; } - - runConfirmPerformed(target, reportDto.getObject().asObjectable(), paramContainer); + runConfirmPerformed(target, getModelObject(), parameterContainer); } protected void runConfirmPerformed(AjaxRequestTarget target, ReportType reportType2, @@ -556,22 +250,22 @@ protected void runConfirmPerformed(AjaxRequestTarget target, ReportType reportTy @Override public int getWidth() { - return 1150; + return 80; } @Override public int getHeight() { - return 560; + return 80; } @Override - public String getWidthUnit(){ - return "px"; + public String getWidthUnit() { + return "%"; } @Override - public String getHeightUnit(){ - return "px"; + public String getHeightUnit() { + return "%"; } @Override @@ -584,20 +278,7 @@ public Component getComponent() { return this; } -// static class LookupReportPropertyModel extends LookupPropertyModel { -// -// private static final long serialVersionUID = 1L; -// -// -// public LookupReportPropertyModel(IModel modelObject, String expression, LookupTableType lookupTable, boolean isStrict) { -// super(modelObject, expression, lookupTable, isStrict); -// } -// -// @Override -// public boolean isSupportsDisplayName() { -// return true; -// } -// -// } - + private ReportObjectsListPanel getTable() { + return (ReportObjectsListPanel) get(getPageBase().createComponentPath(ID_MAIN_FORM, ID_TABLE)); + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java index 56360711d1a..8626a6f7b2d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java @@ -7,11 +7,12 @@ package com.evolveum.midpoint.web.page.admin.reports.dto; import java.util.*; +import java.util.function.Predicate; import javax.xml.namespace.QName; -import com.evolveum.midpoint.audit.api.AuditResultHandler; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; +import com.evolveum.midpoint.prism.PrismContainer; import com.evolveum.midpoint.xml.ns._public.common.common_3.CollectionRefSpecificationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; @@ -216,19 +217,8 @@ private List listRecords(long first, long count, Task task if (collection != null && (collection.getFilter() != null || collectionRef.getFilter() != null)) { try { ObjectPaging paging = getPrismContext().queryFactory().createPaging(WebComponentUtil.safeLongToInteger(first), WebComponentUtil.safeLongToInteger(count)); - AuditResultHandler handler = new AuditResultHandler() { - @Override - public boolean handle(AuditEventRecordType auditRecord) { - auditRecordList.add(auditRecord); - return true; - } - - @Override - public int getProgress() { - return 0; - } - }; - getPageBase().getDashboardService().searchObjectFromCollection(collectionRef, handler, paging, task, task.getResult(), false); + auditRecordList.addAll((Collection) getPageBase().getModelInteractionService().searchObjectsFromCollection(collectionRef, AuditEventRecordType.COMPLEX_TYPE, + null, paging, null, task, task.getResult())); } catch (Exception e) { result.recordFatalError( getPageBase().createStringResource("AuditEventRecordProvider.message.listRecords.fatalError", e.getMessage()).getString(), e); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java deleted file mode 100644 index cad2009f603..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; - -import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.JRField; -import net.sf.jasperreports.engine.JRParameter; -import net.sf.jasperreports.engine.design.JRDesignField; -import net.sf.jasperreports.engine.design.JRDesignParameter; -import net.sf.jasperreports.engine.design.JRDesignQuery; -import net.sf.jasperreports.engine.design.JasperDesign; -import net.sf.jasperreports.engine.xml.JRXmlWriter; -import org.apache.commons.codec.binary.Base64; - -import com.evolveum.midpoint.schema.util.ReportTypeUtil; -import com.evolveum.midpoint.util.exception.SchemaException; - -public class JasperReportDto implements Serializable { - - private static final long serialVersionUID = 1L; - - private final byte[] jasperReportXml; - - private String query; - private List parameters; - private List fields; - private JasperDesign design; - - public JasperReportDto(byte[] jasperReportXml, boolean onlyForPromptingParams) { - this.jasperReportXml = jasperReportXml; - initFields(onlyForPromptingParams); - } - - public JasperReportDto(byte[] jasperReportXml) { - this(jasperReportXml, false); - } - - private void initFields(boolean onlyForPromptingParams) { - if (jasperReportXml == null) { - return; - } - - try { - design = ReportTypeUtil.loadJasperDesign(jasperReportXml); - query = design.getQuery().getText(); - - fields = new ArrayList<>(); - for (JRField field : design.getFieldsList()) { - fields.add(new JasperReportFieldDto(field.getName(), field.getValueClass(), field.getValueClassName())); - } - - for (JasperReportFieldDto field : fields) { - design.removeField(field.getName()); - } - - parameters = new ArrayList<>(); - for (JRParameter parameter : design.getParametersList()) { - if (parameter.isSystemDefined()) { - continue; - } - if (onlyForPromptingParams && !parameter.isForPrompting()) { - continue; - - } - JasperReportParameterDto p = new JasperReportParameterDto(parameter); - parameters.add(p); - } - - for (JasperReportParameterDto param : parameters) { - design.removeParameter(param.getName()); - } - - String detail = new String(Base64.isBase64(jasperReportXml) ? Base64.decodeBase64(jasperReportXml) : jasperReportXml); - // TODO and what to do with the detail? - } catch (SchemaException e) { - // TODO Auto-generated catch block - throw new IllegalArgumentException(e); - } - } - - public List getParameters() { - if (parameters == null) { - parameters = new ArrayList<>(); - } - return parameters; - } - - public List getFields() { - if (fields == null) { - fields = new ArrayList<>(); - } - return fields; - } - - public String getQuery() { - return query; - } - - public byte[] getTemplate() { - try { -// design.remadgetFields(). - design.getFieldsList().clear(); - design.getParametersList().clear(); - design.getFieldsMap().clear(); - design.getParametersMap().clear(); - for (JasperReportFieldDto field : fields) { - if (field.isEmpty()) { - continue; - } - JRDesignField f = new JRDesignField(); - f.setValueClassName(field.getTypeAsString()); - f.setValueClass(Class.forName(field.getTypeAsString())); - f.setName(field.getName()); - design.addField(f); - } - - for (JasperReportParameterDto param : parameters) { - if (param.isEmpty()) { - continue; - } - JRDesignParameter p = new JRDesignParameter(); - p.setValueClassName(param.getTypeAsString()); - p.setValueClass(Class.forName(param.getTypeAsString())); - p.setName(param.getName()); - p.setForPrompting(param.isForPrompting()); - p.setDescription(param.getDescription()); - p.setNestedTypeName(param.getNestedTypeAsString()); - p.setNestedType(param.getNestedType()); - p.getPropertiesMap().setBaseProperties(param.getJRProperties()); - // p.getPropertiesMap().setProperty(propName, value); - design.addParameter(p); - } - - JasperDesign oldDesign = ReportTypeUtil.loadJasperDesign(jasperReportXml); - oldDesign.getParametersList().clear(); - oldDesign.getParametersList().addAll(design.getParametersList()); - - oldDesign.getFieldsList().clear(); - oldDesign.getFieldsList().addAll(design.getFieldsList()); - - JRDesignQuery q = new JRDesignQuery(); - q.setLanguage("mql"); - q.setText(query); - oldDesign.setQuery(q); - - String reportAsString = JRXmlWriter.writeReport(oldDesign, StandardCharsets.UTF_8.name()); - return reportAsString.getBytes(StandardCharsets.UTF_8); - - } catch (JRException | ClassNotFoundException | SchemaException ex) { - throw new IllegalStateException(ex.getMessage(), ex.getCause()); - } - - } - -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportFieldDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportFieldDto.java deleted file mode 100644 index a41ab1f97cc..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportFieldDto.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; - -import org.apache.commons.lang3.StringUtils; - -import com.evolveum.midpoint.web.component.util.Editable; -import com.evolveum.midpoint.web.component.util.Selectable; -import com.evolveum.midpoint.web.component.util.Validatable; - -public class JasperReportFieldDto extends Selectable - implements Serializable, Editable, Validatable { - - private String name; - private Class type; - private String typeAsString; - - private boolean editing; - - public JasperReportFieldDto() { - // TODO Auto-generated constructor stub - } - - public JasperReportFieldDto(String name, Class type, String typeAsString) { - this.name = name; - this.type = type; - this.typeAsString = typeAsString; - } - - public String getName() { - return name; - } - - public Class getType() { - return type; - } - - public String getTypeAsString() { - return typeAsString; - } - - @Override - public boolean isEditing() { - return editing; - } - - @Override - public void setEditing(boolean editing) { - this.editing = editing; - } - - @Override - public boolean isEmpty() { - if (StringUtils.isBlank(name) && StringUtils.isBlank(typeAsString)) { - return true; - } - return false; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java deleted file mode 100644 index da9a475c6f0..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.evolveum.midpoint.web.component.util.Editable; -import com.evolveum.midpoint.web.component.util.Selectable; -import com.evolveum.midpoint.web.component.util.Validatable; - -import net.sf.jasperreports.engine.JRParameter; -import net.sf.jasperreports.engine.JRPropertiesMap; - -public class JasperReportParameterDto extends Selectable implements Serializable, Editable, Validatable { - - private static final long serialVersionUID = 1L; - private String name; - private Class type; - private String typeAsString; - private String description; - private Class nestedType; - private String nestedTypeAsString; - private boolean forPrompting = false; - private List value; - private JasperReportParameterPropertiesDto properties; - - private boolean editing; - - public JasperReportParameterDto() { - } - - - public JasperReportParameterDto(JRParameter param) { - this.name = param.getName(); - this.typeAsString = param.getValueClassName(); - this.type = (Class) param.getValueClass(); - this.forPrompting = param.isForPrompting(); - - if (param.getDescription() != null){ - this.description = param.getDescription(); - } - this.nestedType = param.getNestedType(); - this.nestedTypeAsString = param.getNestedTypeName(); - - this.value = new ArrayList<>(); - this.value.add(new JasperReportValueDto()); - - this.properties = new JasperReportParameterPropertiesDto(param.getPropertiesMap()); - - - } - - public List getValue() { - return value; - } - - public void setValue(List value) { - this.value = value; - } - - public void addValue() { - getValue().add(new JasperReportValueDto()); - } - - public void removeValue(JasperReportValueDto realValue) { - getValue().remove(realValue); - if (getValue().isEmpty()) { - getValue().add(new JasperReportValueDto()); - } - } - - - public boolean isForPrompting() { - return forPrompting; - } - - public void setForPrompting(boolean forPrompting) { - this.forPrompting = forPrompting; - } - - public boolean getForPrompting() { - return forPrompting; - } - - public String getName() { - return name; - } - - public String getTypeAsString() { - return typeAsString; - } - - public String getNestedTypeAsString() { - return nestedTypeAsString; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - - public JasperReportParameterPropertiesDto getProperties() { - return properties; - } - - public JRPropertiesMap getJRProperties() { - if (properties == null) { - return null; - } - - return properties.getPropertiesMap(); - } - - public void setProperties(JasperReportParameterPropertiesDto properties) { - this.properties = properties; - } - - public Class getType() throws ClassNotFoundException { - if (type == null) { - if (StringUtils.isNotBlank(typeAsString)) { - type = (Class) Class.forName(typeAsString); - } else { - type = (Class) Object.class; - } - } - return type; - } - - public Class getNestedType() throws ClassNotFoundException { - if (StringUtils.isBlank(nestedTypeAsString)) { - return null; - } - nestedType = Class.forName(nestedTypeAsString); - return nestedType; - } - - public boolean isMultiValue() throws ClassNotFoundException{ - if (List.class.isAssignableFrom(getType())){ - return true; - } - - return false; - } - - @Override - public boolean isEditing() { - return editing; - } - - @Override - public void setEditing(boolean editing) { - this.editing = editing; - } - - @Override - public boolean isEmpty() { - if (StringUtils.isBlank(name) && StringUtils.isBlank(typeAsString)) { - return true; - } - return false; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterPropertiesDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterPropertiesDto.java deleted file mode 100644 index 10d71f6fa58..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterPropertiesDto.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; - -import net.sf.jasperreports.engine.JRPropertiesMap; - -public class JasperReportParameterPropertiesDto implements Serializable{ - private static final String PROPERTY_KEY = "key"; - private static final String PROPERTY_LABEL = "label"; - private static final String PROPERTY_TARGET_TYPE = "targetType"; - private static final String PROPERTY_MULTIVALUE = "multivalue"; - private static final String MANDATORY_KEY = "mandatory"; - - - private JRPropertiesMap propertiesMap; - - public JasperReportParameterPropertiesDto(JRPropertiesMap propertiesMap) { - this.propertiesMap = propertiesMap; - } - - public String getLabel() { - if (propertiesMap == null) { - return null; - } - - return propertiesMap.getProperty(PROPERTY_LABEL); - } - - public void setLabel(String label) { - if (propertiesMap == null) { - propertiesMap = new JRPropertiesMap(); - } - - propertiesMap.setProperty(PROPERTY_LABEL, label); - } - -// public boolean getMultivalue() { -// if (propertiesMap == null) { -// return false; -// } -// -// return Boolean.parseBoolean(propertiesMap.getProperty(PROPERTY_MULTIVALUE)); -// } -// -// public void setMultivalue(boolean isMultiValue) { -// if (propertiesMap == null) { -// propertiesMap = new JRPropertiesMap(); -// } -// -// propertiesMap.setProperty(PROPERTY_MULTIVALUE, String.valueOf(isMultiValue)); -// } - - public String getTargetType() { - if (propertiesMap == null) { - return null; - } - - return propertiesMap.getProperty(PROPERTY_TARGET_TYPE); - } - - public void setTargetType(String targetType) { - if (propertiesMap == null) { - propertiesMap = new JRPropertiesMap(); - } - - propertiesMap.setProperty(PROPERTY_TARGET_TYPE, targetType); - } - - - public String getKey() { - if (propertiesMap == null) { - return null; - } - - return propertiesMap.getProperty(PROPERTY_KEY); - } - - public void setKey(String key) { - if (propertiesMap == null) { - propertiesMap = new JRPropertiesMap(); - } - - propertiesMap.setProperty(PROPERTY_KEY, key); - } - - public boolean getMandatory() { - if (propertiesMap == null) { - return false; - } - String isMandatory = propertiesMap.getProperty(MANDATORY_KEY); - return Boolean.parseBoolean(isMandatory); - } - - public void setMandatory(boolean isMandatory) { - if (propertiesMap == null) { - propertiesMap = new JRPropertiesMap(); - } - - propertiesMap.setProperty(MANDATORY_KEY, String.valueOf(isMandatory)); - } - - public JRPropertiesMap getPropertiesMap() { - return propertiesMap; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportRealValueDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportRealValueDto.java deleted file mode 100644 index afbf06ae39d..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportRealValueDto.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; - -public class JasperReportRealValueDto implements Serializable{ - - private T value; - - public T getValue() { - return value; - } - - public void setValue(T value) { - this.value = value; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportValueDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportValueDto.java deleted file mode 100644 index dcfafe7e167..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportValueDto.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2010-2019 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; - -public class JasperReportValueDto implements Serializable { - - private static final long serialVersionUID = 1L; - - private Object value; - private String displayName; - - public JasperReportValueDto() { - - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java deleted file mode 100644 index 42fb72ed2ee..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright (C) 2010-2020 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ -package com.evolveum.midpoint.web.page.admin.reports.dto; - -import java.io.Serializable; - -import org.apache.commons.lang3.BooleanUtils; -import org.apache.wicket.model.IModel; - -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.xml.ns._public.common.common_3.JasperExportType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.JasperReportEngineConfigurationType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; -import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; - -/** - * @author lazyman - */ -public class ReportDto implements Serializable { - - public static final String F_PARENT = "parent"; - public static final String F_OID = "oid"; - public static final String F_NAME = "name"; - public static final String F_DESCRIPTION = "description"; - public static final String F_EXPORT_TYPE = "exportType"; - public static final String F_VIRTUALIZER = "virtualizer"; - public static final String F_VIRTUALIZER_KICKON = "virtualizerKickOn"; - public static final String F_MAXPAGES = "maxPages"; - public static final String F_TIMEOUT = "timeout"; - public static final String F_DASHBOARD_REF = "dashboardRef"; - - private boolean parent; - private String oid; - private String name; - private String description; - private JasperExportType exportType; - private JasperReportDto jasperReportDto; - private byte[] templateStyle; - private String virtualizer; - private Integer virtualizerKickOn; - private Integer maxPages; - private Integer timeout; - // private ReportEngineSelectionType reportEngineType; - private IModel> newReportModel; - - // private PrismObject object; - private ReportType reportType; - - public ReportDto() { - } - - public ReportDto(byte[] reportJrxml) { - this.jasperReportDto = new JasperReportDto(reportJrxml); - } - - public ReportDto(ReportType reportType, boolean onlyForPromptingParams) { - this.oid = reportType.getOid(); - this.name = reportType.getName().getOrig(); - this.description = reportType.getDescription(); - this.reportType = reportType; -// this.reportEngineType = reportType.getReportEngine(); - if (reportType.getJasper() != null) { - JasperReportEngineConfigurationType jasperConfig = reportType.getJasper(); - this.exportType = jasperConfig.getExport(); - // this.xml = new String(Base64.decodeBase64(reportType.getTemplate())); - this.jasperReportDto = new JasperReportDto(jasperConfig.getTemplate(), onlyForPromptingParams); - this.templateStyle = jasperConfig.getTemplateStyle(); - this.parent = !BooleanUtils.isFalse(jasperConfig.isParent()); - this.virtualizer = jasperConfig.getVirtualizer(); - this.virtualizerKickOn = jasperConfig.getVirtualizerKickOn(); - this.maxPages = jasperConfig.getMaxPages(); - this.timeout = jasperConfig.getTimeout(); - - } else { - this.reportType = reportType; - } - } - - public ReportDto(ReportType reportType) { - this(reportType, false); - } - - public ReportDto(String name, String description) { - this.description = description; - this.name = name; - } - - public ReportDto(String name, String description, JasperExportType export, boolean parent) { - this.name = name; - this.description = description; -// this.xml = xml; - this.exportType = export; - this.parent = parent; - } - - public boolean isParent() { - return parent; - } - - public void setParent(boolean parent) { - this.parent = parent; - } - - public PrismObject getObject() { - if (reportType == null) { - reportType = new ReportType(); - } - reportType.setName(new PolyStringType(name)); - reportType.setDescription(description); -// reportType.setReportEngine(reportEngineType); - if (reportType.getJasper() != null) { - - JasperReportEngineConfigurationType jasperConfig = new JasperReportEngineConfigurationType(); - jasperConfig.setExport(exportType); - jasperConfig.setTemplate(jasperReportDto.getTemplate()); - jasperConfig.setTemplateStyle(templateStyle); - jasperConfig.setVirtualizer(virtualizer); - jasperConfig.setVirtualizerKickOn(virtualizerKickOn); - jasperConfig.setMaxPages(maxPages); - jasperConfig.setTimeout(timeout); - reportType.setJasper(jasperConfig); - } - - return reportType.asPrismObject(); - } - - public void setObject(PrismObject object) { - this.reportType = object.asObjectable(); - } - - public String getOid() { - return oid; - } - - public void setOid(String oid) { - this.oid = oid; - } - - // public ReportEngineSelectionType getReportEngineType() { -// return reportEngineType; -// } -// -// public void setReportEngineType(ReportEngineSelectionType reportEngineType) { -// this.reportEngineType = reportEngineType; -// } -// -// public String getXml() { -// return xml; -// } -// -// public void setXml(String xml) { -// this.xml = xml; -// } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public JasperExportType getExportType() { - return exportType; - } - - public void setExportType(JasperExportType exportType) { - this.exportType = exportType; - } - - public JasperReportDto getJasperReportDto() { - return jasperReportDto; - } - - public String getVirtualizer() { - return virtualizer; - } - - public void setVirtualizer(String virtualizer) { - this.virtualizer = virtualizer; - } - - public Integer getVirtualizerKickOn() { - return virtualizerKickOn; - } - - public void setVirtualizerKickOn(Integer virtualizerKickOn) { - this.virtualizerKickOn = virtualizerKickOn; - } - - public Integer getMaxPages() { - return maxPages; - } - - public void setMaxPages(Integer maxPages) { - this.maxPages = maxPages; - } - - public Integer getTimeout() { - return timeout; - } - - public void setTimeout(Integer timeout) { - this.timeout = timeout; - } - - public IModel> getNewReportModel() { - return newReportModel; - } - - public void setNewReportModel(IModel> newReportModel) { - this.newReportModel = newReportModel; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java index c59994b7839..9cec4e4644b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java @@ -79,17 +79,7 @@ protected void onUpdatePerformed(AjaxRequestTarget target) { } if (!WebComponentUtil.hasAnyArchetypeAssignment(getTask())) { - try { - PrismContainerWrapper archetypeAssignment = TaskBasicTabPanel.this.getModelObject().findContainer(TaskType.F_ASSIGNMENT); - PrismContainerValue archetypeAssignmentValue = archetypeAssignment.getItem().createNewValue(); - AssignmentType newArchetypeAssignment = archetypeAssignmentValue.asContainerable(); - newArchetypeAssignment.setTargetRef(ObjectTypeUtil.createObjectRef(taskHandler.getArchetypeOid(), ObjectTypes.ARCHETYPE)); - WebPrismUtil.createNewValueWrapper(archetypeAssignment, archetypeAssignmentValue, getPageBase(), target); - } catch (SchemaException e) { - LOGGER.error("Exception during assignment lookup, reason: {}", e.getMessage(), e); - getSession().error("Cannot set selected handler: " + e.getMessage()); - return; - } + WebComponentUtil.addNewArchetype(TaskBasicTabPanel.this.getModelObject(), taskHandler.getArchetypeOid(), target, getPageBase()); } PrismObjectWrapperFactory wrapperFactory = TaskBasicTabPanel.this.getPageBase().findObjectWrapperFactory(getTask().asPrismObject().getDefinition()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskErrorsTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskErrorsTabPanel.java index 48be60384de..7f760734795 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskErrorsTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskErrorsTabPanel.java @@ -16,8 +16,6 @@ import com.evolveum.midpoint.web.component.data.column.AjaxLinkColumn; import com.evolveum.midpoint.web.component.data.column.EnumPropertyColumn; -import com.evolveum.midpoint.web.component.data.column.LinkColumn; - import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; @@ -49,8 +47,6 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; -import org.jfree.util.ObjectTable; - /** * Created by honchar. */ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java index 8910f8daf4f..8dfdeaa9ee8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; +import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; import com.evolveum.midpoint.schema.util.ObjectTypeUtil; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; @@ -149,8 +150,8 @@ public WebMarkupContainer createPanel(String panelId) { return new SingleContainerPanel(panelId, PrismContainerWrapperModel.fromContainerWrapper(getObjectModel(), TaskType.F_WORK_MANAGEMENT), TaskWorkManagementType.COMPLEX_TYPE) { @Override - protected ItemVisibility getVisibility(ItemPath itemPath) { - return getWorkManagementVisibility(itemPath); + protected ItemVisibility getVisibility(ItemWrapper itemWrapper) { + return getWorkManagementVisibility(itemWrapper.getPath()); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java index 1914d3d860e..38e8b17af28 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java @@ -159,10 +159,6 @@ private void showResult(OperationResult result) { getPageBase().showResult(result); } - private WebMarkupContainer getFeedbackPanel() { - return getPageBase().getFeedbackPanel(); - } - private void synchronizeTasksPerformed(AjaxRequestTarget target) { Task opTask = createSimpleTask(OPERATION_SYNCHRONIZE_TASKS); OperationResult result = opTask.getResult(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java index 634edf3f77a..fd5143e03d1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java @@ -32,6 +32,7 @@ import com.evolveum.midpoint.web.page.error.PageError; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.GuiObjectColumnType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -106,7 +107,7 @@ protected IColumn, String> createCheckboxColumn() { } @Override - protected IColumn, String> createNameColumn(IModel displayModel, String itemPath, ExpressionType expression) { + protected IColumn, String> createNameColumn(IModel displayModel, GuiObjectColumnType customColumn, String itemPath, ExpressionType expression) { return new ObjectNameColumn<>(createStringResource("ObjectType.name")) { private static final long serialVersionUID = 1L; @@ -122,7 +123,7 @@ public void onClick(AjaxRequestTarget target, IModel> r @Override protected List, String>> createDefaultColumns() { List, String>> columns = new ArrayList<>(); - columns.add(createNameColumn(null, null, null)); + columns.add(createNameColumn(null, null, null, null)); columns.addAll(PageAttorneySelection.this.initColumns()); return columns; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java index 6c27a7ed312..b8f9ff80561 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java @@ -118,6 +118,14 @@ public void setPagingSize(TableId key, Integer size) { setPagingSize(key.name(), size); } + public boolean isExistPagingSize(TableId key) { + Validate.notNull(key, "TableId must not be null."); + Validate.notNull(key.name(), "TableId.name() must not be null."); + + Integer size = tables.get(key.name()); + return size != null; + } + public void setPagingSize(String key, Integer size) { Validate.notNull(key, "Key must not be null."); diff --git a/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml b/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml index 3d6814bd377..dfa28d0f829 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml @@ -54,11 +54,6 @@ OFF org.hibernate.internal.ExceptionMapperStandardImpl - - - OFF - net.sf.jasperreports.engine.fill.JRFillDataset - diff --git a/gui/admin-gui/src/main/resources/initial-objects/080-report-audit.xml b/gui/admin-gui/src/main/resources/initial-objects/080-report-audit.xml deleted file mode 100644 index 42194b59555..00000000000 --- a/gui/admin-gui/src/main/resources/initial-objects/080-report-audit.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - All audit records report - Report made from all audit records. - - - - - - - - - diff --git a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit-jasper.xml b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit-jasper.xml deleted file mode 100644 index 5ec1a4d1e28..00000000000 --- a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit-jasper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Audit logs report (Jasper) - Report made from audit records. - - true - - PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgamFzcGVyVGVtcGxhdGUNCiAgUFVCTElDICItLy9KYXNwZXJSZXBvcnRzLy9EVEQgVGVtcGxhdGUvL0VOIg0KICAiaHR0cDovL2phc3BlcnJlcG9ydHMuc291cmNlZm9yZ2UubmV0L2R0ZHMvamFzcGVydGVtcGxhdGUuZHRkIj4NCjxqYXNwZXJUZW1wbGF0ZT4NCiAgICAgICAgCTxzdHlsZSBmb250TmFtZT0iRGVqYVZ1IFNhbnMiIGZvbnRTaXplPSIxMCIgaEFsaWduPSJMZWZ0IiBpc0RlZmF1bHQ9InRydWUiIGlzUGRmRW1iZWRkZWQ9InRydWUiIA0KCQkJCSAgIG5hbWU9IkJhc2UiIHBkZkVuY29kaW5nPSJJZGVudGl0eS1IIiBwZGZGb250TmFtZT0iRGVqYVZ1U2Fucy50dGYiIHZBbGlnbj0iTWlkZGxlIj4NCgkJCTwvc3R5bGU+DQoJCQk8c3R5bGUgYmFja2NvbG9yPSIjMjY3OTk0IiBmb250U2l6ZT0iMjYiIGZvcmVjb2xvcj0iI0ZGRkZGRiIgaXNEZWZhdWx0PSJmYWxzZSINCiAgICAgICAgICAgICAgICAgICBtb2RlPSJPcGFxdWUiIG5hbWU9IlRpdGxlIiBzdHlsZT0iQmFzZSIvPiANCgkJCTxzdHlsZSBmb250U2l6ZT0iMTIiIGZvcmVjb2xvcj0iIzAwMDAwMCIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iUGFnZSBoZWFkZXIiDQogICAgICAgICAgICAgICAgICAgc3R5bGU9IkJhc2UiLz4NCgkJCTxzdHlsZSBiYWNrY29sb3I9IiMzMzMzMzMiIGZvbnRTaXplPSIxMiIgZm9yZWNvbG9yPSIjRkZGRkZGIiBoQWxpZ249IkNlbnRlciINCiAgICAgICAgICAgICAgICAgICBpc0RlZmF1bHQ9ImZhbHNlIiBtb2RlPSJPcGFxdWUiIG5hbWU9IkNvbHVtbiBoZWFkZXIiIHN0eWxlPSJCYXNlIi8+DQoJCQk8c3R5bGUgaXNCb2xkPSJmYWxzZSIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iRGV0YWlsIiBzdHlsZT0iQmFzZSIvPg0KICAgICAgICAgICAgPHN0eWxlIGlzQm9sZD0iZmFsc2UiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IkNvZGUiIHN0eWxlPSJCYXNlIiBmb250U2l6ZT0iOSIvPg0KCQkJPHN0eWxlIGZvbnRTaXplPSI5IiBmb3JlY29sb3I9IiMwMDAwMDAiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IlBhZ2UgZm9vdGVyIg0KICAgICAgICAgICAgICAgICAgIHN0eWxlPSJCYXNlIi8+DQoJCTwvamFzcGVyVGVtcGxhdGU+ - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - - diff --git a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml new file mode 100644 index 00000000000..d10e59eeb5f --- /dev/null +++ b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml @@ -0,0 +1,162 @@ + + + + + All audit records report + Report made from all audit records. + + + + + + + + + + + + targetRef + + filterAll + $target + + + + initiatorRef + + filterAll + $initiator + + + + outcome + + filterAll + $outcome + + + + eventType + + filterAll + $eventType + + + + eventStage + + filterAll + $eventStage + + + + timestamp + + filterAll + $from + + + + timestamp + + filterAll + $to + + + + + + + outcome + OperationResultStatusType + + + + + + eventType + AuditEventTypeType + + + + + + eventStage + AuditEventStageType + + + + + + from + dateTime + + + + + + to + dateTime + + + + + + target + c:ObjectReferenceType + + + + + + initiator + c:ObjectReferenceType + + + + + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml b/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml index 32f521d5f4d..82cc0e7b5f2 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml @@ -1,22 +1,179 @@ - - Reconciliation report (Jasper) - Reconciliation report for selected resource. - - true - - PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgamFzcGVyVGVtcGxhdGUNCiAgUFVCTElDICItLy9KYXNwZXJSZXBvcnRzLy9EVEQgVGVtcGxhdGUvL0VOIg0KICAiaHR0cDovL2phc3BlcnJlcG9ydHMuc291cmNlZm9yZ2UubmV0L2R0ZHMvamFzcGVydGVtcGxhdGUuZHRkIj4NCjxqYXNwZXJUZW1wbGF0ZT4NCiAgICAgICAgCTxzdHlsZSBmb250TmFtZT0iRGVqYVZ1IFNhbnMiIGZvbnRTaXplPSIxMCIgaEFsaWduPSJMZWZ0IiBpc0RlZmF1bHQ9InRydWUiIGlzUGRmRW1iZWRkZWQ9InRydWUiIA0KCQkJCSAgIG5hbWU9IkJhc2UiIHBkZkVuY29kaW5nPSJJZGVudGl0eS1IIiBwZGZGb250TmFtZT0iRGVqYVZ1U2Fucy50dGYiIHZBbGlnbj0iTWlkZGxlIj4NCgkJCTwvc3R5bGU+DQoJCQk8c3R5bGUgYmFja2NvbG9yPSIjMjY3OTk0IiBmb250U2l6ZT0iMjYiIGZvcmVjb2xvcj0iI0ZGRkZGRiIgaXNEZWZhdWx0PSJmYWxzZSINCiAgICAgICAgICAgICAgICAgICBtb2RlPSJPcGFxdWUiIG5hbWU9IlRpdGxlIiBzdHlsZT0iQmFzZSIvPiANCgkJCTxzdHlsZSBmb250U2l6ZT0iMTIiIGZvcmVjb2xvcj0iIzAwMDAwMCIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iUGFnZSBoZWFkZXIiDQogICAgICAgICAgICAgICAgICAgc3R5bGU9IkJhc2UiLz4NCgkJCTxzdHlsZSBiYWNrY29sb3I9IiMzMzMzMzMiIGZvbnRTaXplPSIxMiIgZm9yZWNvbG9yPSIjRkZGRkZGIiBoQWxpZ249IkNlbnRlciINCiAgICAgICAgICAgICAgICAgICBpc0RlZmF1bHQ9ImZhbHNlIiBtb2RlPSJPcGFxdWUiIG5hbWU9IkNvbHVtbiBoZWFkZXIiIHN0eWxlPSJCYXNlIi8+DQoJCQk8c3R5bGUgaXNCb2xkPSJmYWxzZSIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iRGV0YWlsIiBzdHlsZT0iQmFzZSIvPg0KICAgICAgICAgICAgPHN0eWxlIGlzQm9sZD0iZmFsc2UiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IkNvZGUiIHN0eWxlPSJCYXNlIiBmb250U2l6ZT0iOSIvPg0KCQkJPHN0eWxlIGZvbnRTaXplPSI5IiBmb3JlY29sb3I9IiMwMDAwMDAiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IlBhZ2UgZm9vdGVyIg0KICAgICAgICAgICAgICAgICAgIHN0eWxlPSJCYXNlIi8+DQoJCTwvamFzcGVyVGVtcGxhdGU+ - pdf - JRSwapFileVirtualizer - 300 - 10000 - 300000 - + + + Reconciliation report + Reconciliation report for selected resource. + + + + + + + + + + + + resourceRef + + filterAll + $resource + + + + synchronizationSituation + + filterAll + $situation + + + + objectClass + + filterAll + + + + + kind + + filterAll + $kind + + + + intent + + filterAll + $intent + + + + + + + intent + string + + + + + + objectClass + string + + + + + + kind + ShadowKindType + + + + + + situation + SynchronizationSituationType + + + + + + resource + c:ObjectReferenceType + c:ResourceType + + + + + + ShadowType + + nameColumn + name + + + resourceColumn + resourceRef + nameColumn + + + situationColumn + synchronizationSituation + resourceColumn + + + ownerColumn + + + + + + + + + situationColumn + + + synchTimestampColumn + synchronizationTimestamp + ownerColumn + + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml b/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml index e1e6395cf7a..cae83fe5969 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml @@ -1,21 +1,205 @@ - - Users in MidPoint (Jasper) + + + Users in MidPoint Users listed in MidPoint. - - - PD94bWwgdmVyc2lvbj0iMS4wIj8+DQo8IURPQ1RZUEUgamFzcGVyVGVtcGxhdGUNCiAgUFVCTElDICItLy9KYXNwZXJSZXBvcnRzLy9EVEQgVGVtcGxhdGUvL0VOIg0KICAiaHR0cDovL2phc3BlcnJlcG9ydHMuc291cmNlZm9yZ2UubmV0L2R0ZHMvamFzcGVydGVtcGxhdGUuZHRkIj4NCjxqYXNwZXJUZW1wbGF0ZT4NCiAgICAgICAgCTxzdHlsZSBmb250TmFtZT0iRGVqYVZ1IFNhbnMiIGZvbnRTaXplPSIxMCIgaEFsaWduPSJMZWZ0IiBpc0RlZmF1bHQ9InRydWUiIGlzUGRmRW1iZWRkZWQ9InRydWUiIA0KCQkJCSAgIG5hbWU9IkJhc2UiIHBkZkVuY29kaW5nPSJJZGVudGl0eS1IIiBwZGZGb250TmFtZT0iRGVqYVZ1U2Fucy50dGYiIHZBbGlnbj0iTWlkZGxlIj4NCgkJCTwvc3R5bGU+DQoJCQk8c3R5bGUgYmFja2NvbG9yPSIjMjY3OTk0IiBmb250U2l6ZT0iMjYiIGZvcmVjb2xvcj0iI0ZGRkZGRiIgaXNEZWZhdWx0PSJmYWxzZSINCiAgICAgICAgICAgICAgICAgICBtb2RlPSJPcGFxdWUiIG5hbWU9IlRpdGxlIiBzdHlsZT0iQmFzZSIvPiANCgkJCTxzdHlsZSBmb250U2l6ZT0iMTIiIGZvcmVjb2xvcj0iIzAwMDAwMCIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iUGFnZSBoZWFkZXIiDQogICAgICAgICAgICAgICAgICAgc3R5bGU9IkJhc2UiLz4NCgkJCTxzdHlsZSBiYWNrY29sb3I9IiMzMzMzMzMiIGZvbnRTaXplPSIxMiIgZm9yZWNvbG9yPSIjRkZGRkZGIiBoQWxpZ249IkNlbnRlciINCiAgICAgICAgICAgICAgICAgICBpc0RlZmF1bHQ9ImZhbHNlIiBtb2RlPSJPcGFxdWUiIG5hbWU9IkNvbHVtbiBoZWFkZXIiIHN0eWxlPSJCYXNlIi8+DQoJCQk8c3R5bGUgaXNCb2xkPSJmYWxzZSIgaXNEZWZhdWx0PSJmYWxzZSIgbmFtZT0iRGV0YWlsIiBzdHlsZT0iQmFzZSIvPg0KICAgICAgICAgICAgPHN0eWxlIGlzQm9sZD0iZmFsc2UiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IkNvZGUiIHN0eWxlPSJCYXNlIiBmb250U2l6ZT0iOSIvPg0KCQkJPHN0eWxlIGZvbnRTaXplPSI5IiBmb3JlY29sb3I9IiMwMDAwMDAiIGlzRGVmYXVsdD0iZmFsc2UiIG5hbWU9IlBhZ2UgZm9vdGVyIg0KICAgICAgICAgICAgICAgICAgIHN0eWxlPSJCYXNlIi8+DQoJCTwvamFzcGVyVGVtcGxhdGU+ - pdf - JRSwapFileVirtualizer - 300 - 10000 - 300000 - + + + + + + + + + activation/administrativeStatus + + filterAll + $activation + + + + assignment/targetRef + + filterAll + $organization + + + + assignment/targetRef + + filterAll + $role + + + + assignment/construction/resourceRef + + filterAll + $resource + + + + + + + activation + ActivationStatusType + + + + + + organization + c:ObjectReferenceType + c:OrgType + + + + + + role + c:ObjectReferenceType + c:RoleType + + + + + + resource + c:ObjectReferenceType + c:ResourceType + + + + + + + nameColumn + name + + + fullNameColumn + fullName + nameColumn + + + activationColumn + activation/administrativeStatus + fullNameColumn + + + roleColumn + assignment + + + + + + + + + activationColumn + + + orgColumn + assignment + + + + + + + + + roleColumn + + + accountColumn + linkRef + + + + + + + + + orgColumn + + UserType + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/130-report-certification-definitions.xml b/gui/admin-gui/src/main/resources/initial-objects/130-report-certification-definitions.xml index 9795729d665..575014f957a 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/130-report-certification-definitions.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/130-report-certification-definitions.xml @@ -7,6 +7,7 @@ --> Certification definitions report All certification definitions with basic information on related campaigns. @@ -15,15 +16,14 @@ - + + + nameColumn name - - - ownerColumn @@ -43,21 +43,12 @@ + number openCampaignsColumn @@ -74,7 +65,6 @@ oid = object.getOid(); numberOfCampaigns = 0; - campaigns = midpoint.searchObjects(AccessCertificationCampaignType.class, prismContext.queryFor(AccessCertificationCampaignType.class).build(), null); for (AccessCertificationCampaignType campaign : campaigns) { if (oid.equals(campaign.getDefinitionRef().getOid())) { AccessCertificationCampaignStateType state = campaign.getState(); @@ -89,6 +79,7 @@ + number lastStartedColumn @@ -124,8 +115,26 @@ + + ascending + name + AccessCertificationDefinitionType + + campaigns + AccessCertificationCampaignType + + + + true diff --git a/gui/admin-gui/src/main/resources/initial-objects/140-report-certification-campaigns.xml b/gui/admin-gui/src/main/resources/initial-objects/140-report-certification-campaigns.xml index 78b2853c93e..51afc737483 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/140-report-certification-campaigns.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/140-report-certification-campaigns.xml @@ -7,19 +7,180 @@ --> - Certification campaigns report (Jasper) - All certification campaigns along with their state. - - true - - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - + Certification campaigns report + All certification campaigns along with their state. + + + + + + + + + state + + filterAll + + + + + state + inReviewStage + + + state + reviewStageDone + + + state + inRemediation + + + + + + + + + + nameColumn + name + + + + + + ownerColumn + ownerRef + + + + nameColumn + + + startTimestampColumn + startTimestamp + + + + ownerColumn + + + + + + + + endTimestampColumn + endTimestamp + + + + startTimestampColumn + + + + + + + + casesColumn + case + + + + endTimestampColumn + number + + + stateColumn + state + + + + casesColumn + + + stageNumberColumn + stageNumber + + + + stateColumn + + + stageCasesColumn + stageNumberColumn + + + + + + + + + + + percentageCompleteColumn + stageCasesColumn + + + + + + + + + + + ascending + name + + AccessCertificationCampaignType + + true + + alsoClosedCampaigns + boolean + + + + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml b/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml index b0f6c1478a5..882e35d420e 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/150-report-certification-cases.xml @@ -6,19 +6,190 @@ ~ and European Union Public License. See LICENSE file for details. --> - Certification cases report (Jasper) - Cases within a given certification campaign. - - true - - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - + Certification cases report + Cases within a given certification campaign. + + + + + + + + ../name + + filterAll + $campaignName + + + + + + + objectColumn + objectRef + + + + + + + + + + + targetColumn + targetRef + + + + objectColumn + + + + + + + + reviewersColumn + + + + targetColumn + + + + + + + + lastReviewedOnColumn + + + + reviewersColumn + + + + + + + + reviewedByColumn + + + + lastReviewedOnColumn + + + + + + + + iterationColumn + iteration + + + + reviewedByColumn + + + inStageNumberColumn + stageNumber + + + + iterationColumn + + + outcomeColumn + outcome + + + + inStageNumberColumn + + + commentsColumn + + + + outcomeColumn + + + + + + + + remediedTimestampColumn + remediedTimestamp + + + + commentsColumn + + AccessCertificationCaseType + + objectRef/@/name + + + + campaignName + c:ObjectReferenceType + c:AccessCertificationCampaignType + + + + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml b/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml index 86cb0f2e414..55c2437d0b7 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/160-report-certification-decisions.xml @@ -6,19 +6,175 @@ ~ and European Union Public License. See LICENSE file for details. --> - Certification decisions report (Jasper) - Decisions of individual reviewers for a certification campaign as a whole or for a given campaign stage. - - true - - html - JRSwapFileVirtualizer - 300 - 10000 - 300000 - - - prismReference - + Certification decisions report + Decisions of individual reviewers for a certification campaign as a whole or for a given campaign stage. + + + + + + + + ../name + + filterAll + $campaignName + + + + + + + + + + objectColumn + objectRef + + + + + + + + + + + targetColumn + targetRef + + + + objectColumn + + + + + + + + workItemColumn + workItem + + + + targetColumn + + + + + + + + objectRef/@/name + + c:AccessCertificationCaseType + + + campaignName + c:ObjectReferenceType + c:AccessCertificationCampaignType + + + + + + stageNumber + string + + + + + + iteration + string + + + + + diff --git a/gui/admin-gui/src/main/resources/initial-objects/280-object-collection-resource-up.xml b/gui/admin-gui/src/main/resources/initial-objects/251-object-collection-resource-up.xml similarity index 100% rename from gui/admin-gui/src/main/resources/initial-objects/280-object-collection-resource-up.xml rename to gui/admin-gui/src/main/resources/initial-objects/251-object-collection-resource-up.xml diff --git a/gui/admin-gui/src/main/resources/initial-objects/270-object-collection-task-active.xml b/gui/admin-gui/src/main/resources/initial-objects/261-object-collection-task-active.xml similarity index 100% rename from gui/admin-gui/src/main/resources/initial-objects/270-object-collection-task-active.xml rename to gui/admin-gui/src/main/resources/initial-objects/261-object-collection-task-active.xml diff --git a/gui/admin-gui/src/main/resources/initial-objects/284-object-collection-audit.xml b/gui/admin-gui/src/main/resources/initial-objects/270-object-collection-audit.xml similarity index 100% rename from gui/admin-gui/src/main/resources/initial-objects/284-object-collection-audit.xml rename to gui/admin-gui/src/main/resources/initial-objects/270-object-collection-audit.xml diff --git a/gui/admin-gui/src/main/resources/initial-objects/285-object-collection-audit-24h.xml b/gui/admin-gui/src/main/resources/initial-objects/271-object-collection-audit-24h.xml similarity index 100% rename from gui/admin-gui/src/main/resources/initial-objects/285-object-collection-audit-24h.xml rename to gui/admin-gui/src/main/resources/initial-objects/271-object-collection-audit-24h.xml diff --git a/gui/admin-gui/src/main/resources/initial-objects/290-object-collection-audit-errors-24h.xml b/gui/admin-gui/src/main/resources/initial-objects/272-object-collection-audit-errors-24h.xml similarity index 100% rename from gui/admin-gui/src/main/resources/initial-objects/290-object-collection-audit-errors-24h.xml rename to gui/admin-gui/src/main/resources/initial-objects/272-object-collection-audit-errors-24h.xml diff --git a/gui/admin-gui/src/main/resources/initial-objects/300-object-collection-audit-modifications-24h.xml b/gui/admin-gui/src/main/resources/initial-objects/273-object-collection-audit-modifications-24h.xml similarity index 100% rename from gui/admin-gui/src/main/resources/initial-objects/300-object-collection-audit-modifications-24h.xml rename to gui/admin-gui/src/main/resources/initial-objects/273-object-collection-audit-modifications-24h.xml diff --git a/gui/admin-gui/src/main/resources/initial-objects/280-object-collection-certification-campaign-all.xml b/gui/admin-gui/src/main/resources/initial-objects/280-object-collection-certification-campaign-all.xml new file mode 100644 index 00000000000..a92f8c21f25 --- /dev/null +++ b/gui/admin-gui/src/main/resources/initial-objects/280-object-collection-certification-campaign-all.xml @@ -0,0 +1,27 @@ + + + + + All certification campaigns + AccessCertificationCampaignType + + + + + + + diff --git a/config/initial-objects/255-object-collection-certification-definition-all.xml b/gui/admin-gui/src/main/resources/initial-objects/290-object-collection-shadow-all.xml similarity index 72% rename from config/initial-objects/255-object-collection-certification-definition-all.xml rename to gui/admin-gui/src/main/resources/initial-objects/290-object-collection-shadow-all.xml index 330c41f246c..c08274cd3d9 100644 --- a/config/initial-objects/255-object-collection-certification-definition-all.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/290-object-collection-shadow-all.xml @@ -1,6 +1,6 @@ - OFF - net.sf.jasperreports.engine.fill.JRFillDataset - diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DefinitionFactory.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DefinitionFactory.java index e90ae9a5f05..95b40f45fed 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DefinitionFactory.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/DefinitionFactory.java @@ -28,5 +28,5 @@ public interface DefinitionFactory { @NotNull MutablePrismContainerDefinition createContainerDefinition(QName name, ComplexTypeDefinition ctd); - PrismPropertyDefinition createPropertyDefinition(QName name, QName typeName, Collection> allowedValues, T defaultValue); + MutablePrismPropertyDefinition createPropertyDefinition(QName name, QName typeName, Collection> allowedValues, T defaultValue); } diff --git a/infra/schema-pure-jaxb/src/compile/resources/catalog.xml b/infra/schema-pure-jaxb/src/compile/resources/catalog.xml index 09a3d0618d4..de6adee345c 100644 --- a/infra/schema-pure-jaxb/src/compile/resources/catalog.xml +++ b/infra/schema-pure-jaxb/src/compile/resources/catalog.xml @@ -32,7 +32,6 @@ Used when building via xjc. - diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml index c657edc311d..860dbdcf717 100644 --- a/infra/schema/pom.xml +++ b/infra/schema/pom.xml @@ -88,10 +88,6 @@ commons-beanutils commons-beanutils - - commons-codec - commons-codec - org.apache.commons commons-text @@ -107,10 +103,6 @@ - - net.sf.jasperreports - jasperreports - org.jetbrains annotations @@ -265,36 +257,6 @@ -xjc-Xmidpoint - - - src/main/resources/xml/ns/private/webservice/reportService.wsdl - ${basedir}/src/compile/resources/jax-ws-catalog.xml - - -impl - -verbose - -xjc-Xts - -xjc-XhashCode - - -xjc-XhashCode-hashCodeStrategyClass=com.evolveum.midpoint.util.xml.DomAwareHashCodeStrategy - - -xjc-Xequals - - -xjc-Xequals-equalsStrategyClass=com.evolveum.midpoint.util.xml.DomAwareEqualsStrategy - - -nexclude - http://prism.evolveum.com/xml/ns/public/types-3 - -nexclude - http://prism.evolveum.com/xml/ns/public/annotation-3 - -nexclude - http://prism.evolveum.com/xml/ns/public/query-3 - -xjc-Xmidpoint - - - diff --git a/infra/schema/src/main/resources/xml/ns/private/webservice/reportService.wsdl b/infra/schema/src/main/resources/xml/ns/private/webservice/reportService.wsdl deleted file mode 100644 index 710dba46c06..00000000000 --- a/infra/schema/src/main/resources/xml/ns/private/webservice/reportService.wsdl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd index f13254ee87b..70db29818d4 100644 --- a/infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd @@ -1,1485 +1,1486 @@ - - - - - - - - - TODO - - - - - - - - - - - - - - - - Definition of an access certification - a template for - a set of access certification campaigns. - - - - - - - - - The certification handler that should take care of certification campaigns - created according to this definition. - - - - - - - Specifies the standard scope of certifications of this type. (In the future it can be overridden - in specific certification campaign.) - - - - - - - The user that owns certification campaigns based on this definition. - - - tns:UserType - - - - - - - How the identified cases have to be resolved? - - - - - - - Configuration of the manual or automatic reiteration. - - - 3.9 - - - - - - - Definition of individual stages (reviewers, duration, ...). - - - - - - - Strategy used to compute review outcome for a given case, based on results of individual stages, - along with instructions when a case review advances from a stage to next one. - - - - - - - Denotes "ad hoc" certification campaign, i.e. one that is started by policy rules, not explicitly by a user. - - - 3.6 - - - - - - - ID that was used to auto-generate campaign name last time (null if none so far). - - - - - - - When the last campaign of this type was started (in its first iteration)? - - - - - - - When the last campaign of this type was closed? Deletion is not recorded in this attribute. - - - - - - - - - - - - - - - - - - - - - Access certification definition augmented with report-related information - (e.g. number of campaigns). - - EXPERIMENTAL. It is to be seen if this form is OK. - - - - - - - - - - - - - - - - - Access certification definition. - - - - - - - - - - - - - Definition of an access certification campaign stage. - - - - - - - - - - Stages are numbered from 1 onwards. - - - - - - - Stage name. - - - - - - - Stage description. - - - - - - - - How long should the stage last? - - - - - - - How to round the deadline (if at all)? The default is to 23:59:59 of the computed day. - - - - - - - How long before the end of stage should notifications be sent? - (Multiple values can be put here.) - - - - - - - Send notifications only to people that have not decided yet. - - - - - - - TODO - - - - - - - How to determine outcome of the approval process (e.g. if multiple reviewers are present)? - Default is oneAcceptAccepts. - - - - - - - What is the outcome if no reviewers are available? (This is not the same situation as if some reviewers were computed but none of them responded!) - - - - - - - What decisions stop the case from advancing to the next stage? - If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined at the campaign level) is used. - - - - - - - What decisions make the case to advance to the next stage? - If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined at the campaign level) is used. - - - - - - - What actions are to be applied to work items when given timer(s) occur. - EXPERIMENTAL - - - 3.6 - - - - - - - - - - - Specifies how to select reviewers for a campaign stage. - - - - - - - - - - User-readable name of this reviewer specification. (In case it is necessary.) - - - - - - - Description of this reviewer specification. - - - - - - - - Indicates that target object (Org, Role, Resource) owner(s) should be used as reviewer(s). - - - - - - - Indicates that target object (Org, Role, Resource) approver(s) should be used as reviewer(s). - - - - - - - Indicates that object (Org, Role) owner(s) should be used as reviewer(s). - - - - - - - Indicates that object (Org, Role) approver(s) should be used as reviewer(s). - - - - - - - Indicates that the object's managers should be used. The interpretation depends on what kind - of object there is. - - For a user, the managers of all organizations to which he/she belongs, are taken. - For an org, its managers are taken. - (For the future: For a role, if it has a parentOrgRef, managers of these are taken. If it has - none, no reviewers are contributed by this option.) - - - - - - - The most general way of specifying the reviewer. Inputs for such expressions are: - - certificationCase (current certification case), - - campaign (certification campaign object), - - reviewerSpecification (current reviewer specification). - Output is a collection of parent-less reviewer references (of type ObjectReferenceType). - - - - - - - If no reviewer(s) are computed by other means, this/these should be used. - - - tns:FocusType - - - - - - - These reviewers are always used. - - - tns:FocusType - - - - - - - - - - - Definition of an access certification campaign. - - - - - - - - - Specifies the definition for this certification campaign. - (It is optional, as there are also ad-hoc certifications with no pre-existing definition.) - - - tns:AccessCertificationDefinitionType - - - - - - - Specifies the owner of this certification campaign. - - - tns:UserType - - - - - - - The certification handler that should take care of this campaign. - - - - - - - Specifies the scope of this campaign. - - - - - - - How the identified cases have to be resolved? - - - - - - - Configuration of the manual or automatic reiteration. - - - 3.9 - - - - - - - Definition of individual stages. - - - - - - - Strategy used to compute review outcome for a given case, based on results of individual stages, - along with instructions when a case review advances from a stage to next one. - - - - - - - When this campaign has to start (or has started). - - - - - - - When this campaign has finished. - - - - - - - Which iteration this campaign is in. 1 means the regular (first) run; - 2 means first repetition, etc. - - - 3.9 - - - - - - - In which state is the current campaign. - - - - - - - The stage this campaign is in. - 0 means it has not started yet. - X in 1..N (where N is the number of defined stages) means that stage X is being carried out. - Y greater than N means the campaign has been already finished. - - - - - - - Stages for this campaign (already finished, current, or planned). - - - - - - - Certification cases for this campaign. - - - - - - - - - - - - - Information about a stage of a campaign. - - - - - - - - - - Which iteration this stage is part of. 1 means the first (i.e. regular) run. - - - 3.9 - - - - - - - TODO - - - - - - - Stage name. - - - - - - - Stage description. - - - - - - - - When this stage has started. - - - - - - - When this stage has to finish. - - - - - - - When this stage has actually finished. - - - - - - - The escalation level is currently the same for open all cases and their open work items in the stage. - (This might change in the future.) - - - - - - - - - - - Specifies the scope of an access certification campaign. - - - - - - - - - - User-readable name of this scope definition. (In case it is necessary.) - - - - - - - Description of this scope definition. - - - - - - - - - - - - - - - The most common way of specifying scope - providing type+search filter to select "base" objects - and then some means of deriving certification cases from them. - - - - - - - - - Type of objects to be selected for certification. - - - - - - - Filter to find objects for certification. - By default, all objects of a given type will be selected. - - - - - - - Expression that selects items that are to be included in the certification. - Exact use of this expression depends on the certification handler. - E.g. user assignment handler could call this expression individually with each assignment - to determine which assignments should be included and which should not. - - - - - - - Expression that produces certification cases. This can be any expression, whose input is an object - that has passed the search filter specified above, and its output is a list of certification cases. - An example: a groovy expression, creating certification cases by selecting user's - "risky" assignments (e.g. assignments to a roles of a given type/types). Another example - can be the computation of all assignments (direct and indirect ones), and selecting among these. - NOT IMPLEMENTED YET - - - - - - - - - - - - - Scope for assignment-related reviews. - - - - - - - - - - - - Should assignments be included in the certification? - - - - - - - Should inducements be included in the certification? - - - - - - - Should assignments/inducements of roles be included in the certification? - - - - - - - Should assignments/inducements of orgs be included in the certification? - - - - - - - Should assignments/inducements of resources be included in the certification? - - - - - - - Should assignments/inducements of services be included in the certification? - - - - - - - Should assignments/inducements of users (e.g. deputy relations) be included in the certification? - - - - - - - Should we approve only assignments/inducements that are currently enabled? - (I.e. with administrativeStatus either null or ENABLED) - - - - - - - Relation(s) which are to be considered. Value of q:any means "any relation". - If no relation is present, org:default (i.e. null) is assumed. - - - - - - - - - - - - - An item that has to be certified, viewed in the scope of a given certification campaign. - - - - - - - - - - Object (e.g. a user) that is being touched by this case. - - - tns:ObjectType - - - - - - - Quite an abstract parameter - describing the object of the certification case (e.g. a role, a resource, ...). - Used for selecting relevant cases for approvals. - - - tns:ObjectType - - - - - - - For parameterized certification items (e.g. assignments): a tenant parameter, if applicable. - See discussion on tenantRef in AssignmentType. - - - tns:OrgType - - - - - - - For parameterized certification items (e.g. assignments): an org parameter, if applicable. - See discussion on orgRef in AssignmentType. - - - tns:OrgType - - - - - - - If the target is assigned with activation information (e.g. validFrom/validTo/administrativeStatus) - here is the information copied. Note that other activation information (e.g. effectiveStatus) are - _not_ updated here and probably should be ignored. - - - - - - - - The number of current stage in which this case is. - E.g. currentOutcome relates to the currentStage. - Case is "enabled" for a current campaign stage if and only if case.currentStage == campaign.stageNumber. - - When opening a campaign stage, case's currentStage either advances (if it is transferred to stage being opened) - or stays at the existing value (if it is not). It then indicates the last stage this case - was reviewed in. - - - - - - - Iteration this case takes part of. Case is "enabled" for a current campaign stage if and only if - case.iteration == campaign.iteration (beware of null comparison). - - - - - - - Work items for this stage. Some might be completed. Work items are not deleted. - - - 3.6 - - - - - - - When was this certification case requested to be reviewed? - (Can be found in certification.stage.start but we need to - sort according to this value.) - - - - - - - When should this certification case be reviewed? - (Can be found in certification.stage.end but we need to - sort according to this value.) - - - - - - - Currently valid outcome, relevant to the current stage. It is recomputed on each reviewer's - response based on defined algorithms. If the case is not transferred into the next stage, - the value of this item stays as it is. - - - - - - - The outcome, taking into account all closed stages plus current stage (if any). - - - - - - - When was the review process for this case finished (for the current iteration)? - This value is cleared for cases entering the next iteration. - - - 3.9 - - - - - - - When was this certification case was remedied? - If null, this means that either remediation was not required - (either because the decision was "accept" or "abstain" or - because remediation mode was set to "none"). - - - - - - - Events that occurred during lifetime of this case. - - - - - - - - - - - - - - - - - - - - - - - - - A work item for a certification case. - - - - 3.6 - - - - - - - - - When the decision was made or changed. - - - - - - - Which iteration this work item is part of. 1 means the first (i.e. regular) run. - - - 3.9 - - - - - - - - - - - - - - - - - - - - - Assignment that is being considered. - - - - - - - Indicates if the above assignment is an assignment or (in case of roles) an inducement. - - - - - - - - - - - - - An enumeration that defines possible reviewers' responses. - - - - - - - A.k.a. maintain, confirm, certify, approve, OK - the situation was approved and can be left - as it is. It is possible to enter a date when the approval will expire. Until this time - the item will be considered approved and will not be shown in the certification list - for the given certifier. (We have to decide how to implement this feature. The most simple - but not entirely correct solution is to set "validTo" date for a given assignment. But it - wouldn't work e.g. for indirect assignments.) - - - - - - - - - - A.k.a. reject, remove, "not OK" - the situation is unacceptable and has to be eliminated - or disabled. E.g. the assignment has to be removed or disabled. - - - - - - - - - - A.k.a. update - situation is not acceptable; however, simple elimination/disabling is not - necessary or not appropriate - someone has to look at this and try to find another solution. - - - - - - - - - - A.k.a. abstain - responsible person says he/she is not able to decide. - - - - - - - - - - Responsible person delegates the decision to someone else. - DEPRECATED - - - - - - - - - - No response was provided by the given reviewer. - (This state can be used e.g. to facilitate querying by state.) - - SHOULD NOT BE USED FOR INDIVIDUAL RESPONSES. (A null value should be used instead.) - But it's OK to use this for stage/case outcome. - - - - - - - - - - - - - - - Strategy used to compute review outcome for a given case, based on results of individual stages. - Default is oneDenyDenies. - - - - - - - What decisions stop the case from advancing to the next stage? - If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined by the outcomeStrategy) is used. - - - - - - - What decisions make the case to advance to the next stage? - If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined by the outcomeStrategy) is used. - - - - - - - - - - An enumeration that defines possible strategies for case outcome (approval) computation - currently both at the stage and campaign level. - (In the future, these uses might be split.) - - - - - - - If at least one reviewer approves, the result is "APPROVED" regardless of the other votes. - - - - - - - - - - If at least one reviewer denies (either via revoke or reduce), the result is "NOT APPROVED". - However, for the case to be approved, at least approval must be present. - - - - - - - - - - Approved if none of the reviewers denies (either via revoke or reduce). - So e.g. if nobody says anything, the case is approved. - - - - - - - - - - All reviewers must approve, i.e. no revoke, reduce, noResponse is acceptable. - - - - - - - - - - - - - TODO - - - - - - - - - - TODO - - - - - - - What (final) outcomes cause actual remediation (e.g. deletion of an assignment) if automated remediation is configured? - The default is "revoke". But more can be specified here, e.g. noResponse. - - - - - - - - - - - TODO - - - - 3.9 - - - - - - - How long after campaign is closed should automatic reiteration start? - The default is that reiteration starts only manually. - - - - - - - How many iterations are allowed for automatic start? After reaching the specified number of iterations - (irrespective of how they were started) automatic reiteration mechanism will be disabled for this - campaign. - - - - - - - How many iterations are allowed in total? After reaching the specified number of iterations - no new iterations can be opened. - - - - - - - - - - - An enumeration that defines possible styles for certification case remediation. - - - - - - - Resolution of revoked cases is fully automated. - - - - - - - - - - Non-conformant cases are only to be reported. - - - - - - - - - - - - - An enumeration that defines possible states of a certification campaign. - - - - - - - Campaign was created, but its first stage has not been started yet. - Current stage number is 0. - - - - - - - - - - Review is being carried out, in a given stage. - Current stage number is between 1 and N (number of stages). - - - - - - - - - - A given review stage was done. Next stage nor remediation (if any) has not started yet. - Current stage number indicates the number of stage that has been recently done. - - - - - - - - - - The last stage was closed, remediation (either automated or manual) is in progress. - - - - - - - - - - Review and possibly remediation is over. The campaign is closed. - - - - - - - - - - - - - - - Statistics give a set of access certification cases. - - - - - tns:markedAsDelegate - 4.0 - removed - - - - - - - - - - - - - - - - - - - - TODO - - - - - - - - - - - - - Configuration for access certification. - - - - - - - - - - What response types are available to reviewers? Empty list means all responses. - TODO should we configure also names of the responses? (probably no) - - - AccessCertificationConfigurationType.availableResponse - - - - - - - Instructions how to format reviewers comments before storing them into metadata. - EXPERIMENTAL - - - true - 3.7.1 - AccessCertificationConfigurationType.reviewerCommentsFormatting - - - - - - - - + + + + + + + + + TODO + + + + + + + + + + + + + + + + Definition of an access certification - a template for + a set of access certification campaigns. + + + + + + + + + The certification handler that should take care of certification campaigns + created according to this definition. + + + + + + + Specifies the standard scope of certifications of this type. (In the future it can be overridden + in specific certification campaign.) + + + + + + + The user that owns certification campaigns based on this definition. + + + tns:UserType + + + + + + + How the identified cases have to be resolved? + + + + + + + Configuration of the manual or automatic reiteration. + + + 3.9 + + + + + + + Definition of individual stages (reviewers, duration, ...). + + + + + + + Strategy used to compute review outcome for a given case, based on results of individual stages, + along with instructions when a case review advances from a stage to next one. + + + + + + + Denotes "ad hoc" certification campaign, i.e. one that is started by policy rules, not explicitly by a user. + + + 3.6 + + + + + + + ID that was used to auto-generate campaign name last time (null if none so far). + + + + + + + When the last campaign of this type was started (in its first iteration)? + + + + + + + When the last campaign of this type was closed? Deletion is not recorded in this attribute. + + + + + + + + + + + + + + + + + + + + + Access certification definition augmented with report-related information + (e.g. number of campaigns). + + EXPERIMENTAL. It is to be seen if this form is OK. + + + + + + + + + + + + + + + + + Access certification definition. + + + + + + + + + + + + + Definition of an access certification campaign stage. + + + + + + + + + + Stages are numbered from 1 onwards. + + + + + + + Stage name. + + + + + + + Stage description. + + + + + + + + How long should the stage last? + + + + + + + How to round the deadline (if at all)? The default is to 23:59:59 of the computed day. + + + + + + + How long before the end of stage should notifications be sent? + (Multiple values can be put here.) + + + + + + + Send notifications only to people that have not decided yet. + + + + + + + TODO + + + + + + + How to determine outcome of the approval process (e.g. if multiple reviewers are present)? + Default is oneAcceptAccepts. + + + + + + + What is the outcome if no reviewers are available? (This is not the same situation as if some reviewers were computed but none of them responded!) + + + + + + + What decisions stop the case from advancing to the next stage? + If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined at the campaign level) is used. + + + + + + + What decisions make the case to advance to the next stage? + If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined at the campaign level) is used. + + + + + + + What actions are to be applied to work items when given timer(s) occur. + EXPERIMENTAL + + + 3.6 + + + + + + + + + + + Specifies how to select reviewers for a campaign stage. + + + + + + + + + + User-readable name of this reviewer specification. (In case it is necessary.) + + + + + + + Description of this reviewer specification. + + + + + + + + Indicates that target object (Org, Role, Resource) owner(s) should be used as reviewer(s). + + + + + + + Indicates that target object (Org, Role, Resource) approver(s) should be used as reviewer(s). + + + + + + + Indicates that object (Org, Role) owner(s) should be used as reviewer(s). + + + + + + + Indicates that object (Org, Role) approver(s) should be used as reviewer(s). + + + + + + + Indicates that the object's managers should be used. The interpretation depends on what kind + of object there is. + + For a user, the managers of all organizations to which he/she belongs, are taken. + For an org, its managers are taken. + (For the future: For a role, if it has a parentOrgRef, managers of these are taken. If it has + none, no reviewers are contributed by this option.) + + + + + + + The most general way of specifying the reviewer. Inputs for such expressions are: + - certificationCase (current certification case), + - campaign (certification campaign object), + - reviewerSpecification (current reviewer specification). + Output is a collection of parent-less reviewer references (of type ObjectReferenceType). + + + + + + + If no reviewer(s) are computed by other means, this/these should be used. + + + tns:FocusType + + + + + + + These reviewers are always used. + + + tns:FocusType + + + + + + + + + + + Definition of an access certification campaign. + + + + + + + + + Specifies the definition for this certification campaign. + (It is optional, as there are also ad-hoc certifications with no pre-existing definition.) + + + tns:AccessCertificationDefinitionType + + + + + + + Specifies the owner of this certification campaign. + + + tns:UserType + + + + + + + The certification handler that should take care of this campaign. + + + + + + + Specifies the scope of this campaign. + + + + + + + How the identified cases have to be resolved? + + + + + + + Configuration of the manual or automatic reiteration. + + + 3.9 + + + + + + + Definition of individual stages. + + + + + + + Strategy used to compute review outcome for a given case, based on results of individual stages, + along with instructions when a case review advances from a stage to next one. + + + + + + + When this campaign has to start (or has started). + + + + + + + When this campaign has finished. + + + + + + + Which iteration this campaign is in. 1 means the regular (first) run; + 2 means first repetition, etc. + + + 3.9 + + + + + + + In which state is the current campaign. + + + + + + + The stage this campaign is in. + 0 means it has not started yet. + X in 1..N (where N is the number of defined stages) means that stage X is being carried out. + Y greater than N means the campaign has been already finished. + + + + + + + Stages for this campaign (already finished, current, or planned). + + + + + + + Certification cases for this campaign. + + + + + + + + + + + + + Information about a stage of a campaign. + + + + + + + + + + Which iteration this stage is part of. 1 means the first (i.e. regular) run. + + + 3.9 + + + + + + + TODO + + + + + + + Stage name. + + + + + + + Stage description. + + + + + + + + When this stage has started. + + + + + + + When this stage has to finish. + + + + + + + When this stage has actually finished. + + + + + + + The escalation level is currently the same for open all cases and their open work items in the stage. + (This might change in the future.) + + + + + + + + + + + Specifies the scope of an access certification campaign. + + + + + + + + + + User-readable name of this scope definition. (In case it is necessary.) + + + + + + + Description of this scope definition. + + + + + + + + + + + + + + + The most common way of specifying scope - providing type+search filter to select "base" objects + and then some means of deriving certification cases from them. + + + + + + + + + Type of objects to be selected for certification. + + + + + + + Filter to find objects for certification. + By default, all objects of a given type will be selected. + + + + + + + Expression that selects items that are to be included in the certification. + Exact use of this expression depends on the certification handler. + E.g. user assignment handler could call this expression individually with each assignment + to determine which assignments should be included and which should not. + + + + + + + Expression that produces certification cases. This can be any expression, whose input is an object + that has passed the search filter specified above, and its output is a list of certification cases. + An example: a groovy expression, creating certification cases by selecting user's + "risky" assignments (e.g. assignments to a roles of a given type/types). Another example + can be the computation of all assignments (direct and indirect ones), and selecting among these. + NOT IMPLEMENTED YET + + + + + + + + + + + + + Scope for assignment-related reviews. + + + + + + + + + + + + Should assignments be included in the certification? + + + + + + + Should inducements be included in the certification? + + + + + + + Should assignments/inducements of roles be included in the certification? + + + + + + + Should assignments/inducements of orgs be included in the certification? + + + + + + + Should assignments/inducements of resources be included in the certification? + + + + + + + Should assignments/inducements of services be included in the certification? + + + + + + + Should assignments/inducements of users (e.g. deputy relations) be included in the certification? + + + + + + + Should we approve only assignments/inducements that are currently enabled? + (I.e. with administrativeStatus either null or ENABLED) + + + + + + + Relation(s) which are to be considered. Value of q:any means "any relation". + If no relation is present, org:default (i.e. null) is assumed. + + + + + + + + + + + + + An item that has to be certified, viewed in the scope of a given certification campaign. + + + + + + + + + + Object (e.g. a user) that is being touched by this case. + + + tns:ObjectType + + + + + + + Quite an abstract parameter - describing the object of the certification case (e.g. a role, a resource, ...). + Used for selecting relevant cases for approvals. + + + tns:ObjectType + + + + + + + For parameterized certification items (e.g. assignments): a tenant parameter, if applicable. + See discussion on tenantRef in AssignmentType. + + + tns:OrgType + + + + + + + For parameterized certification items (e.g. assignments): an org parameter, if applicable. + See discussion on orgRef in AssignmentType. + + + tns:OrgType + + + + + + + If the target is assigned with activation information (e.g. validFrom/validTo/administrativeStatus) + here is the information copied. Note that other activation information (e.g. effectiveStatus) are + _not_ updated here and probably should be ignored. + + + + + + + + The number of current stage in which this case is. + E.g. currentOutcome relates to the currentStage. + Case is "enabled" for a current campaign stage if and only if case.currentStage == campaign.stageNumber. + + When opening a campaign stage, case's currentStage either advances (if it is transferred to stage being opened) + or stays at the existing value (if it is not). It then indicates the last stage this case + was reviewed in. + + + + + + + Iteration this case takes part of. Case is "enabled" for a current campaign stage if and only if + case.iteration == campaign.iteration (beware of null comparison). + + + + + + + Work items for this stage. Some might be completed. Work items are not deleted. + + + 3.6 + + + + + + + When was this certification case requested to be reviewed? + (Can be found in certification.stage.start but we need to + sort according to this value.) + + + + + + + When should this certification case be reviewed? + (Can be found in certification.stage.end but we need to + sort according to this value.) + + + + + + + Currently valid outcome, relevant to the current stage. It is recomputed on each reviewer's + response based on defined algorithms. If the case is not transferred into the next stage, + the value of this item stays as it is. + + + + + + + The outcome, taking into account all closed stages plus current stage (if any). + + + + + + + When was the review process for this case finished (for the current iteration)? + This value is cleared for cases entering the next iteration. + + + 3.9 + + + + + + + When was this certification case was remedied? + If null, this means that either remediation was not required + (either because the decision was "accept" or "abstain" or + because remediation mode was set to "none"). + + + + + + + Events that occurred during lifetime of this case. + + + + + + + + + + + + + + + + + + + + + + + + + + A work item for a certification case. + + + + 3.6 + + + + + + + + + When the decision was made or changed. + + + + + + + Which iteration this work item is part of. 1 means the first (i.e. regular) run. + + + 3.9 + + + + + + + + + + + + + + + + + + + + + Assignment that is being considered. + + + + + + + Indicates if the above assignment is an assignment or (in case of roles) an inducement. + + + + + + + + + + + + + An enumeration that defines possible reviewers' responses. + + + + + + + A.k.a. maintain, confirm, certify, approve, OK - the situation was approved and can be left + as it is. It is possible to enter a date when the approval will expire. Until this time + the item will be considered approved and will not be shown in the certification list + for the given certifier. (We have to decide how to implement this feature. The most simple + but not entirely correct solution is to set "validTo" date for a given assignment. But it + wouldn't work e.g. for indirect assignments.) + + + + + + + + + + A.k.a. reject, remove, "not OK" - the situation is unacceptable and has to be eliminated + or disabled. E.g. the assignment has to be removed or disabled. + + + + + + + + + + A.k.a. update - situation is not acceptable; however, simple elimination/disabling is not + necessary or not appropriate - someone has to look at this and try to find another solution. + + + + + + + + + + A.k.a. abstain - responsible person says he/she is not able to decide. + + + + + + + + + + Responsible person delegates the decision to someone else. + DEPRECATED + + + + + + + + + + No response was provided by the given reviewer. + (This state can be used e.g. to facilitate querying by state.) + + SHOULD NOT BE USED FOR INDIVIDUAL RESPONSES. (A null value should be used instead.) + But it's OK to use this for stage/case outcome. + + + + + + + + + + + + + + + Strategy used to compute review outcome for a given case, based on results of individual stages. + Default is oneDenyDenies. + + + + + + + What decisions stop the case from advancing to the next stage? + If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined by the outcomeStrategy) is used. + + + + + + + What decisions make the case to advance to the next stage? + If neither stopReviewOn nor advanceToNextStageOn is used, a default (defined by the outcomeStrategy) is used. + + + + + + + + + + An enumeration that defines possible strategies for case outcome (approval) computation - currently both at the stage and campaign level. + (In the future, these uses might be split.) + + + + + + + If at least one reviewer approves, the result is "APPROVED" regardless of the other votes. + + + + + + + + + + If at least one reviewer denies (either via revoke or reduce), the result is "NOT APPROVED". + However, for the case to be approved, at least approval must be present. + + + + + + + + + + Approved if none of the reviewers denies (either via revoke or reduce). + So e.g. if nobody says anything, the case is approved. + + + + + + + + + + All reviewers must approve, i.e. no revoke, reduce, noResponse is acceptable. + + + + + + + + + + + + + TODO + + + + + + + + + + TODO + + + + + + + What (final) outcomes cause actual remediation (e.g. deletion of an assignment) if automated remediation is configured? + The default is "revoke". But more can be specified here, e.g. noResponse. + + + + + + + + + + + TODO + + + + 3.9 + + + + + + + How long after campaign is closed should automatic reiteration start? + The default is that reiteration starts only manually. + + + + + + + How many iterations are allowed for automatic start? After reaching the specified number of iterations + (irrespective of how they were started) automatic reiteration mechanism will be disabled for this + campaign. + + + + + + + How many iterations are allowed in total? After reaching the specified number of iterations + no new iterations can be opened. + + + + + + + + + + + An enumeration that defines possible styles for certification case remediation. + + + + + + + Resolution of revoked cases is fully automated. + + + + + + + + + + Non-conformant cases are only to be reported. + + + + + + + + + + + + + An enumeration that defines possible states of a certification campaign. + + + + + + + Campaign was created, but its first stage has not been started yet. + Current stage number is 0. + + + + + + + + + + Review is being carried out, in a given stage. + Current stage number is between 1 and N (number of stages). + + + + + + + + + + A given review stage was done. Next stage nor remediation (if any) has not started yet. + Current stage number indicates the number of stage that has been recently done. + + + + + + + + + + The last stage was closed, remediation (either automated or manual) is in progress. + + + + + + + + + + Review and possibly remediation is over. The campaign is closed. + + + + + + + + + + + + + + + Statistics give a set of access certification cases. + + + + + tns:markedAsDelegate + 4.0 + removed + + + + + + + + + + + + + + + + + + + + TODO + + + + + + + + + + + + + Configuration for access certification. + + + + + + + + + + What response types are available to reviewers? Empty list means all responses. + TODO should we configure also names of the responses? (probably no) + + + AccessCertificationConfigurationType.availableResponse + + + + + + + Instructions how to format reviewers comments before storing them into metadata. + EXPERIMENTAL + + + true + 3.7.1 + AccessCertificationConfigurationType.reviewerCommentsFormatting + + + + + + + + diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd index 8504c951a36..b7acb4edabb 100755 --- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd @@ -10964,6 +10964,9 @@ Name of the parameter + + ParameterType.name + @@ -10971,6 +10974,9 @@ Parameter type + + ParameterType.type + @@ -10995,6 +11001,9 @@ Expression that determines parameter value. + + ExpressionParameterType.expression + @@ -12923,6 +12932,9 @@ It does not provide any further details. More details can be found in the "synchronizationSituationDescription" property. + + ShadowType.synchronizationTimestamp + @@ -25735,6 +25747,57 @@ + + + + Parameter used in filter expression. + + + 4.4 + ObjectCollectionReportEngineConfigurationType.parameter + + + + + + + Subreport with expression. + + + 4.4 + ObjectCollectionReportEngineConfigurationType.subreport + + + + + + + + + + + + Subreport with expression. + + + true + 4.4 + + + + + + + + + Order in which this entry is to be evaluated. (Related to other entries.) Smaller numbers + go first. Entries with no order go last. + + + SubreportParameterType.order + + + @@ -26541,6 +26604,18 @@ + + + + Paging for query. + + + true + 4.4 + GuiObjectListPanelConfigurationType.paging + + + @@ -27060,7 +27135,8 @@ User friendly display name of the search item (property) - SearchItemType.display + SearchItemType.displayName + true @@ -27128,6 +27204,30 @@ + + + + Define targetType when used type is ObjectReferenceType. + + + 4.4 + true + SearchFilterParameterType.targetType + + + + + + + Display properties of the parameter. + + + 4.4 + true + SearchFilterParameterType.display + + + diff --git a/infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl b/infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl index 40b92c9b5cc..20a065c1721 100644 --- a/infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl +++ b/infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl @@ -10,7 +10,6 @@ targetNamespace="http://midpoint.evolveum.com/xml/ns/public/model/model-3" xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/model/model-3" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" @@ -49,6 +48,8 @@ schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-3"/> + - - - - - Web service interface for jasper report data source provider - - - - - - - - - - - - - - - - - - - OID of an report to process - - - - - - - - - - - - - - - - List of objects that match given criteria. - - - - - - - - - - - - A request for searchObjects operation. - - - - - - - OID of an report to process - - - - - - - Script to evaluate - - - - - - - Parameters needed for script evaluation - - - - - - - - - - - A response from searchObjects operation. - - - - - - - List of objects that match given criteria. - - - - - - - - - - - - A request for searchObjects operation. - - - - - - - OID of an report to process - - - - - - - Script to evaluate - - - - - - - Parameters needed for script evaluation - - - - - - - - - - - A response from searchObjects operation. - - - - - - - List of objects that match given criteria. - - - - - - - - - - - - - A response from searchObjects operation. - - - - - - - - - - Remote parameters - - - - - - - - - - - A response from searchObjects operation. - - - - - - - - - - Name of the jasper report parameter - - - - - - - - Name of the jasper report parameter - - - - - - - - Type of the parameter, as XSD primitive type or midPoint static type. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/infra/schema/src/test/resources/diff/system-configuration-after.xml b/infra/schema/src/test/resources/diff/system-configuration-after.xml index 379371a9e98..7a00cac0ecd 100644 --- a/infra/schema/src/test/resources/diff/system-configuration-after.xml +++ b/infra/schema/src/test/resources/diff/system-configuration-after.xml @@ -47,11 +47,6 @@ OFF org.hibernate.internal.ExceptionMapperStandardImpl - - - OFF - net.sf.jasperreports.engine.fill.JRFillDataset - diff --git a/infra/schema/src/test/resources/diff/system-configuration-before.xml b/infra/schema/src/test/resources/diff/system-configuration-before.xml index 3ad60353cbd..663d246bbd9 100644 --- a/infra/schema/src/test/resources/diff/system-configuration-before.xml +++ b/infra/schema/src/test/resources/diff/system-configuration-before.xml @@ -57,26 +57,22 @@ org.hibernate.internal.ExceptionMapperStandardImpl - OFF - net.sf.jasperreports.engine.fill.JRFillDataset - - WARN org.apache.wicket.resource.PropertiesFactory - + ERROR org.springframework.context.support.ResourceBundleMessageSource - + INFO com.evolveum.midpoint.model.impl.lens.projector.Projector - + INFO com.evolveum.midpoint.model.impl.lens.Clockwork - + %date [%X{subsystem}] [%thread] %level \(%logger\): %msg%n MIDPOINT_LOG ${midpoint.home}/log/midpoint.log @@ -85,7 +81,7 @@ 100MB true - + %date %level: %msg%n MIDPOINT_PROFILE_LOG ${midpoint.home}/log/midpoint-profile.log @@ -111,7 +107,7 @@ - + performance Performance tracing true @@ -120,7 +116,7 @@ true true - + functional Functional tracing true @@ -132,7 +128,7 @@ normal - + functional-model-logging Functional tracing (with model logging) true @@ -141,16 +137,16 @@ true true - + com.evolveum.midpoint.model TRACE - + normal - + functional-sql-logging Functional tracing (with SQL logging) true @@ -159,19 +155,19 @@ true true - + org.hibernate.SQL TRACE - + normal - + /self/profile View/edit your profile @@ -182,7 +178,7 @@ http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#selfProfile http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#selfAll - + /self/credentials View/edit your credentials @@ -193,7 +189,7 @@ http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#selfCredentials http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#selfAll - + /admin/users @@ -202,7 +198,7 @@ red http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#users - + /admin/resources @@ -212,7 +208,7 @@ http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#resources - + my-cases @@ -230,7 +226,7 @@ - + manual-case-view @@ -246,7 +242,7 @@ - + operation-request-case-view @@ -262,7 +258,7 @@ - + approval-case-view @@ -278,7 +274,7 @@ - + recon-tasks-view 30 TaskType @@ -290,74 +286,74 @@ - + c:TaskType - + 150 - + extension/mext:workerThreads - + cleanupAfterCompletion - + threadStopAction - + binding - + 900 - + executionStatus - + unpauseAction - + taskIdentifier - + parent - + waitingReason - + stateBeforeSuspend - + category - + handlerUri - + lastRunStartTimestamp - + lastRunFinishTimestamp - + completionTimestamp - + 910 - + progress - + stalledSince @@ -365,7 +361,7 @@ - + safe "Safe" expression profile. It is supposed to contain only operations that are "safe", @@ -376,26 +372,26 @@ without any guarantees. Use at your own risk. deny - + asIs allow - + path allow - + value allow - + const allow - + script deny - - + script-safe deny - + com.evolveum.midpoint.xml.ns._public.common.common_3 MidPoint common schema - generated bean classes allow - + com.evolveum.prism.xml.ns._public.types_3 Prism schema - bean classes allow - + java.lang.Integer allow - + java.lang.Object Basic Java operations. deny - + equals allow - + hashCode allow - + java.lang.String String operations are generally safe. But Groovy is adding execute() method which is very dangerous. allow - + execute deny - + java.lang.CharSequence allow - + java.lang.Enum allow - + java.util.List List operations are generally safe. But Groovy is adding execute() method which is very dangerous. allow - + execute deny - + java.util.ArrayList List operations are generally safe. But Groovy is adding execute() method which is very dangerous. allow - + execute deny - + java.util.Map allow - + java.util.HashMap allow - + java.util.Date allow - + javax.xml.namespace.QName allow - + javax.xml.datatype.XMLGregorianCalendar allow - + java.lang.System Just a few methods of System are safe enough. deny - + currentTimeMillis allow - + java.lang.IllegalStateException Basic Java exception. Also used in test. allow - + java.lang.IllegalArgumentException Basic Java exception. allow - + com.evolveum.midpoint.model.common.expression.functions.BasicExpressionFunctions MidPoint basic functions library allow - + com.evolveum.midpoint.model.common.expression.functions.LogExpressionFunctions MidPoint logging functions library allow - + com.evolveum.midpoint.report.impl.ReportFunctions MidPoint report functions library allow - + org.apache.commons.lang.StringUtils Apache Commons: Strings allow diff --git a/model/certification-impl/src/main/resources/reports/_readme.txt b/model/certification-impl/src/main/resources/reports/_readme.txt deleted file mode 100644 index 22dc14433c6..00000000000 --- a/model/certification-impl/src/main/resources/reports/_readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -Jasper reports stored here are just source files to be used when generating initial objects or samples for certification-related reports. - -TODO consider moving to other place (along with other reports, perhaps) diff --git a/model/certification-impl/src/main/resources/reports/non-responders.xml b/model/certification-impl/src/main/resources/reports/non-responders.xml deleted file mode 100644 index e58b5ccdfe6..00000000000 --- a/model/certification-impl/src/main/resources/reports/non-responders.xml +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -