Skip to content
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

Merged
merged 4 commits into from
Sep 4, 2023

Conversation

GouadriaHanen
Copy link
Contributor

No description provided.

@GouadriaHanen GouadriaHanen force-pushed the EXO-65477 branch 2 times, most recently from ac99c0a to c5c975b Compare August 29, 2023 19:44
@exo-swf exo-swf added the partialCIBuild Perform Partial CI Build label Aug 29, 2023
@GouadriaHanen GouadriaHanen force-pushed the EXO-65477 branch 4 times, most recently from da739d0 to a489adc Compare August 31, 2023 09:30
@exo-swf exo-swf force-pushed the feature/experience branch 2 times, most recently from b304469 to 61de30d Compare September 3, 2023 23:16
@exo-swf exo-swf marked this pull request as draft September 4, 2023 14:45
@exo-swf
Copy link
Contributor

exo-swf commented Sep 4, 2023

Your PR triggers too many exo-ci builds! Please finish your work and then, set your PR ready! Thank you

@exo-swf exo-swf removed the partialCIBuild Perform Partial CI Build label Sep 4, 2023
@IlhemEssaadi IlhemEssaadi marked this pull request as ready for review September 4, 2023 14:55
Copy link
Member

@azayati azayati left a 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.*;
Copy link
Member

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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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(),
Copy link
Member

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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public static boolean isDefaultSite(String siteName) {
private static boolean isDefaultSite(String siteName) {

@@ -0,0 +1,52 @@
/*
Copy link
Member

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

@IlhemEssaadi IlhemEssaadi force-pushed the EXO-65477 branch 3 times, most recently from 42c2cb3 to 94bacc5 Compare September 4, 2023 16:57
@exo-swf exo-swf marked this pull request as draft September 4, 2023 17:04
@exo-swf
Copy link
Contributor

exo-swf commented Sep 4, 2023

Your PR triggers too many exo-ci builds! Please finish your work and then, set your PR ready! Thank you

Copy link
Member

@azayati azayati left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sonarcloud
Copy link

sonarcloud bot commented Sep 4, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@azayati azayati merged commit cff446c into feature/experience Sep 4, 2023
3 of 4 checks passed
@azayati azayati deleted the EXO-65477 branch September 4, 2023 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants