-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Implement left navigation level 1 for sites - EXO-65477 - Meeds-io/MIPs#72 #2771
Conversation
ac99c0a
to
c5c975b
Compare
da739d0
to
a489adc
Compare
b304469
to
61de30d
Compare
a489adc
to
63ecf7f
Compare
Your PR triggers too many exo-ci builds! Please finish your work and then, set your PR ready! Thank you |
a41a4f1
to
f5ba0c0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See review
import org.exoplatform.portal.mop.SiteKey; | ||
import org.exoplatform.portal.mop.SiteType; | ||
import org.exoplatform.portal.mop.navigation.Scope; | ||
import org.exoplatform.portal.mop.service.LayoutService; | ||
import org.exoplatform.portal.mop.user.*; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
need to import explicitly the needed classes
@@ -1688,4 +1706,92 @@ public static RelationshipManager getRelationshipManager() { | |||
} | |||
return relationshipManager; | |||
} | |||
|
|||
public static SiteRestEntity toSiteRestEntity(PortalConfig site, HttpServletRequest request, SiteFilter siteFilter) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
public static SiteRestEntity toSiteRestEntity(PortalConfig site, HttpServletRequest request, SiteFilter siteFilter) { | |
private static SiteRestEntity buildSiteEntity(PortalConfig site, HttpServletRequest request, SiteFilter siteFilter) { |
rootNode == null ? null : toUserNodeRestEntity(rootNode.getChildren(), true, getOrganizationService(), getLayoutService(), getUserACL())); | ||
|
||
} | ||
public static List<SiteRestEntity> toSiteRestEntities(List<PortalConfig> sites, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
public static List<SiteRestEntity> toSiteRestEntities(List<PortalConfig> sites, | |
public static List<SiteRestEntity> buildSiteEntities(List<PortalConfig> sites, |
} | ||
return new SiteRestEntity(siteType, | ||
site.getName(), | ||
!org.apache.commons.lang.StringUtils.isBlank(displayName) ? displayName : site.getName(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add this import org.apache.commons.lang.StringUtils explicitly with the list of imports
} | ||
return layoutService; | ||
} | ||
public static boolean isDefaultSite(String siteName) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
public static boolean isDefaultSite(String siteName) { | |
private static boolean isDefaultSite(String siteName) { |
@@ -0,0 +1,52 @@ | |||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename to SiteEntity instead of SiteRestEntity
42c2cb3
to
94bacc5
Compare
Your PR triggers too many exo-ci builds! Please finish your work and then, set your PR ready! Thank you |
94bacc5
to
d60ed59
Compare
61de30d
to
7ae1ec3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
SonarCloud Quality Gate failed. 0 Bugs 0.0% Coverage Catch issues before they fail your Quality Gate with our IDE extension SonarLint |
No description provided.