Compare commits
22 Commits
task_21363
...
master
22
.classpath
22
.classpath
|
|
@ -11,16 +11,6 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
|
|
@ -34,6 +24,16 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="lib" path="/home/francescomangiacrapa/.m2/repository/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
|
|
|||
11
.project
11
.project
|
|
@ -15,16 +15,6 @@
|
|||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
|
|
@ -42,7 +32,6 @@
|
|||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
|
||||
<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
|
||||
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
eclipse.preferences.version=1
|
||||
lastWarOutDir=/home/francescomangiacrapa/git/ckan-content-moderator-widget/target/ckan-content-moderator-widget-0.1.0-SNAPSHOT
|
||||
warSrcDir=src/main/webapp
|
||||
jarsExcludedFromWebInfLib=
|
||||
lastWarOutDir=/home/francescomangiacrapa/git/ckan-content-moderator-widget/target/ckan-content-moderator-widget-1.2.0-SNAPSHOT
|
||||
warSrcDir=
|
||||
warSrcDirIsOutput=false
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
eclipse.preferences.version=1
|
||||
entryPointModules=
|
||||
filesCopiedToWebInfLib=
|
||||
gwtSyncCodeServer=true
|
||||
|
|
|
|||
|
|
@ -1,53 +1,59 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-module deploy-name="ckan-content-moderator-widget-0.1.0-SNAPSHOT">
|
||||
|
||||
|
||||
|
||||
<wb-module deploy-name="ckan-content-moderator-widget-1.2.0-SNAPSHOT">
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
|
||||
|
||||
<dependent-module archiveName="catalogue-util-library-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/catalogue-util-library/catalogue-util-library">
|
||||
|
||||
|
||||
<dependency-type>uses</dependency-type>
|
||||
|
||||
|
||||
</dependent-module>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<property name="context-root" value="ckan-content-moderator-widget"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<property name="java-output-path" value="/ckan-content-moderator-widget/target/ckan-content-moderator-widget-0.1.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
|
||||
<property name="java-output-path" value="/ckan-content-moderator-widget/target/classes"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<root>
|
||||
<facet id="jst.jaxrs">
|
||||
<node name="libprov">
|
||||
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
|
||||
</node>
|
||||
</facet>
|
||||
</root>
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<faceted-project>
|
||||
<fixed facet="wst.jsdt.web"/>
|
||||
<installed facet="jst.web" version="2.3"/>
|
||||
<installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
|
||||
<installed facet="wst.jsdt.web" version="1.0"/>
|
||||
<installed facet="java" version="1.8"/>
|
||||
<installed facet="jst.jaxrs" version="2.0"/>
|
||||
<installed facet="jst.utility" version="1.0"/>
|
||||
</faceted-project>
|
||||
|
|
|
|||
25
CHANGELOG.md
25
CHANGELOG.md
|
|
@ -4,8 +4,31 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [v1.2.0] - 2023-01-19
|
||||
|
||||
## [v1.0.0-SNAPSHOT] - 2022-04-04
|
||||
#### Enhancements
|
||||
|
||||
- [#23903] Catalogue Moderation: allow to send a message to the moderators on reject to pending operation
|
||||
- [#24519] Added social_post=true to approve request
|
||||
|
||||
## [v1.1.1] - 2022-10-27
|
||||
|
||||
#### Fixing
|
||||
|
||||
- GWT-Servlet at provided
|
||||
|
||||
## [v1.1.0] - 2022-08-01
|
||||
|
||||
#### Enhancements
|
||||
|
||||
- [#23692] Optimized the listing and the paging of catalogue items
|
||||
|
||||
## [v1.0.1] - 2022-06-27
|
||||
|
||||
- [#23525] Removed the scope of xml-apis dependency
|
||||
- Moved to maven-portal-bom v3.6.4
|
||||
|
||||
## [v1.0.0] - 2022-05-18
|
||||
|
||||
- [#21363] Implemented the ckan-content-moderator-widget
|
||||
- [#20650] Provided moderator skills to Catalogue Moderator(s)
|
||||
|
|
|
|||
22
pom.xml
22
pom.xml
|
|
@ -14,7 +14,7 @@
|
|||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>ckan-content-moderator-widget</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>1.2.0</version>
|
||||
<name>gCube Ckan Content Moderator Widget</name>
|
||||
|
||||
<description>
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>maven-portal-bom</artifactId>
|
||||
<version>3.6.3-SNAPSHOT</version>
|
||||
<version>3.6.4</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
<exclusions>
|
||||
|
|
@ -66,22 +66,6 @@
|
|||
|
||||
<dependencies>
|
||||
|
||||
<!-- needed to compile/run in devMode with gwt > 2.7 -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- needed to compile/run in devMode with gwt > 2.7 -->
|
||||
<dependency>
|
||||
<groupId>xml-apis</groupId>
|
||||
<artifactId>xml-apis</artifactId>
|
||||
<version>1.4.01</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.gwt</groupId>
|
||||
<artifactId>gwt-user</artifactId>
|
||||
|
|
@ -92,7 +76,7 @@
|
|||
<groupId>com.google.gwt</groupId>
|
||||
<artifactId>gwt-servlet</artifactId>
|
||||
<version>${gwtVersion}</version>
|
||||
<scope>runtime</scope>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.gwt</groupId>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,10 @@ public class CkanContentModeratorCheckConfigs {
|
|||
attemptLC++;
|
||||
GWT.log("checking configuration loaded, attempt " + attemptLC + " of "
|
||||
+ MAX_RETRY_ON_LOADING_CONFIG);
|
||||
boolean configsLoaded = getConfigurationLoaded() == CONFIGURATION_EXPECTED;
|
||||
int confLoaded = getConfigurationLoaded();
|
||||
GWT.log("configuration loaded " + confLoaded + " of "
|
||||
+ CONFIGURATION_EXPECTED);
|
||||
boolean configsLoaded = confLoaded == CONFIGURATION_EXPECTED;
|
||||
GWT.log("configsLoaded: " + configsLoaded);
|
||||
if (configsLoaded) {
|
||||
GWT.log("ContentModeratorCheckConfig loaded correclty");
|
||||
|
|
|
|||
|
|
@ -21,17 +21,6 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
|
|||
@RemoteServiceRelativePath("ckanContentModeratorService")
|
||||
public interface CkanContentModeratorService extends RemoteService {
|
||||
|
||||
/**
|
||||
* Sets the status. Currently, this only used to change the status from Rejected
|
||||
* to Pending
|
||||
*
|
||||
* @param theStatus the the status
|
||||
* @param itemNames the item names
|
||||
* @return the operation report
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public OperationReport setStatus(ItemStatus theStatus, List<String> itemNames) throws Exception;
|
||||
|
||||
/**
|
||||
* Reject item.
|
||||
*
|
||||
|
|
@ -59,12 +48,15 @@ public interface CkanContentModeratorService extends RemoteService {
|
|||
* @param theStatus the the status
|
||||
* @param offset the offset
|
||||
* @param limit the limit
|
||||
* @param restrictedToLoggedInUser the restricted to logged in user
|
||||
* @param allFields the all fields. If true returns the all
|
||||
* fields of an item
|
||||
* @param restrictedToLoggedInUser if true restricts the list of items to logged
|
||||
* in user
|
||||
* @param sortForField the sort for field
|
||||
* @return the list items for status
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public List<CatalogueDataset> getListItemsForStatus(ItemStatus theStatus, int offset, int limit,
|
||||
public List<CatalogueDataset> getListItemsForStatus(ItemStatus theStatus, int offset, int limit, boolean allFields,
|
||||
boolean restrictedToLoggedInUser, String sortForField) throws Exception;
|
||||
|
||||
/**
|
||||
|
|
@ -132,5 +124,16 @@ public interface CkanContentModeratorService extends RemoteService {
|
|||
* @return the item for name
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
CatalogueDataset getItemForName(String itemName) throws Exception;
|
||||
public CatalogueDataset getItemForName(String itemName) throws Exception;
|
||||
|
||||
/**
|
||||
* Sets the status.
|
||||
*
|
||||
* @param theStatus the the status
|
||||
* @param itemNames the item names
|
||||
* @return the operation report
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
public OperationReport setStatus(ItemStatus theStatus, List<String> itemNames, String message) throws Exception;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,13 +36,14 @@ public interface CkanContentModeratorServiceAsync {
|
|||
* @param theStatus the the status
|
||||
* @param offset the offset
|
||||
* @param limit the limit
|
||||
* @param allFields the all fields
|
||||
* @param restrictedToLoggedInUser the restricted to logged in user
|
||||
* @param sortForField the sort for field
|
||||
* @param callback the callback
|
||||
* @return the list items for status
|
||||
*/
|
||||
void getListItemsForStatus(ItemStatus theStatus, int offset, int limit, boolean restrictedToLoggedInUser,
|
||||
String sortForField, AsyncCallback<List<CatalogueDataset>> callback);
|
||||
void getListItemsForStatus(ItemStatus theStatus, int offset, int limit, boolean allFields,
|
||||
boolean restrictedToLoggedInUser, String sortForField, AsyncCallback<List<CatalogueDataset>> callback);
|
||||
|
||||
/**
|
||||
* Gets the data for status.
|
||||
|
|
@ -81,9 +82,11 @@ public interface CkanContentModeratorServiceAsync {
|
|||
*
|
||||
* @param theStatus the the status
|
||||
* @param itemNames the item names
|
||||
* @param message the message
|
||||
* @param callback the callback
|
||||
*/
|
||||
void setStatus(ItemStatus theStatus, List<String> itemNames, AsyncCallback<OperationReport> callback);
|
||||
void setStatus(ItemStatus theStatus, List<String> itemNames, String message,
|
||||
AsyncCallback<OperationReport> callback);
|
||||
|
||||
/**
|
||||
* Gets the CMS roles for user in the context.
|
||||
|
|
|
|||
|
|
@ -123,6 +123,8 @@ public class CkanContentModeratorWidgetController {
|
|||
|
||||
if (result != null) {
|
||||
eventBus.fireEvent(new ShowItemEvent<CatalogueDataset>(Arrays.asList(result),true));
|
||||
//Fired to set selectable row (i.e. checkbox) on STATUS (e.g. REJECT)
|
||||
eventBus.fireEvent(new SelectItemsWithItemStatusEvent(status, null, null, null));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -276,6 +278,21 @@ public class CkanContentModeratorWidgetController {
|
|||
GWT.log("sortForField is: " + sortForField);
|
||||
howeView.loadItemsWithStatus(statusSelectedEvent.getItemStatus(), sortForField);
|
||||
mainTabPanel.selectTab(0);
|
||||
|
||||
//#23903 Enabling the owner of the rejected item, to change the Status and send a message
|
||||
switch (statusSelectedEvent.getItemStatus()) {
|
||||
case REJECTED:
|
||||
howeView.hideUpdateStatusAction(false);
|
||||
howeView.hideSelectableRow(false);
|
||||
break;
|
||||
|
||||
default:
|
||||
howeView.hideUpdateStatusAction(readOnlyMode);
|
||||
howeView.hideSelectableRow(readOnlyMode);
|
||||
break;
|
||||
}
|
||||
//#23903 end
|
||||
|
||||
}
|
||||
|
||||
if (statusSelectedEvent.getDisplayMessage() != null) {
|
||||
|
|
|
|||
|
|
@ -199,6 +199,15 @@ public class ContentModeratorPaginatedView {
|
|||
*/
|
||||
private void setNewPageResult(SearchedData result) {
|
||||
GWT.log("setNewPageResult: " + result);
|
||||
|
||||
if(!GWT.isProdMode()) {
|
||||
if(result.getData()!=null) {
|
||||
for (CatalogueDataset dataset : result.getData()) {
|
||||
GWT.log("dataset: " + dataset.getStatus());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
serverStartIndex = result.getServerEndIndex();
|
||||
SelectionModel<? super CatalogueDataset> sm = getCellTable().getSelectionModel();
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,8 @@ public class DoActionCMSView extends Composite {
|
|||
switch (toStatus) {
|
||||
case PENDING:
|
||||
checkBoxPermDelete.setVisible(false);
|
||||
txtMsgReason.setVisible(false);
|
||||
txtMsgReason.setVisible(true);
|
||||
txtMsgReason.setPlaceholder("(Optional) Type a message...");
|
||||
break;
|
||||
case APPROVED:
|
||||
checkBoxPermDelete.setVisible(false);
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ public class HomeView extends Composite {
|
|||
* @param status the status
|
||||
* @param displayFields the display fields
|
||||
* @param sortByField the sort by field
|
||||
* @param readOnlyMode the read only mode
|
||||
* @param readOnlyMode the read only mode
|
||||
* @param restrictDataToLoggedInUser the restrict data to logged in user
|
||||
*/
|
||||
public HomeView(HandlerManager eventBus, ItemStatus status, DISPLAY_FIELD[] displayFields,
|
||||
|
|
@ -423,8 +423,8 @@ public class HomeView extends Composite {
|
|||
/**
|
||||
* Load form server the items with status.
|
||||
*
|
||||
* @param itemStatus the item status
|
||||
* @param sortForField
|
||||
* @param itemStatus the item status
|
||||
* @param sortForField
|
||||
*/
|
||||
public void loadItemsWithStatus(ItemStatus itemStatus, String sortForField) {
|
||||
GWT.log("loadItemsWithStatus started");
|
||||
|
|
@ -456,7 +456,7 @@ public class HomeView extends Composite {
|
|||
case PENDING:
|
||||
|
||||
CkanContentModeratorWidgetController.contentModeratorService.setStatus(toStatus, listDatasetNames,
|
||||
new AsyncCallback<OperationReport>() {
|
||||
doActionCMSView.getTxtReasonMsg(), new AsyncCallback<OperationReport>() {
|
||||
|
||||
@Override
|
||||
public void onSuccess(OperationReport result) {
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
DataCatalogueImpl catalogueImpl = CatalogueCMSFactory.getFactory().getCatalogueImplPerScope(scope);
|
||||
CatalogueContentModeratorSystem cmsInstance = catalogueImpl.getCatalogueContentModerator();
|
||||
isModerationEnabled = cmsInstance.isModerationEnabled(reloadConfig);
|
||||
LOG.info("is ModerationEnabled? " + isModerationEnabled);
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error occured on checking isContentModeratorEnabled, so returning false", e);
|
||||
return false;
|
||||
|
|
@ -176,6 +177,8 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
* @param theStatus the the status
|
||||
* @param offset the offset
|
||||
* @param limit the limit
|
||||
* @param allFields the all fields. If true returns the all
|
||||
* fields of an item
|
||||
* @param restrictedToLoggedInUser if true restricts the list of items to logged
|
||||
* in user
|
||||
* @param sortForField the sort for field
|
||||
|
|
@ -184,7 +187,7 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
*/
|
||||
@Override
|
||||
public List<CatalogueDataset> getListItemsForStatus(ItemStatus theStatus, int offset, int limit,
|
||||
boolean restrictedToLoggedInUser, String sortForField) throws Exception {
|
||||
boolean allFields, boolean restrictedToLoggedInUser, String sortForField) throws Exception {
|
||||
LOG.info("called getListItemsForStatus with [status: " + theStatus + ", offset: " + offset + ", limit: " + limit
|
||||
+ ", restrictedToLoggedInUser: " + restrictedToLoggedInUser + "]");
|
||||
List<CatalogueDataset> datasetList = null;
|
||||
|
|
@ -201,7 +204,7 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
filters.put(ContentModeratorWidgetConstants.CKAN_FIELD_NAME_AUTHOR_MAIL, valueOfQueryEmails);
|
||||
}
|
||||
|
||||
List<CkanDataset> datasets = cmsInstance.getListItemsForStatus(theStatus, limit, offset, filters,
|
||||
List<CkanDataset> datasets = cmsInstance.getListItemsForStatus(theStatus, limit, offset, allFields, filters,
|
||||
sortForField);
|
||||
if (datasets != null) {
|
||||
int size = datasets.size();
|
||||
|
|
@ -248,32 +251,34 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
String scope = setContexts();
|
||||
DataCatalogueImpl catalogueImpl = CatalogueCMSFactory.getFactory().getCatalogueImplPerScope(scope);
|
||||
GCubeUser user = GcubeContextUtil.getCurrentUser(this.getThreadLocalRequest());
|
||||
|
||||
|
||||
boolean moderationCheckPassed = false;
|
||||
|
||||
|
||||
if (user != null) {
|
||||
CkanDataset ckanDataset = catalogueImpl.getDataset(itemName, user.getUsername());
|
||||
ds = null;
|
||||
if (ckanDataset != null) {
|
||||
ds = toPatchedCatalogueDataset(ckanDataset, catalogueImpl.getCatalogueUrl());
|
||||
|
||||
|
||||
Boolean userModerator = isModeratorRoleAssigned();
|
||||
moderationCheckPassed = userModerator?true:false;
|
||||
LOG.info("Moderation check: is the user a Moderator? "+moderationCheckPassed);
|
||||
//The user is not a Moderator, yes otherwise
|
||||
if(!moderationCheckPassed) {
|
||||
moderationCheckPassed = userModerator ? true : false;
|
||||
LOG.info("Moderation check: is the user a Moderator? " + moderationCheckPassed);
|
||||
// The user is not a Moderator, yes otherwise
|
||||
if (!moderationCheckPassed) {
|
||||
String datasetAuthorMail = ds.getAuthorEmail();
|
||||
String userMail = user.getEmail();
|
||||
if(datasetAuthorMail!=null && userMail!=null && datasetAuthorMail.compareTo(userMail)==0) {
|
||||
//The user is the owner of the dataset, so he/she can view the dataset (moderation check passed)
|
||||
moderationCheckPassed = true;
|
||||
if (datasetAuthorMail != null && userMail != null
|
||||
&& datasetAuthorMail.compareTo(userMail) == 0) {
|
||||
// The user is the owner of the dataset, so he/she can view the dataset
|
||||
// (moderation check passed)
|
||||
moderationCheckPassed = true;
|
||||
}
|
||||
LOG.info("Moderation check: is the user the owner of the dataset? "+moderationCheckPassed);
|
||||
LOG.info("Moderation check: is the user the owner of the dataset? " + moderationCheckPassed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!moderationCheckPassed) {
|
||||
|
||||
if (!moderationCheckPassed) {
|
||||
LOG.info("Moderation ckeck not passed, returning null");
|
||||
ds = null;
|
||||
}
|
||||
|
|
@ -283,7 +288,7 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
throw e;
|
||||
}
|
||||
|
||||
LOG.info("getItemForName "+itemName+", returning: " + ds);
|
||||
LOG.info("getItemForName " + itemName + ", returning: " + ds);
|
||||
return ds;
|
||||
}
|
||||
|
||||
|
|
@ -292,22 +297,29 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
*
|
||||
* @param theStatus the the status
|
||||
* @param itemNames the item names
|
||||
* @param message the message to send to Moderators. If null no messange is sent
|
||||
* @return the operation report
|
||||
* @throws Exception the exception
|
||||
*/
|
||||
@Override
|
||||
public OperationReport setStatus(ItemStatus theStatus, List<String> itemNames) throws Exception {
|
||||
LOG.info("Called set status " + theStatus + " for Items with name: " + itemNames);
|
||||
public OperationReport setStatus(ItemStatus theStatus, List<String> itemNames, String message) throws Exception {
|
||||
LOG.info("Called set status " + theStatus + " for items with name: " + itemNames + ". Is message null?: "+(message==null));
|
||||
|
||||
try {
|
||||
String scope = setContexts();
|
||||
DataCatalogueImpl catalogueImpl = CatalogueCMSFactory.getFactory().getCatalogueImplPerScope(scope);
|
||||
CatalogueContentModeratorSystem cmsInstance = catalogueImpl.getCatalogueContentModerator();
|
||||
Map<String, String> errorMapItems = new HashMap<String, String>();
|
||||
List<String> changedStatusListItems = new ArrayList<String>();
|
||||
for (String itemName : itemNames) {
|
||||
try {
|
||||
catalogueImpl.refreshDataset(itemName);
|
||||
LOG.info("refresh dataset done");
|
||||
changedStatusListItems.add(itemName);
|
||||
if(message!=null && !message.isEmpty()) {
|
||||
LOG.debug("Sending message: "+message);
|
||||
cmsInstance.messageItem(itemName, message);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOG.warn("Error when setting status (updating) the itemName: " + itemName, e);
|
||||
errorMapItems.put(itemName, e.getMessage());
|
||||
|
|
@ -344,7 +356,7 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
List<String> approvedListItems = new ArrayList<String>();
|
||||
for (String itemName : itemNames) {
|
||||
try {
|
||||
cmsInstance.approveItem(itemName, moderatorMessage);
|
||||
cmsInstance.approveItem(itemName, moderatorMessage, true);
|
||||
approvedListItems.add(itemName);
|
||||
} catch (Exception e) {
|
||||
LOG.warn("Error when approving itemName: " + itemName, e);
|
||||
|
|
@ -472,7 +484,7 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
List<CatalogueDataset> listDataset = new ArrayList<CatalogueDataset>();
|
||||
try {
|
||||
LOG.debug("getListItemsForStatus with searchStartIndex: " + searchStartIndex + ", limit: " + limit);
|
||||
listDataset = getListItemsForStatus(status, searchStartIndex, limit, restrictedToLoggedInUser,
|
||||
listDataset = getListItemsForStatus(status, searchStartIndex, limit, true, restrictedToLoggedInUser,
|
||||
sortForField);
|
||||
} catch (Exception e) {
|
||||
String error = "Error occurred on getting items for status: " + status;
|
||||
|
|
@ -496,5 +508,4 @@ public class CkanContentModeratorServiceImpl extends RemoteServiceServlet implem
|
|||
LOG.debug("Returning: " + searchedData);
|
||||
return searchedData;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
/resources/
|
||||
|
|
@ -17,32 +17,36 @@ import org.slf4j.LoggerFactory;
|
|||
|
||||
public class CkanContentModeratorServiceTest {
|
||||
|
||||
//private String scope = "/gcube/devsec/devVRE";
|
||||
private String scope = "/pred4s/preprod/Dorne";
|
||||
private String scope = "/gcube/devsec/devVRE";
|
||||
// private String scope = "/pred4s/preprod/Dorne";
|
||||
private String testUser = "francesco.mangiacrapa";
|
||||
private String authorizationToken = "";
|
||||
|
||||
// private String authorizationToken = "";
|
||||
// private String scope = "/gcube/devsec";
|
||||
private String authorizationToken = ""; // devVRE
|
||||
|
||||
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(CkanContentModeratorServiceTest.class);
|
||||
|
||||
//@Test
|
||||
|
||||
// @Test
|
||||
public void test() {
|
||||
fail("Not yet implemented");
|
||||
}
|
||||
|
||||
|
||||
//@Test
|
||||
public void loadItemsForStatus() {
|
||||
public void loadItemsForStatus() {
|
||||
ScopeProvider.instance.set(scope);
|
||||
SecurityTokenProvider.instance.set(authorizationToken);
|
||||
ItemStatus itemStatus = ItemStatus.PENDING;
|
||||
try {
|
||||
CatalogueContentModeratorSystem cms = CatalogueCMSFactory.getFactory().getCMSPerScope(scope);
|
||||
Map<String, String> filters = new HashMap<String, String>(1);
|
||||
filters.put(ContentModeratorWidgetConstants.CKAN_FIELD_NAME_AUTHOR_MAIL, "francesco.mangiacrapa@isti.cnr.it");
|
||||
List<CkanDataset> items = cms.getListItemsForStatus(itemStatus, 20, 0, filters, GCatCaller.DEFAULT_SORT_VALUE);
|
||||
filters.put(ContentModeratorWidgetConstants.CKAN_FIELD_NAME_AUTHOR_MAIL,
|
||||
"francesco.mangiacrapa@isti.cnr.it");
|
||||
List<CkanDataset> items = cms.getListItemsForStatus(itemStatus, 20, 0, true, filters,
|
||||
GCatCaller.DEFAULT_SORT_VALUE);
|
||||
int i = 0;
|
||||
System.out.println("Datasets with status "+itemStatus+" are: "+items.size());
|
||||
System.out.println("Datasets with status " + itemStatus + " are: " + items.size());
|
||||
for (CkanDataset ckanDataset : items) {
|
||||
System.out.println(i++ +")Read dataset: "+ckanDataset);
|
||||
System.out.println(i++ + ")Read dataset: " + ckanDataset);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
/devNext.gcubekey
|
||||
/devVRE.gcubekey
|
||||
/devsec.gcubekey
|
||||
/gCubeApps.gcubekey
|
||||
/gcube.gcubekey
|
||||
/log4j.properties
|
||||
/pred4s.gcubekey
|
||||
/preprod.gcubekey
|
||||
Loading…
Reference in New Issue