gCubeSystem
/
ckan-content-moderator-widget
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

task_21363 #1

Closed
francesco.mangiacrapa wants to merge 53 commits from task_21363 into master
pull from: task_21363
merge into: gCubeSystem:master
Conversation 0 Commits 53 Files Changed 100 +13 -27
3 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97fff2c428 - Show all commits

4
src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidgetController.java
View File

@ -20,7 +20,7 @@ import org.gcube.portlets.widgets.ckancontentmoderator.client.events.ShowMessage
import org.gcube.portlets.widgets.ckancontentmoderator.client.events.ShowMessageEventHandler; import org.gcube.portlets.widgets.ckancontentmoderator.client.events.ShowMessageEventHandler;
import org.gcube.portlets.widgets.ckancontentmoderator.client.events.TableRangeViewChangedEvent; import org.gcube.portlets.widgets.ckancontentmoderator.client.events.TableRangeViewChangedEvent;
import org.gcube.portlets.widgets.ckancontentmoderator.client.events.TableRangeViewChangedEventHandler; import org.gcube.portlets.widgets.ckancontentmoderator.client.events.TableRangeViewChangedEventHandler;
import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.CkanFramePanel; import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.CkanInternalFramePanel;
import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.ContentModeratorToolbar; import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.ContentModeratorToolbar;
import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.HomeView; import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.HomeView;
import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.MainTabPanel; import org.gcube.portlets.widgets.ckancontentmoderator.client.ui.MainTabPanel;
@ -109,7 +109,7 @@ public class CkanContentModeratorWidgetController {
for (T t : items) { for (T t : items) {
CatalogueDataset clickedDataset = (CatalogueDataset) t; CatalogueDataset clickedDataset = (CatalogueDataset) t;
CkanFramePanel cfp = new CkanFramePanel(eventBus); CkanInternalFramePanel cfp = new CkanInternalFramePanel(eventBus);
cfp.instanceFrame(clickedDataset.getUrl()); cfp.instanceFrame(clickedDataset.getUrl());
mainTabPanel.addTab(clickedDataset.getTitle(), cfp); mainTabPanel.addTab(clickedDataset.getTitle(), cfp);

30
src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/CkanFramePanel.java → src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/CkanInternalFramePanel.java
View File

@ -21,16 +21,15 @@ import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.NamedFrame; import com.google.gwt.user.client.ui.NamedFrame;
/** /**
* The Class CkanFramePanel. * The Class CkanInternalFramePanel.
* *
* @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
* *
* Jun 23, 2021 * Feb 25, 2022
*/ */
public class CkanFramePanel extends FlowPanel{ public class CkanInternalFramePanel extends FlowPanel {
private NamedFrame frame; private NamedFrame frame;
//private static final String FRAME_NAME = "ckan-content-frame";
private HandlerManager eventBus; private HandlerManager eventBus;
private Image loading = new Image(ContentModeratorWidgetResources.ICONS.loading()); private Image loading = new Image(ContentModeratorWidgetResources.ICONS.loading());
private String messageToSend; private String messageToSend;
@ -41,12 +40,11 @@ public class CkanFramePanel extends FlowPanel{
* *
* @param eventBus the event bus * @param eventBus the event bus
*/ */
public CkanFramePanel(HandlerManager eventBus) { public CkanInternalFramePanel(HandlerManager eventBus) {
this.eventBus = eventBus; this.eventBus = eventBus;
addLoading(); addLoading();
} }
/** /**
* Prints the. * Prints the.
* *
@ -56,8 +54,6 @@ public class CkanFramePanel extends FlowPanel{
console.log(msg); console.log(msg);
}-*/; }-*/;
/** /**
* Instance frame. * Instance frame.
* *
@ -65,34 +61,24 @@ public class CkanFramePanel extends FlowPanel{
* @return the frame * @return the frame
*/ */
public Frame instanceFrame(String datasetURL) { public Frame instanceFrame(String datasetURL) {
GWT.log("Instancing new IFRAME with uri: "+datasetURL); GWT.log("Instancing new IFRAME with uri: " + datasetURL);
try{
if(frame != null)
remove(frame);
}catch(Exception e){
print("Error " + e);
}
addLoading(); addLoading();
String urlEncoded = URL.encode(datasetURL); String urlEncoded = URL.encode(datasetURL);
GWT.log("Encoded url for instanciating frame is " + urlEncoded); GWT.log("Encoded url for instanciating frame is " + urlEncoded);
iFrameRandomName = Random.nextInt() + "dataset-iframe"+Random.nextInt(); iFrameRandomName = Random.nextInt() + "dataset-iframe" + Random.nextInt();
frame = new NamedFrame(iFrameRandomName); frame = new NamedFrame(iFrameRandomName);
frame.setUrl(urlEncoded); frame.setUrl(urlEncoded);
frame.getElement().setId(iFrameRandomName); frame.getElement().setId(iFrameRandomName);
frame.setWidth("100%"); frame.setWidth("100%");
frame.setHeight("580px"); frame.setHeight("580px");
// frame.setHeight("100%");
// frame.getElement().getStyle().setOverflow(Overflow.HIDDEN);
// frame.getElement().setAttribute("scrolling", "no");
frame.getElement().getStyle().setBorderWidth(0, Unit.PX); frame.getElement().getStyle().setBorderWidth(0, Unit.PX);
frame.addLoadHandler(new LoadHandler() { frame.addLoadHandler(new LoadHandler() {
@Override @Override
public void onLoad(LoadEvent arg0) { public void onLoad(LoadEvent arg0) {
CkanFramePanel.this.remove(loading); CkanInternalFramePanel.this.remove(loading);
eventBus.fireEvent(new IFrameInstanciedEvent(frame, OPERATION.ONLOAD)); eventBus.fireEvent(new IFrameInstanciedEvent(frame, OPERATION.ONLOAD));
} }
}); });
@ -114,7 +100,7 @@ public class CkanFramePanel extends FlowPanel{
/** /**
* add loading image. * add loading image.
*/ */
private void addLoading(){ private void addLoading() {
this.add(loading); this.add(loading);
loading.getElement().getStyle().setProperty("margin", "auto"); loading.getElement().getStyle().setProperty("margin", "auto");
loading.getElement().getStyle().setDisplay(Display.BLOCK); loading.getElement().getStyle().setDisplay(Display.BLOCK);

4
src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/MainTabPanel.java
View File

@ -78,9 +78,9 @@ public class MainTabPanel extends Composite {
public Tab addTab(String heading, Widget w) { public Tab addTab(String heading, Widget w) {
final Tab tab = new Tab(); final Tab tab = new Tab();
if (w instanceof CkanFramePanel) { if (w instanceof CkanInternalFramePanel) {
tab.setCustomIconStyle("icon-rotate-right icon-spin"); tab.setCustomIconStyle("icon-rotate-right icon-spin");
CkanFramePanel ckanFramePanel = (CkanFramePanel) w; CkanInternalFramePanel ckanFramePanel = (CkanInternalFramePanel) w;
ckanFramePanel.getFrame().addLoadHandler(new LoadHandler() { ckanFramePanel.getFrame().addLoadHandler(new LoadHandler() {
@Override @Override