From 4af886ed9de485735c2258a8c9c73b6cb70e47e4 2017-12-21 16:08:10
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-12-21 16:08:10
Subject: [PATCH] Add catalogue handling
---

diff --git a/core/include/Catalogue/CatalogueController.h b/core/include/Catalogue/CatalogueController.h
index d31229b..caeb013 100644
--- a/core/include/Catalogue/CatalogueController.h
+++ b/core/include/Catalogue/CatalogueController.h
@@ -62,6 +62,7 @@ public:
     void updateCatalogue(std::shared_ptr<DBCatalogue> catalogue);
     void removeCatalogue(std::shared_ptr<DBCatalogue> catalogue);
     void saveCatalogue(std::shared_ptr<DBCatalogue> catalogue);
+    void discardCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool &removed);
 
     void saveAll();
     bool hasChanges() const;
diff --git a/core/src/Catalogue/CatalogueController.cpp b/core/src/Catalogue/CatalogueController.cpp
index 872f0b9..95607ca 100644
--- a/core/src/Catalogue/CatalogueController.cpp
+++ b/core/src/Catalogue/CatalogueController.cpp
@@ -30,7 +30,7 @@ static QString REPOSITORY_TRASH_SUFFIX = QString{"_trash"};
 /**
  * Possible types of an repository
  */
-enum class DBType { SYNC, WORK, TRASH};
+enum class DBType { SYNC, WORK, TRASH };
 class CatalogueController::CatalogueControllerPrivate {
 
 public:
@@ -41,9 +41,10 @@ public:
     QStringList m_RepositoryList;
     CatalogueController *m_Q;
 
-    QSet<QString> m_EventKeysWithChanges;
+    QSet<QString> m_KeysWithChanges;
 
     QString eventUniqueKey(const std::shared_ptr<DBEvent> &event) const;
+    QString catalogueUniqueKey(const std::shared_ptr<DBCatalogue> &catalogue) const;
 
     void copyDBtoDB(const QString &dbFrom, const QString &dbTo);
     QString toWorkRepository(QString repository);
@@ -53,7 +54,8 @@ public:
     void saveEvent(std::shared_ptr<DBEvent> event, bool persist = true);
     void saveCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool persist = true);
 
-    std::shared_ptr<IRequestPredicate> createFinder(const QUuid& uniqId, const QString & repository, DBType type);
+    std::shared_ptr<IRequestPredicate> createFinder(const QUuid &uniqId, const QString &repository,
+                                                    DBType type);
 };
 
 CatalogueController::CatalogueController(QObject *parent)
@@ -148,7 +150,7 @@ void CatalogueController::updateEvent(std::shared_ptr<DBEvent> event)
     event->setRepository(impl->toWorkRepository(event->getRepository()));
 
     auto uniqueId = impl->eventUniqueKey(event);
-    impl->m_EventKeysWithChanges.insert(uniqueId);
+    impl->m_KeysWithChanges.insert(uniqueId);
 
     impl->m_CatalogueDao.updateEvent(*event);
 }
@@ -197,13 +199,13 @@ void CatalogueController::addEvent(std::shared_ptr<DBEvent> event)
 
 
     auto uniqueId = impl->eventUniqueKey(event);
-    impl->m_EventKeysWithChanges.insert(uniqueId);
+    impl->m_KeysWithChanges.insert(uniqueId);
 }
 
 void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
 {
     impl->saveEvent(event, true);
-    impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
+    impl->m_KeysWithChanges.remove(impl->eventUniqueKey(event));
 }
 
 void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event, bool &removed)
@@ -219,7 +221,7 @@ void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event, bool &rem
 
         auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
         *event = workEvent;
