Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E24BB200CB5 for ; Wed, 12 Jul 2017 08:40:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E0EBA16108D; Wed, 12 Jul 2017 06:40:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0C66F160E68 for ; Wed, 12 Jul 2017 08:40:18 +0200 (CEST) Received: (qmail 8880 invoked by uid 500); 12 Jul 2017 06:40:18 -0000 Mailing-List: contact dev-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list dev@syncope.apache.org Received: (qmail 8869 invoked by uid 99); 12 Jul 2017 06:40:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2017 06:40:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3303E96B2; Wed, 12 Jul 2017 06:40:16 +0000 (UTC) From: ilgrosso To: dev@syncope.apache.org Reply-To: dev@syncope.apache.org References: In-Reply-To: Subject: [GitHub] syncope pull request #50: Connector and Resource configuration versioning in... Content-Type: text/plain Message-Id: <20170712064016.E3303E96B2@git1-us-west.apache.org> Date: Wed, 12 Jul 2017 06:40:16 +0000 (UTC) archived-at: Wed, 12 Jul 2017 06:40:20 -0000 Github user ilgrosso commented on a diff in the pull request: https://github.com/apache/syncope/pull/50#discussion_r126874475 --- Diff: client/console/src/main/java/org/apache/syncope/client/console/panels/ResHistoryConfDirectoryPanel.java --- @@ -0,0 +1,180 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.client.console.panels; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.lang3.StringUtils; +import org.apache.syncope.client.console.SyncopeConsoleSession; +import org.apache.syncope.client.console.commons.Constants; +import org.apache.syncope.client.console.commons.ResHistoryConfDataProvider; +import org.apache.syncope.client.console.pages.BasePage; +import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; +import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.KeyPropertyColumn; +import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; +import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink; +import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink.ActionType; +import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel; +import org.apache.syncope.common.lib.types.StandardEntitlement; +import org.apache.syncope.common.lib.SyncopeClientException; +import org.apache.syncope.common.lib.to.ResourceHistoryConfTO; +import org.apache.wicket.PageReference; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; +import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.StringResourceModel; + +/** + * Connector history configuration instances page. + */ +public abstract class ResHistoryConfDirectoryPanel + extends ResHistoryDirectoryPanel implements ModalPanel { + + private static final long serialVersionUID = 7505440790684089152L; + + private final String entityKey; + + protected ResHistoryConfDirectoryPanel( + final BaseModal baseModal, + final MultilevelPanel multiLevelPanelRef, + final String entityKey, + final PageReference pageRef) { + super(baseModal, multiLevelPanelRef, pageRef); + + this.entityKey = entityKey; + initResultTable(); + } + + @Override + protected List> getColumns() { + final List> columns = new ArrayList<>(); + + columns.add(new KeyPropertyColumn( + new StringResourceModel("key", this), "key")); + + columns.add(new PropertyColumn(new StringResourceModel( + "creator", this), "creator", "creator")); + + columns.add(new DatePropertyColumn( + new StringResourceModel("creation", this), "creation", "creation")); + + return columns; + } + + @Override + public ActionsPanel getActions(final IModel model) { + final ActionsPanel panel = super.getActions(model); + final ResourceHistoryConfTO connHistoryConfTO = model.getObject(); + + // -- view + panel.add(new ActionLink() { + + private static final long serialVersionUID = -6745431735457245600L; + + @Override + public void onClick(final AjaxRequestTarget target, final ResourceHistoryConfTO modelObject) { + + ResHistoryConfDirectoryPanel.this.getTogglePanel().close(target); + viewConfiguration(modelObject, target); + target.add(modal); + } + }, ActionLink.ActionType.VIEW, StandardEntitlement.CONNECTOR_HISTORY_LIST); + + // -- restore + panel.add(new ActionLink() { + + private static final long serialVersionUID = -6745431735457245600L; + + @Override + public void onClick(final AjaxRequestTarget target, final ResourceHistoryConfTO modelObject) { + try { + restClient.restore(modelObject.getKey()); + SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); + target.add(container); + ResHistoryConfDirectoryPanel.this.getTogglePanel().close(target); + } catch (SyncopeClientException e) { + LOG.error("While executing {}", connHistoryConfTO.getKey(), e); + SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) + ? e.getClass().getName() : e.getMessage()); + } + ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); + } + }, ActionLink.ActionType.RELOAD, StandardEntitlement.CONNECTOR_HISTORY_RESTORE, true); + + // -- delete + panel.add(new ActionLink() { + + private static final long serialVersionUID = -6745431735457245600L; + + @Override + public void onClick(final AjaxRequestTarget target, final ResourceHistoryConfTO modelObject) { + try { + restClient.delete(modelObject.getKey()); + SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); + target.add(container); + ResHistoryConfDirectoryPanel.this.getTogglePanel().close(target); + } catch (SyncopeClientException e) { + LOG.error("While deleting {}", connHistoryConfTO.getKey(), e); + SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) + ? e.getClass().getName() : e.getMessage()); + } + ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); + } + }, ActionLink.ActionType.DELETE, StandardEntitlement.CONNECTOR_HISTORY_DELETE, true); + + return panel; + } + + @Override + protected Collection getBulkActions() { + return Collections.emptyList(); + } + + @Override + protected ResHistoryConfDataProvider dataProvider() { + return new ResHistoryConfProvider(rows); + } + + @Override + protected String paginatorRowsKey() { + return Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS; --- End diff -- Define a new constant, do no hijack propagation tasks' paginator. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---