Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mederly committed Jun 12, 2019
2 parents 6ecdfe7 + d7e69fc commit 814eddd
Show file tree
Hide file tree
Showing 55 changed files with 887 additions and 144 deletions.
2 changes: 1 addition & 1 deletion build-system/pom.xml
Expand Up @@ -685,7 +685,7 @@
<dependency>
<groupId>com.evolveum.polygon</groupId>
<artifactId>connector-ldap</artifactId>
<version>2.1</version>
<version>2.3-SNAPSHOT</version>
</dependency>
<!-- End connectors -->
<dependency>
Expand Down
Expand Up @@ -77,5 +77,14 @@ public class ComponentConstants {

public static final QName UI_FOCUS_TAB_MEMBERS = new QName(NS_COMPONENTS_PREFIX, "focusTabMembers");
public static final String UI_FOCUS_TAB_MEMBERS_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_MEMBERS);

public static final QName UI_CASE_TAB_OVERVIEW_MANUAL = new QName(NS_COMPONENTS_PREFIX, "caseTabOverviewManual");
public static final String UI_CASE_TAB_OVERVIEW_MANUAL_URL = QNameUtil.qNameToUri(UI_CASE_TAB_OVERVIEW_MANUAL);

public static final QName UI_CASE_TAB_OVERVIEW_REQUEST = new QName(NS_COMPONENTS_PREFIX, "caseTabOverviewRequest");
public static final String UI_CASE_TAB_OVERVIEW_REQUEST_URL = QNameUtil.qNameToUri(UI_CASE_TAB_OVERVIEW_REQUEST);