-        impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
+        impl->m_KeysWithChanges.remove(impl->eventUniqueKey(event));
     }
     else {
         removed = true;
@@ -231,7 +233,7 @@ void CatalogueController::discardEvent(std::shared_ptr<DBEvent> event, bool &rem
 
 bool CatalogueController::eventHasChanges(std::shared_ptr<DBEvent> event) const
 {
-    return impl->m_EventKeysWithChanges.contains(impl->eventUniqueKey(event));
+    return impl->m_KeysWithChanges.contains(impl->eventUniqueKey(event));
 }
 
 std::list<std::shared_ptr<DBCatalogue> >
@@ -254,21 +256,22 @@ void CatalogueController::addCatalogue(std::shared_ptr<DBCatalogue> catalogue)
     auto catalogueTemp = *catalogue;
     impl->m_CatalogueDao.addCatalogue(catalogueTemp);
 
-    auto workPred = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::WORK);
+    auto workPred
+        = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::WORK);
 
     auto workCatalogue = impl->m_CatalogueDao.getCatalogue(workPred);
     *catalogue = workCatalogue;
 
-//    auto uniqueId = impl->eventUniqueKey(catalogue);
-//    impl->m_EventKeysWithChanges.insert(uniqueId);
+    auto uniqueId = impl->catalogueUniqueKey(catalogue);
+    impl->m_KeysWithChanges.insert(uniqueId);
 }
 
 void CatalogueController::updateCatalogue(std::shared_ptr<DBCatalogue> catalogue)
 {
     catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
 
-//    auto uniqueId = impl->eventUniqueKey(event);
-//    impl->m_EventKeysWithChanges.insert(uniqueId);
+    auto uniqueId = impl->catalogueUniqueKey(catalogue);
+    impl->m_KeysWithChanges.insert(uniqueId);
 
     impl->m_CatalogueDao.updateCatalogue(*catalogue);
 }
@@ -286,7 +289,32 @@ void CatalogueController::removeCatalogue(std::shared_ptr<DBCatalogue> catalogue
 void CatalogueController::saveCatalogue(std::shared_ptr<DBCatalogue> catalogue)
 {
     impl->saveCatalogue(catalogue, true);
-//    impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
+    impl->m_KeysWithChanges.remove(impl->catalogueUniqueKey(catalogue));
+}
+
+void CatalogueController::discardCatalogue(std::shared_ptr<DBCatalogue> catalogue, bool &removed)
+{
+    auto syncPred
+        = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::SYNC);
+    auto workPred
+        = impl->createFinder(catalogue->getUniqId(), catalogue->getRepository(), DBType::WORK);
+
+    auto syncCatalogue = impl->m_CatalogueDao.getCatalogue(syncPred);
+    if (!syncCatalogue.getUniqId().isNull()) {
+        removed = false;
+        impl->m_CatalogueDao.copyCatalogue(
+            syncCatalogue, impl->toWorkRepository(catalogue->getRepository()), true);
+
+        auto workCatalogue = impl->m_CatalogueDao.getCatalogue(workPred);
+        *catalogue = workCatalogue;
+        impl->m_KeysWithChanges.remove(impl->catalogueUniqueKey(catalogue));
+    }
+    else {
+        removed = true;
+        // Since the element wasn't in sync repository. Discard it means remove it
+        catalogue->setRepository(impl->toWorkRepository(catalogue->getRepository()));
+        impl->m_CatalogueDao.removeCatalogue(*catalogue);
+    }
 }
 
 void CatalogueController::saveAll()
@@ -306,12 +334,12 @@ void CatalogueController::saveAll()
     }
 
     impl->savAllDB();
-    impl->m_EventKeysWithChanges.clear();
+    impl->m_KeysWithChanges.clear();
 }
 
 bool CatalogueController::hasChanges() const
 {
-    return !impl->m_EventKeysWithChanges.isEmpty(); // TODO: catalogues
+    return !impl->m_KeysWithChanges.isEmpty();
 }
 
 QByteArray
@@ -400,6 +428,12 @@ QString CatalogueController::CatalogueControllerPrivate::eventUniqueKey(
     return event->getUniqId().toString().append(event->getRepository());
 }
 
