Skip to content

Commit

Permalink
Correctly populate Child Accounts Menu
Browse files Browse the repository at this point in the history 
Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
  • Loading branch information
@Coduz
Claudio Mezzasalma authored and Coduz committed Aug 26, 2020
1 parent 3450f1c commit cfc4896
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 36 deletions.
93 changes: 57 additions & 36 deletions console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,8 @@
*******************************************************************************/
package org.eclipse.kapua.app.console.core.client;

import com.extjs.gxt.ui.client.Style;
import com.extjs.gxt.ui.client.event.BaseEvent;
import com.extjs.gxt.ui.client.event.Events;
import com.extjs.gxt.ui.client.event.Listener;
import com.extjs.gxt.ui.client.event.MenuEvent;
import com.extjs.gxt.ui.client.event.SelectionListener;
import com.extjs.gxt.ui.client.widget.ContentPanel;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
import com.extjs.gxt.ui.client.widget.button.Button;
import com.extjs.gxt.ui.client.widget.layout.TableData;
import com.extjs.gxt.ui.client.widget.layout.TableLayout;
import com.extjs.gxt.ui.client.widget.menu.Menu;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.extjs.gxt.ui.client.widget.menu.SeparatorMenuItem;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
import java.util.List;

import org.eclipse.kapua.app.console.core.client.util.TokenCleaner;
import org.eclipse.kapua.app.console.core.shared.service.GwtAuthorizationService;
import org.eclipse.kapua.app.console.core.shared.service.GwtAuthorizationServiceAsync;
Expand All @@ -51,7 +33,27 @@
import org.eclipse.kapua.app.console.module.api.shared.service.GwtConsoleService;
import org.eclipse.kapua.app.console.module.api.shared.service.GwtConsoleServiceAsync;

import java.util.List;
import com.extjs.gxt.ui.client.Style;
import com.extjs.gxt.ui.client.event.BaseEvent;
import com.extjs.gxt.ui.client.event.Events;
import com.extjs.gxt.ui.client.event.Listener;
import com.extjs.gxt.ui.client.event.MenuEvent;
import com.extjs.gxt.ui.client.event.SelectionListener;
import com.extjs.gxt.ui.client.util.Point;
import com.extjs.gxt.ui.client.widget.ContentPanel;
import com.extjs.gxt.ui.client.widget.LayoutContainer;
import com.extjs.gxt.ui.client.widget.button.Button;
import com.extjs.gxt.ui.client.widget.layout.TableData;
import com.extjs.gxt.ui.client.widget.layout.TableLayout;
import com.extjs.gxt.ui.client.widget.menu.Menu;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.extjs.gxt.ui.client.widget.menu.SeparatorMenuItem;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;

public class NorthView extends LayoutContainer {

Expand Down Expand Up @@ -196,21 +198,21 @@ public void onSuccess(Void arg0) {
if (currentSession.isSsoEnabled() && currentSession.getSsoIdToken() != null) {
gwtSettingService.getSsoLogoutUri(currentSession.getSsoIdToken(), new AsyncCallback<String>() {

@Override
public void onFailure(Throwable caught) {
FailureHandler.handle(caught);
}

@Override
public void onSuccess(String result) {
if (!result.isEmpty()) {
Window.Location.assign(result);
} else {
// result is empty, thus the OpenID logout is disabled
TokenCleaner.cleanToken();
}
}
});
@Override
public void onFailure(Throwable caught) {
FailureHandler.handle(caught);
}

@Override
public void onSuccess(String result) {
if (!result.isEmpty()) {
Window.Location.assign(result);
} else {
// result is empty, thus the OpenID logout is disabled
TokenCleaner.cleanToken();
}
}
});
} else {
TokenCleaner.cleanToken();
}
Expand Down Expand Up @@ -248,6 +250,7 @@ public MenuItem createAccountNavigationMenuItem() {

subAccountMenu = new Menu();
subAccountMenu.setAutoWidth(true);
subAccountMenu.setAutoHeight(true);
subAccountMenu.add(rootAccountMenuItem);
subAccountMenu.add(new SeparatorMenuItem());

Expand All @@ -269,6 +272,15 @@ public MenuItem createAccountNavigationMenuItem() {
* @param accountId the account of the current menu item.
*/
private void populateNavigatorMenu(final Menu menu, String accountId) {
final KapuaMenuItem loadingChildAccounts;
loadingChildAccounts = new KapuaMenuItem(MSGS.accountSelectorLoadingChildAccounts());
loadingChildAccounts.setToolTip(MSGS.accountSelectorTooltipYourAccount());
loadingChildAccounts.setIcon(IconSet.USER_MD);
loadingChildAccounts.setId(rootAccountId);
loadingChildAccounts.disable();

menu.add(loadingChildAccounts);

gwtAccountService.find(accountId, new AsyncCallback<GwtAccount>() {

@Override
Expand All @@ -280,10 +292,12 @@ public void onFailure(Throwable caught) {
public void onSuccess(GwtAccount result) {
// If no children are found, add "No Child" label
if (result.getChildAccounts() != null && result.getChildAccounts().isEmpty()) {
menu.remove(loadingChildAccounts);
MenuItem noChildMenuItem = new MenuItem(MSGS.accountSelectorItemNoChild());
noChildMenuItem.disable();
menu.add(noChildMenuItem);
} else {
menu.remove(loadingChildAccounts);
// For each child found create a item menu and search for its children
for (GwtAccount childAccount : result.getChildAccounts()) {
// Add item menu entry
Expand All @@ -301,11 +315,17 @@ public void onSuccess(GwtAccount result) {
if (!childAccount.getChildAccounts().isEmpty()) {
Menu childMenu = new Menu();
childMenu.setAutoWidth(true);
childMenu.setAutoHeight(true);
childAccountMenuItem.setSubMenu(childMenu);
populateNavigatorMenu(childMenu, childAccount.getId());
}
}
}
// Force new show to include new child accounts
if (menu.isVisible()) {
Point currentPosition = menu.getPosition(true);
menu.showAt(currentPosition.x, currentPosition.y);
}
}
});
}
Expand Down Expand Up @@ -387,4 +407,5 @@ private void updateUserActionButtonLabel() {

userActionButton.setText(MSGS.consoleHeaderUserActionButtonLabel(userDisplayName, accountName));
}

}
1 change: 1 addition & 0 deletions ...urces/org/eclipse/kapua/app/console/module/api/client/messages/ConsoleMessages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ accountSelectorItemYourAccount={0} - <i>Your account</i>
accountSelectorItemNoChild=<i>No child accounts</i>
accountSelectorMenuMaskLoading=Switching to {0} account...
accountSelectorTooltipYourAccount=Click to return to your main account
accountSelectorLoadingChildAccounts=Loading child accounts...

changePassword=Change Password
oldPassword=Old Password
Expand Down

0 comments on commit cfc4896

Please sign in to comment.