public static final QName UI_CASE_TAB_OVERVIEW_APPROVAL = new QName(NS_COMPONENTS_PREFIX, "caseTabOverviewApproval");
public static final String UI_CASE_TAB_OVERVIEW_APPROVAL_URL = QNameUtil.qNameToUri(UI_CASE_TAB_OVERVIEW_APPROVAL);

}
Expand Up @@ -81,6 +81,10 @@
<td class="prop-name"><wicket:message key="PageAuditLogDetails.taskOID" /></td>
<td><span wicket:id="taskOID" /></td>
</tr>
<tr>
<td class="prop-name"><wicket:message key="PageAuditLogDetails.requestIdentifier" /></td>
<td><span wicket:id="requestIdentifier" /></td>
</tr>
<tr>
<td class="prop-name"><wicket:message key="PageAuditLogDetails.hostIdentifier" /></td>
<td><span wicket:id="hostIdentifier" /></td>
Expand Down
Expand Up @@ -80,6 +80,7 @@ public class PageAuditLogDetails extends PageBase {
private static final String ID_PARAMETERS_EVENT_IDENTIFIER = "eventIdentifier";
private static final String ID_PARAMETERS_SESSION_IDENTIFIER = "sessionIdentifier";
private static final String ID_PARAMETERS_TASK_IDENTIFIER = "taskIdentifier";
private static final String ID_PARAMETERS_REQUEST_IDENTIFIER = "requestIdentifier";
private static final String ID_PARAMETERS_TASK_OID = "taskOID";
private static final String ID_PARAMETERS_HOST_IDENTIFIER = "hostIdentifier";
private static final String ID_PARAMETERS_NODE_IDENTIFIER = "nodeIdentifier";
Expand Down Expand Up @@ -293,6 +294,10 @@ private void initEventPanel(WebMarkupContainer eventPanel){
taskOID.setOutputMarkupId(true);
eventDetailsPanel.add(taskOID);

final Label requestIdentifier = new Label(ID_PARAMETERS_REQUEST_IDENTIFIER, new PropertyModel(recordModel,ID_PARAMETERS_REQUEST_IDENTIFIER));
requestIdentifier.setOutputMarkupId(true);
eventDetailsPanel.add(requestIdentifier);

final Label hostIdentifier = new Label(ID_PARAMETERS_HOST_IDENTIFIER, new PropertyModel(recordModel,ID_PARAMETERS_HOST_IDENTIFIER));
hostIdentifier.setOutputMarkupId(true);
eventDetailsPanel.add(hostIdentifier);
Expand Down
Expand Up @@ -68,16 +68,20 @@
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.hostIdentifierLabel" /></label>
<div class="col-sm-9" wicket:id="hostIdentifierField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.requestIdentifier" /></label>
<div class="col-sm-9" wicket:id="requestIdentifierField" />
</div>
<div class="form-group" wicket:id="valueRefTargetNames">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.valueRefTargetNamesLabel" /></label>
<div class="col-sm-9" wicket:id="valueRefTargetNamesField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label" wicket:id="usedQueryLabel"/>
<div wicket:id="usedQueryContainer" class="form-group">
<label class="col-sm-3 control-label" ><wicket:message key="PageAuditLogViewer.usedQueryLabel" /></label>
<div class="col-sm-9" wicket:id="usedQueryField" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label" wicket:id="usedIntervalLabel"/>
<div wicket:id="usedIntervalContainer" class="form-group">
<label class="col-sm-3 control-label"><wicket:message key="PageAuditLogViewer.usedIntervalLabel" /></label>
<div class="col-sm-9" wicket:id="usedIntervalField" />
</div>
<div class="main-button-bar pull-right">
Expand Down
Expand Up @@ -114,11 +114,10 @@ public abstract class AuditLogViewerPanel extends BasePanel<AuditSearchDto> {
private static final String ID_VALUE_REF_TARGET_NAMES_FIELD = "valueRefTargetNamesField";
private static final String ID_VALUE_REF_TARGET_NAMES = "valueRefTargetNames";
private static final String ID_USED_QUERY = "usedQueryField";
private static final String ID_USED_QUERY_LABEL = "usedQueryLabel";
private static final String ID_USED_QUERY_LABEL_KEY = "PageAuditLogViewer.usedQueryLabel";
private static final String ID_USED_QUERY_CONTAINER = "usedQueryContainer";
private static final String ID_USED_INTERVAL = "usedIntervalField";
private static final String ID_USED_INTERVAL_LABEL = "usedIntervalLabel";
private static final String ID_USED_INTERVAL_LABEL_KEY = "PageAuditLogViewer.usedIntervalLabel";
private static final String ID_USED_INTERVAL_CONTAINER = "usedIntervalContainer";
private static final String ID_REQUEST_IDENTIFIER_FIELD = "requestIdentifierField";

private static final String ID_MAIN_FORM = "mainForm";
private static final String ID_SEARCH_BUTTON = "searchButton";
Expand Down Expand Up @@ -198,25 +197,32 @@ private void initParametersPanel(Form mainForm) {
hostIdentifier.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
hostIdentifier.setOutputMarkupId(true);
parametersPanel.add(hostIdentifier);

Label usedQueryLabel = new Label(ID_USED_QUERY_LABEL, getString(ID_USED_QUERY_LABEL_KEY));
usedQueryLabel.add(getVisibleBehaviourForUsedQueryComponent());
parametersPanel.add(usedQueryLabel);

TextPanel<String> requestIdentifier = new TextPanel<>(ID_REQUEST_IDENTIFIER_FIELD, new PropertyModel<>(getModel(),
AuditSearchDto.F_REQUEST_IDENTIFIER));
requestIdentifier.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
requestIdentifier.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
requestIdentifier.setOutputMarkupId(true);
parametersPanel.add(requestIdentifier);

WebMarkupContainer usedQueryContainer = new WebMarkupContainer(ID_USED_QUERY_CONTAINER);
usedQueryContainer.add(getVisibleBehaviourForUsedQueryComponent());
usedQueryContainer.setOutputMarkupId(true);
parametersPanel.add(usedQueryContainer);

TextPanel<String> usedQuery = new TextPanel<>(ID_USED_QUERY, new PropertyModel<>(getModel(),
AuditSearchDto.F_COLLECTION + ".auditSearch.recordQuery"));
usedQuery.getBaseFormComponent().add(getVisibleBehaviourForUsedQueryComponent());
usedQuery.setOutputMarkupId(true);
usedQuery.setEnabled(false);
parametersPanel.add(usedQuery);

Label usedIntervalLabel = new Label(ID_USED_INTERVAL_LABEL, getString(ID_USED_INTERVAL_LABEL_KEY));
usedIntervalLabel.add(getVisibleBehaviourForUsedQueryComponent());
parametersPanel.add(usedIntervalLabel);
WebMarkupContainer usedIntervalContainer = new WebMarkupContainer(ID_USED_INTERVAL_CONTAINER);
usedIntervalContainer.setOutputMarkupId(true);
usedIntervalContainer.add(getVisibleBehaviourForUsedQueryComponent());
parametersPanel.add(usedIntervalContainer);

TextPanel<String> usedInterval = new TextPanel<>(ID_USED_INTERVAL, new PropertyModel<>(getModel(),
AuditSearchDto.F_COLLECTION + ".auditSearch.interval"));
usedInterval.getBaseFormComponent().add(getVisibleBehaviourForUsedQueryComponent());
usedInterval.setOutputMarkupId(true);
usedInterval.setEnabled(false);
parametersPanel.add(usedInterval);
Expand Down Expand Up @@ -442,6 +448,7 @@ private Map<String, Object> getAuditEventProviderParameters() {
parameters.put(AuditEventRecordProvider.PARAMETER_CHANNEL, search.getChannel().getChannel());
}
parameters.put(AuditEventRecordProvider.PARAMETER_HOST_IDENTIFIER, search.getHostIdentifier());
parameters.put(AuditEventRecordProvider.PARAMETER_REQUEST_IDENTIFIER, search.getRequestIdentifier());

if (search.getInitiatorName() != null) {
parameters.put(AuditEventRecordProvider.PARAMETER_INITIATOR_NAME, search.getInitiatorName().getOid());
Expand Down
Expand Up @@ -74,6 +74,7 @@ public class AuditEventRecordProvider extends BaseSortableDataProvider<AuditEven
public static final String PARAMETER_INITIATOR_NAME = "initiatorName";
public static final String PARAMETER_CHANNEL = "channel";
public static final String PARAMETER_HOST_IDENTIFIER = "hostIdentifier";
public static final String PARAMETER_REQUEST_IDENTIFIER = "requestIdentifier";
public static final String PARAMETER_TARGET_OWNER_NAME = "targetOwnerName";
public static final String PARAMETER_TARGET_NAMES = "targetNames";
public static final String PARAMETER_TASK_IDENTIFIER = "taskIdentifier";
Expand Down Expand Up @@ -216,6 +217,11 @@ private String generateFullQuery(Map<String, Object> parameters, boolean ordered
} else {
parameters.remove(PARAMETER_HOST_IDENTIFIER);
}
if (parameters.get(PARAMETER_REQUEST_IDENTIFIER) != null) {
conditions.add("aer.requestIdentifier = :requestIdentifier");
} else {
parameters.remove(PARAMETER_REQUEST_IDENTIFIER);
}
if (parameters.get(PARAMETER_TARGET_OWNER_NAME) != null) {
conditions.add("aer.targetOwnerOid = :targetOwnerName");
} else {
Expand Down
Expand Up @@ -46,6 +46,7 @@ public class AuditSearchDto implements Serializable {
public static final String F_INITIATOR_NAME = "initiatorName";
public static final String F_CHANNEL = "channel";
public static final String F_HOST_IDENTIFIER = "hostIdentifier";
public static final String F_REQUEST_IDENTIFIER = "requestIdentifier";
public static final String F_TARGET_NAME = "targetName";
public static final String F_TARGET_NAMES_OBJECTS = "targetNamesObjects";
public static final String F_TARGET_OWNER_NAME = "targetOwnerName";
Expand All @@ -61,6 +62,7 @@ public class AuditSearchDto implements Serializable {
private ObjectReferenceType initiatorName;
private Channel channel;
private String hostIdentifier;
private String requestIdentifier;
private List<ObjectReferenceType> targetNames = new ArrayList<>();
private List<ObjectType> targetNamesObjects = new ArrayList<>();
private ObjectReferenceType targetOwnerName;
Expand Down Expand Up @@ -114,6 +116,14 @@ public void setHostIdentifier(String hostIdentifier) {
this.hostIdentifier = hostIdentifier;
}

public String getRequestIdentifier() {
return requestIdentifier;
}

public void setRequestIdentifier(String requestIdentifier) {
this.requestIdentifier = requestIdentifier;
}

public List<ObjectReferenceType> getTargetNames() {
return targetNames;
}
Expand Down
Expand Up @@ -739,7 +739,7 @@ supportedTypes, new QNameObjectTypeChoiceRenderer(){

@Override
public Object getDisplayValue(QName qname) {
if (qname == null || AssignmentHolderType.COMPLEX_TYPE.equals(qname)){
if (qname == null || FocusType.COMPLEX_TYPE.equals(qname)){
return StringUtils.leftPad(createStringResource("ObjectTypes.all").getString(), 1);
} else {
return super.getDisplayValue(qname);
Expand All @@ -750,7 +750,7 @@ public Object getDisplayValue(QName qname) {
public QName getObject(String id, IModel<? extends List<? extends QName>> choices) {
QName qname = super.getObject(id, choices);
if (qname == null){
return AssignmentHolderType.COMPLEX_TYPE;
return FocusType.COMPLEX_TYPE;
}
return qname;
}
Expand Down
Expand Up @@ -30,6 +30,16 @@
<cssClass>fa fa-hand-paper-o</cssClass>
</icon>
</display>
<adminGuiConfiguration>
<objectDetails>
<forms>
<formSpecification>
<panelUri>http://midpoint.evolveum.com/xml/ns/public/gui/component-3#caseTabOverviewManual</panelUri>
</formSpecification>
<includeDefaultForms>true</includeDefaultForms>
</forms>
</objectDetails>
</adminGuiConfiguration>
</archetypePolicy>
<assignment>
<assignmentRelation>
Expand Down
Expand Up @@ -30,6 +30,16 @@
<cssClass>fa fa-play-circle</cssClass>
</icon>
</display>
<adminGuiConfiguration>
<objectDetails>
<forms>
<formSpecification>
<panelUri>http://midpoint.evolveum.com/xml/ns/public/gui/component-3#caseTabOverviewRequest</panelUri>
</formSpecification>
<includeDefaultForms>true</includeDefaultForms>
</forms>
</objectDetails>
</adminGuiConfiguration>
</archetypePolicy>
<assignment>
<assignmentRelation>
Expand Down
Expand Up @@ -30,6 +30,16 @@
<cssClass>fe fe-approver</cssClass>
</icon>
</display>
<adminGuiConfiguration>
<objectDetails>
<forms>
<formSpecification>
<panelUri>http://midpoint.evolveum.com/xml/ns/public/gui/component-3#caseTabOverviewApproval</panelUri>
</formSpecification>
<includeDefaultForms>true</includeDefaultForms>
</forms>
</objectDetails>
</adminGuiConfiguration>
</archetypePolicy>
<assignment>
<assignmentRelation>
Expand Down
Expand Up @@ -3993,6 +3993,7 @@ PageAuditLogViewer.eventStageShortLabel=Stage
PageAuditLogViewer.outcomeLabel=Outcome
PageAuditLogViewer.changedItem=Item changed
PageAuditLogViewer.valueRefTargetNamesLabel=Reference Target
PageAuditLogViewer.requestIdentifier=Request identifier
AuditLogViewerPanel.dateValidatorMessage=From date must be before To date.
AuditLogViewerPanel.resetSearchButton=Reset search
AuditEventRecordType.timestamp=Time
Expand All @@ -4015,6 +4016,7 @@ PageAuditLogDetails.eventResult=Result
PageAuditLogDetails.eventOutcome=Outcome
PageAuditLogDetails.sessionIdentifier=Session Identifier
PageAuditLogDetails.taskIdentifier=Task Identifier
PageAuditLogDetails.requestIdentifier=Request Identifier
PageAuditLogDetails.taskOID=Task oid
PageAuditLogDetails.hostIdentifier=Host Identifier
PageAuditLogDetails.nodeIdentifier=Node
Expand Down
Expand Up @@ -2737,7 +2737,8 @@ DownloadButtonPanel.download=Stáhnout
ReconciliationPopupPanel.resource=Aplikace
ReconciliationPopupPanel.title.basic=Základní konfigurace reportů rekonciliace
repeater.input.nullValid=Vyberte jeden
RepoInitialSetup.message.init.fatalError=Selhaly kroky následné inicializaci repozitáře.
RepoInitialSetup.message.init.fatalError=Došlo k selhání akcí návazných na inicializaci repozitáře.
RepoCacheInitialSetup.message.init.fatalError=Došlo k selhání akcí návazných na inicializaci mezipaměti repozitáře.
ReportConfigurationPanel.title.basic=Základní
ReportConfigurationPanel.title.advanced=Rozšířený
Requestable.ALL=Vše
Expand Down Expand Up @@ -3948,6 +3949,7 @@ PageAuditLogViewer.eventStageShortLabel=Fáze
PageAuditLogViewer.outcomeLabel=Výsledek
PageAuditLogViewer.changedItem=Změněná položka
PageAuditLogViewer.valueRefTargetNamesLabel=Cíl odkazu
PageAuditLogViewer.requestIdentifier=Identifikátor žádosti
AuditLogViewerPanel.dateValidatorMessage=Položka Datum od musí být před položkou Datum do.
AuditLogViewerPanel.resetSearchButton=Resetovat vyhledávání
AuditEventRecordType.timestamp=Čas
Expand All @@ -3970,6 +3972,7 @@ PageAuditLogDetails.eventResult=Výsledek
PageAuditLogDetails.eventOutcome=Výsledek
PageAuditLogDetails.sessionIdentifier=Identifikátor sezení
PageAuditLogDetails.taskIdentifier=Identifikátor úlohy
PageAuditLogDetails.requestIdentifier=Identifikátor žádosti
PageAuditLogDetails.taskOID=Oid úlohy
PageAuditLogDetails.hostIdentifier=Identifikátor hostitele
PageAuditLogDetails.nodeIdentifier=Uzel
Expand Down Expand Up @@ -4251,8 +4254,8 @@ chooseFocusTypeAndRelationDialogPanel.tooltip.type=Příjemce přiřazení/Typ c
abstractRoleMemberPanel.menu.assign=Přiřadit
abstractRoleMemberPanel.menu.assignMember=Assign {0} member {1}
abstractRoleMemberPanel.menu.createMember=Create {0} member {1}
abstractRoleMemberPanel.withRelation=with {0} relation
abstractRoleMemberPanel.withType={0} type
abstractRoleMemberPanel.withRelation=se vztahem {0}
abstractRoleMemberPanel.withType=typ: {0}
abstractRoleMemberPanel.menu.unassign=Odebrat přiřazení
abstractRoleMemberPanel.menu.recompute=Přepočítat
abstractRoleMemberPanel.menu.create=Vytvořit
Expand Down
Expand Up @@ -2738,6 +2738,7 @@ ReconciliationPopupPanel.resource=Ressource
ReconciliationPopupPanel.title.basic=Basis Abstimmungsbericht Konfiguration
repeater.input.nullValid=Auswählen
RepoInitialSetup.message.init.fatalError=Repository post initialization failed.
RepoCacheInitialSetup.message.init.fatalError=Repository cache post initialization failed.
ReportConfigurationPanel.title.basic=grundlegend
ReportConfigurationPanel.title.advanced=erweitert
Requestable.ALL=Alle
Expand Down Expand Up @@ -3948,6 +3949,7 @@ PageAuditLogViewer.eventStageShortLabel=Phase
PageAuditLogViewer.outcomeLabel=Ergebnis
PageAuditLogViewer.changedItem=Element verändert
PageAuditLogViewer.valueRefTargetNamesLabel=Referenzziel
PageAuditLogViewer.requestIdentifier=Request identifier
AuditLogViewerPanel.dateValidatorMessage=Das "Von Datum" muss vor dem "Bis Datum" liegen
AuditLogViewerPanel.resetSearchButton=Suche zurücksetzen
AuditEventRecordType.timestamp=Zeit
Expand All @@ -3970,6 +3972,7 @@ PageAuditLogDetails.eventResult=Ergebnis
PageAuditLogDetails.eventOutcome=Ergebnis
PageAuditLogDetails.sessionIdentifier=Session Bezeichner
PageAuditLogDetails.taskIdentifier=Aufgaben Bezeichner
PageAuditLogDetails.requestIdentifier=Request Identifier
PageAuditLogDetails.taskOID=Aufgabe oid
PageAuditLogDetails.hostIdentifier=System Bezeichner
PageAuditLogDetails.nodeIdentifier=Knoten
Expand Down
Expand Up @@ -2738,6 +2738,7 @@ ReconciliationPopupPanel.resource=Resource
ReconciliationPopupPanel.title.basic=Basic Reconciliation Report Configuration
repeater.input.nullValid=Choose One
RepoInitialSetup.message.init.fatalError=Repository post initialization failed.
RepoCacheInitialSetup.message.init.fatalError=Repository cache post initialization failed.
ReportConfigurationPanel.title.basic=Basic
ReportConfigurationPanel.title.advanced=Advanced
Requestable.ALL=All
Expand Down Expand Up @@ -3948,6 +3949,7 @@ PageAuditLogViewer.eventStageShortLabel=Stage
PageAuditLogViewer.outcomeLabel=Outcome
PageAuditLogViewer.changedItem=Item changed
PageAuditLogViewer.valueRefTargetNamesLabel=Reference Target
PageAuditLogViewer.requestIdentifier=Request identifier
AuditLogViewerPanel.dateValidatorMessage=From date must be before To date.
AuditLogViewerPanel.resetSearchButton=Reset search
AuditEventRecordType.timestamp=Time
Expand All @@ -3970,6 +3972,7 @@ PageAuditLogDetails.eventResult=Result
PageAuditLogDetails.eventOutcome=Outcome
PageAuditLogDetails.sessionIdentifier=Session Identifier
PageAuditLogDetails.taskIdentifier=Task Identifier
PageAuditLogDetails.requestIdentifier=Request Identifier
PageAuditLogDetails.taskOID=Task oid
PageAuditLogDetails.hostIdentifier=Host Identifier
PageAuditLogDetails.nodeIdentifier=Node
Expand Down

0 comments on commit 814eddd

Please sign in to comment.