+QString CatalogueController::CatalogueControllerPrivate::catalogueUniqueKey(
+    const std::shared_ptr<DBCatalogue> &catalogue) const
+{
+    return catalogue->getUniqId().toString().append(catalogue->getRepository());
+}
+
 void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom,
                                                                  const QString &dbTo)
 {
@@ -461,28 +495,28 @@ void CatalogueController::CatalogueControllerPrivate::saveCatalogue(
     }
 }
 
-std::shared_ptr<IRequestPredicate> CatalogueController::CatalogueControllerPrivate::createFinder(const QUuid &uniqId, const QString &repository, DBType type)
+std::shared_ptr<IRequestPredicate> CatalogueController::CatalogueControllerPrivate::createFinder(
+    const QUuid &uniqId, const QString &repository, DBType type)
 {
     // update catalogue parameter
-    auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
-        QString{"uniqId"}, uniqId, ComparaisonOperation::EQUALEQUAL);
+    auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(QString{"uniqId"}, uniqId,
+                                                                  ComparaisonOperation::EQUALEQUAL);
 
     auto repositoryType = repository;
     switch (type) {
-    case DBType::SYNC:
-        repositoryType = toSyncRepository(repositoryType);
-        break;
-    case DBType::WORK:
-        repositoryType =toWorkRepository(repositoryType);
-        break;
-    case DBType::TRASH:
-    default:
-        break;
+        case DBType::SYNC:
+            repositoryType = toSyncRepository(repositoryType);
+            break;
+        case DBType::WORK:
+            repositoryType = toWorkRepository(repositoryType);
+            break;
+        case DBType::TRASH:
+        default:
+            break;
     }
 
     auto repositoryPredicate = std::make_shared<ComparaisonPredicate>(
-        QString{"repository"}, repositoryType,
-        ComparaisonOperation::EQUALEQUAL);
+        QString{"repository"}, repositoryType, ComparaisonOperation::EQUALEQUAL);
 
     auto finderPred = std::make_shared<CompoundPredicate>(CompoundOperation::AND);
     finderPred->AddRequestPredicate(uniqIdPredicate);
diff --git a/gui/include/Catalogue/CatalogueSideBarWidget.h b/gui/include/Catalogue/CatalogueSideBarWidget.h
index 1d578a8..68f7390 100644
--- a/gui/include/Catalogue/CatalogueSideBarWidget.h
+++ b/gui/include/Catalogue/CatalogueSideBarWidget.h
@@ -33,6 +33,9 @@ public:
 
     QVector<std::shared_ptr<DBCatalogue> > getCatalogues(const QString &repository) const;
 
+private slots:
+    void emitSelection();
+
 private:
     Ui::CatalogueSideBarWidget *ui;
 
diff --git a/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h b/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h
index 7fc10fc..0135a5b 100644
--- a/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h
+++ b/gui/include/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.h
@@ -15,6 +15,7 @@ public:
     virtual ~CatalogueAbstractTreeItem();
 
     void addChild(CatalogueAbstractTreeItem *child);
+    void removeChild(CatalogueAbstractTreeItem *child);
     QVector<CatalogueAbstractTreeItem *> children() const;
     CatalogueAbstractTreeItem *parent() const;
 
diff --git a/gui/include/Catalogue/CatalogueTreeModel.h b/gui/include/Catalogue/CatalogueTreeModel.h
index ac14836..bc49d0d 100644
--- a/gui/include/Catalogue/CatalogueTreeModel.h
+++ b/gui/include/Catalogue/CatalogueTreeModel.h
@@ -27,6 +27,9 @@ public:
     QVector<CatalogueAbstractTreeItem *> topLevelItems() const;
 
     void addChildItem(CatalogueAbstractTreeItem *child, const QModelIndex &parentIndex);
+    void removeChildItem(CatalogueAbstractTreeItem *child, const QModelIndex &parentIndex);
+    /// Refresh the data for the specified index
+    void refresh(const QModelIndex &index);
 
     CatalogueAbstractTreeItem *item(const QModelIndex &index) const;
     QModelIndex indexOf(CatalogueAbstractTreeItem *item, int column = 0) const;
diff --git a/gui/src/Catalogue/CatalogueActionManager.cpp b/gui/src/Catalogue/CatalogueActionManager.cpp
index 398c83d..fd91426 100644
--- a/gui/src/Catalogue/CatalogueActionManager.cpp
+++ b/gui/src/Catalogue/CatalogueActionManager.cpp
@@ -65,8 +65,8 @@ struct CatalogueActionManager::CatalogueActionManagerPrivate {
 
 
         if (catalogue) {
-            // TODO
-            // catalogue->addEvent(event);
+            catalogue->addEvent(event->getUniqId());
+            sqpApp->catalogueController().updateCatalogue(catalogue);
             m_CatalogueExplorer->sideBarWidget().setCatalogueChanges(catalogue, true);
             if (m_CatalogueExplorer->eventsWidget().displayedCatalogues().contains(catalogue)) {
                 m_CatalogueExplorer->eventsWidget().addEvent(event);
@@ -131,7 +131,7 @@ void CatalogueActionManager::installSelectionZoneActions()
                 if (!selectedCatalogue) {
                     selectedCatalogue = std::make_shared<DBCatalogue>();
                     selectedCatalogue->setName(dialog.catalogueName());
-                    // sqpApp->catalogueController().addCatalogue(selectedCatalogue); TODO
+                    sqpApp->catalogueController().addCatalogue(selectedCatalogue);
                     impl->m_CatalogueExplorer->sideBarWidget().addCatalogue(selectedCatalogue,
                                                                             REPOSITORY_DEFAULT);
                 }
diff --git a/gui/src/Catalogue/CatalogueSideBarWidget.cpp b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
index 06db478..a71a3ef 100644
--- a/gui/src/Catalogue/CatalogueSideBarWidget.cpp
+++ b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
@@ -12,6 +12,7 @@
 #include <DBCatalogue.h>
 
 #include <QMenu>
+#include <QMessageBox>
 
 Q_LOGGING_CATEGORY(LOG_CatalogueSideBarWidget, "CatalogueSideBarWidget")
 
@@ -33,7 +34,7 @@ struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
                           const QModelIndex &databaseIndex);
 
     CatalogueTreeItem *getCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue) const;
-    void setHasChanges(bool value, const QModelIndex &index, QTreeView *treeView);
+    void setHasChanges(bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget);
     bool hasChanges(const QModelIndex &index, QTreeView *treeView);
 
     int selectionType(QTreeView *treeView) const
@@ -109,39 +110,77 @@ CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
     ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     ui->treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
 
-    auto emitSelection = [this]() {
-
-        auto selectionType = impl->selectionType(ui->treeView);
-
-        switch (selectionType) {
-            case CATALOGUE_ITEM_TYPE:
-                emit this->catalogueSelected(impl->selectedCatalogues(ui->treeView));
-                break;
-            case DATABASE_ITEM_TYPE:
-                emit this->databaseSelected(impl->selectedRepositories(ui->treeView));
-                break;
-            case ALL_EVENT_ITEM_TYPE:
-                emit this->allEventsSelected();
-                break;
-            case TRASH_ITEM_TYPE:
-                emit this->trashSelected();
-                break;
-            default:
-                emit this->selectionCleared();
-                break;
+    connect(ui->treeView, &QTreeView::clicked, this, &CatalogueSideBarWidget::emitSelection);
+    connect(ui->treeView->selectionModel(), &QItemSelectionModel::currentChanged, this,
+            &CatalogueSideBarWidget::emitSelection);
+
+
+    //    connect(ui->btnAdd, &QToolButton::clicked, [this]() {
+    //        QVector<std::shared_ptr<DBCatalogue> > catalogues;
+    //        impl->getSelectedItems(ui->treeView, events, eventProducts);
+
+    //        if (!events.isEmpty() && eventProducts.isEmpty()) {
+
+    //            if (QMessageBox::warning(this, tr("Remove Event(s)"),
+    //                                     tr("The selected event(s) will be completly removed "
+    //                                        "from the repository!\nAre you sure you want to
+    //                                        continue?"),
+    //                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+    //                == QMessageBox::Yes) {
+
+    //                for (auto event : events) {
+    //                    sqpApp->catalogueController().removeEvent(event);
+    //                    impl->removeEvent(event, ui->treeView);
+    //                }
+    //            }
+    //        }
+    //    });
+
+
+    connect(impl->m_TreeModel, &CatalogueTreeModel::itemDropped, [this](auto index) {
+        auto item = impl->m_TreeModel->item(index);
+        if (item && item->type() == CATALOGUE_ITEM_TYPE) {
+            auto catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
+            this->setCatalogueChanges(catalogue, true);
         }
-    };
+    });
+    connect(ui->btnRemove, &QToolButton::clicked, [this]() {
+        QVector<QPair<std::shared_ptr<DBCatalogue>, CatalogueAbstractTreeItem *> >
+            cataloguesToItems;
+        auto selectedIndexes = ui->treeView->selectionModel()->selectedRows();
+
+        for (auto index : selectedIndexes) {
+            auto item = impl->m_TreeModel->item(index);
+            if (item && item->type() == CATALOGUE_ITEM_TYPE) {
+                auto catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
+                cataloguesToItems << qMakePair(catalogue, item);
+            }
+        }
+
+        if (!cataloguesToItems.isEmpty()) {
+
+            if (QMessageBox::warning(this, tr("Remove Catalogue(s)"),
+                                     tr("The selected catalogues(s) will be completly removed "
+                                        "from the repository!\nAre you sure you want to continue?"),
+                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                == QMessageBox::Yes) {
+
+                for (auto catalogueToItem : cataloguesToItems) {
+                    sqpApp->catalogueController().removeCatalogue(catalogueToItem.first);
+                    impl->m_TreeModel->removeChildItem(
+                        catalogueToItem.second,
+                        impl->m_TreeModel->indexOf(catalogueToItem.second->parent()));
+                }
+            }
+        }
+    });
 
-    connect(ui->treeView, &QTreeView::clicked, emitSelection);
-    connect(ui->treeView->selectionModel(), &QItemSelectionModel::currentChanged, emitSelection);
-    connect(impl->m_TreeModel, &CatalogueTreeModel::itemRenamed, [emitSelection, this](auto index) {
+    connect(impl->m_TreeModel, &CatalogueTreeModel::itemRenamed, [this](auto index) {
         auto selectedIndexes = ui->treeView->selectionModel()->selectedRows();
         if (selectedIndexes.contains(index)) {
-            emitSelection();
+            this->emitSelection();
         }
-
-        auto item = impl->m_TreeModel->item(index);
-        impl->setHasChanges(true, index, ui->treeView);
+        impl->setHasChanges(true, index, this);
     });
 
     ui->treeView->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -166,7 +205,7 @@ void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalog
 {
     if (auto catalogueItem = impl->getCatalogueItem(catalogue)) {
         auto index = impl->m_TreeModel->indexOf(catalogueItem);
-        impl->setHasChanges(hasChanges, index, ui->treeView);
+        impl->setHasChanges(hasChanges, index, this);
         // catalogueItem->refresh();
     }
 }
@@ -189,6 +228,29 @@ CatalogueSideBarWidget::getCatalogues(const QString &repository) const
     return result;
 }
 
+void CatalogueSideBarWidget::emitSelection()
+{
+    auto selectionType = impl->selectionType(ui->treeView);
+
+    switch (selectionType) {
+        case CATALOGUE_ITEM_TYPE:
+            emit this->catalogueSelected(impl->selectedCatalogues(ui->treeView));
+            break;
+        case DATABASE_ITEM_TYPE:
+            emit this->databaseSelected(impl->selectedRepositories(ui->treeView));
+            break;
+        case ALL_EVENT_ITEM_TYPE:
+            emit this->allEventsSelected();
+            break;
+        case TRASH_ITEM_TYPE:
+            emit this->trashSelected();
+            break;
+        default:
+            emit this->selectionCleared();
+            break;
+    }
+}
+
 void CatalogueSideBarWidget::onContextMenuRequested(const QPoint &pos)
 {
     QMenu menu{this};
@@ -307,25 +369,48 @@ CatalogueTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getCat
     return nullptr;
 }
 
-void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::setHasChanges(bool value,
-                                                                          const QModelIndex &index,
-                                                                          QTreeView *treeView)
+void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::setHasChanges(
+    bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget)
 {
+    std::shared_ptr<DBCatalogue> catalogue = nullptr;
+    auto item = m_TreeModel->item(index);
+    if (item && item->type() == CATALOGUE_ITEM_TYPE) {
+        catalogue = static_cast<CatalogueTreeItem *>(item)->catalogue();
+    }
+
     auto validationIndex = index.sibling(index.row(), (int)CatalogueTreeModel::Column::Validation);
     if (value) {
-        if (!hasChanges(validationIndex, treeView)) {
+        if (!hasChanges(validationIndex, sideBarWidget->ui->treeView)) {
             auto widget = CatalogueExplorerHelper::buildValidationWidget(
-                treeView, [this, validationIndex,
-                           treeView]() { setHasChanges(false, validationIndex, treeView); },
-                [this, validationIndex, treeView]() {
-                    setHasChanges(false, validationIndex, treeView);
+                sideBarWidget->ui->treeView,
+                [this, validationIndex, sideBarWidget, catalogue]() {
+                    if (catalogue) {
+                        sqpApp->catalogueController().saveCatalogue(catalogue);
+                    }
+                    setHasChanges(false, validationIndex, sideBarWidget);
+                },
+                [this, validationIndex, sideBarWidget, catalogue, item]() {
+                    if (catalogue) {
+                        bool removed;
+                        sqpApp->catalogueController().discardCatalogue(catalogue, removed);
+
+                        if (removed) {
+                            m_TreeModel->removeChildItem(item,
+                                                         m_TreeModel->indexOf(item->parent()));
+                        }
+                        else {
+                            m_TreeModel->refresh(m_TreeModel->indexOf(item));
+                            setHasChanges(false, validationIndex, sideBarWidget);
+                        }
+                        sideBarWidget->emitSelection();
+                    }
                 });
-            treeView->setIndexWidget(validationIndex, widget);
+            sideBarWidget->ui->treeView->setIndexWidget(validationIndex, widget);
         }
     }
     else {
         // Note: the widget is destroyed
-        treeView->setIndexWidget(validationIndex, nullptr);
+        sideBarWidget->ui->treeView->setIndexWidget(validationIndex, nullptr);
     }
 }
 
diff --git a/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp b/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp
index 3fb084c..60cd390 100644
--- a/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp
+++ b/gui/src/Catalogue/CatalogueTreeItems/CatalogueAbstractTreeItem.cpp
@@ -24,6 +24,12 @@ void CatalogueAbstractTreeItem::addChild(CatalogueAbstractTreeItem *child)
     child->impl->m_Parent = this;
 }
 
+void CatalogueAbstractTreeItem::removeChild(CatalogueAbstractTreeItem *child)
+{
+    impl->m_Children.removeAll(child);
+    delete child;
+}
+
 QVector<CatalogueAbstractTreeItem *> CatalogueAbstractTreeItem::children() const
 {
     return impl->m_Children;
diff --git a/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp b/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp
index 78bcd4b..e4fc8b7 100644
--- a/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp
+++ b/gui/src/Catalogue/CatalogueTreeItems/CatalogueTreeItem.cpp
@@ -76,17 +76,27 @@ Qt::ItemFlags CatalogueTreeItem::flags(int column) const
 
 bool CatalogueTreeItem::canDropMimeData(const QMimeData *data, Qt::DropAction action)
 {
-    return data->hasFormat(MIME_TYPE_EVENT_LIST);
+    auto events = sqpApp->catalogueController().eventsForMimeData(data->data(MIME_TYPE_EVENT_LIST));
+    auto canDrop = data->hasFormat(MIME_TYPE_EVENT_LIST);
+
+    for (auto event : events) {
+        canDrop &= (event->getRepository() == impl->m_Catalogue->getRepository());
+    }
+    return canDrop;
 }
 
 bool CatalogueTreeItem::dropMimeData(const QMimeData *data, Qt::DropAction action)
 {
     Q_ASSERT(canDropMimeData(data, action));
-
-    auto events = sqpApp->catalogueController().eventsForMimeData(data->data(MIME_TYPE_EVENT_LIST));
-    // impl->m_Catalogue->addEvents(events); TODO: move events in the new catalogue
     // Warning: Check that the events aren't already in the catalogue
     // Also check for the repository !!!
+
+    auto events = sqpApp->catalogueController().eventsForMimeData(data->data(MIME_TYPE_EVENT_LIST));
+
+    for (auto event : events) {
+        impl->m_Catalogue->addEvent(event->getUniqId());
+        sqpApp->catalogueController().updateCatalogue(impl->m_Catalogue);
+    }
 }
 
 std::shared_ptr<DBCatalogue> CatalogueTreeItem::catalogue() const
diff --git a/gui/src/Catalogue/CatalogueTreeModel.cpp b/gui/src/Catalogue/CatalogueTreeModel.cpp
index 86ac456..2708821 100644
--- a/gui/src/Catalogue/CatalogueTreeModel.cpp
+++ b/gui/src/Catalogue/CatalogueTreeModel.cpp
@@ -46,6 +46,23 @@ void CatalogueTreeModel::addChildItem(CatalogueAbstractTreeItem *child,
     emit dataChanged(parentIndex, parentIndex);
 }
 
+void CatalogueTreeModel::removeChildItem(CatalogueAbstractTreeItem *child,
+                                         const QModelIndex &parentIndex)
+{
+    auto parentItem = item(parentIndex);
+    int i = parentItem->children().indexOf(child);
+    beginRemoveRows(parentIndex, i, i);
+    parentItem->removeChild(child);
+    endRemoveRows();
+
+    emit dataChanged(parentIndex, parentIndex);
+}
+
+void CatalogueTreeModel::refresh(const QModelIndex &index)
+{
+    emit dataChanged(index, index);
+}
+
 CatalogueAbstractTreeItem *CatalogueTreeModel::item(const QModelIndex &index) const
 {
     return static_cast<CatalogueAbstractTreeItem *>(index.internalPointer());
diff --git a/gui/ui/Catalogue/CatalogueSideBarWidget.ui b/gui/ui/Catalogue/CatalogueSideBarWidget.ui
index 7c99893..b097960 100644
--- a/gui/ui/Catalogue/CatalogueSideBarWidget.ui
+++ b/gui/ui/Catalogue/CatalogueSideBarWidget.ui
@@ -31,7 +31,7 @@
      <item>
       <widget class="QToolButton" name="btnAdd">
        <property name="enabled">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="text">
         <string>+</string>
@@ -48,7 +48,7 @@
      <item>
       <widget class="QToolButton" name="btnRemove">
        <property name="enabled">
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="text">
         <string> - </string>
@@ -100,7 +100,6 @@
  </widget>
  <resources>
   <include location="../../resources/sqpguiresources.qrc"/>
-  <include location="../../resources/sqpguiresources.qrc"/>
  </resources>
  <connections/>
 </ui>