diff --git a/component/api/pom.xml b/component/api/pom.xml index 6eda8382ddc..11dfcf8df0b 100644 --- a/component/api/pom.xml +++ b/component/api/pom.xml @@ -22,7 +22,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT social-component-api Meeds:: PLF:: Social API diff --git a/component/api/src/main/java/io/meeds/social/cms/model/ContentLinkExtension.java b/component/api/src/main/java/io/meeds/social/cms/model/ContentLinkExtension.java index 5aee8dfe101..4d878046e1e 100644 --- a/component/api/src/main/java/io/meeds/social/cms/model/ContentLinkExtension.java +++ b/component/api/src/main/java/io/meeds/social/cms/model/ContentLinkExtension.java @@ -37,6 +37,8 @@ public class ContentLinkExtension { private boolean drawer; + private boolean hidden; + public ContentLinkExtension(String objectType, String titleKey, String icon, @@ -47,4 +49,16 @@ public ContentLinkExtension(String objectType, this.command = command; } + public ContentLinkExtension(String objectType, + String titleKey, + String icon, + String command, + boolean drawer) { + this.objectType = objectType; + this.titleKey = titleKey; + this.icon = icon; + this.command = command; + this.drawer = drawer; + } + } diff --git a/component/common/pom.xml b/component/common/pom.xml index 2dba2d63432..f73dbdc709d 100644 --- a/component/common/pom.xml +++ b/component/common/pom.xml @@ -22,7 +22,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT io.meeds.social social-component-common diff --git a/component/core/pom.xml b/component/core/pom.xml index 970f37b2c52..3a1afb5b0c2 100644 --- a/component/core/pom.xml +++ b/component/core/pom.xml @@ -22,7 +22,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT social-component-core Meeds:: PLF:: Social Core Component @@ -77,7 +77,7 @@ org.hibernate.orm hibernate-jpamodelgen - 6.6.49.Final + 7.2.12.Final diff --git a/component/core/src/main/resources/jpa-entities.idx b/component/core/src/main/resources/jpa-entities.idx index 3a20584b399..e6a8efbedc7 100644 --- a/component/core/src/main/resources/jpa-entities.idx +++ b/component/core/src/main/resources/jpa-entities.idx @@ -1,5 +1,6 @@ org.exoplatform.social.core.jpa.storage.entity.GroupSpaceBindingReportUserEntity org.exoplatform.social.core.jpa.storage.entity.ProfilePropertySettingEntity +org.exoplatform.social.core.jpa.storage.entity.ProfilePropertyOptionEntity org.exoplatform.social.core.jpa.storage.entity.UserSpaceBindingEntity org.exoplatform.social.core.jpa.storage.entity.MetadataEntity org.exoplatform.social.core.jpa.storage.entity.ActivityShareActionEntity @@ -14,8 +15,10 @@ org.exoplatform.social.core.jpa.storage.entity.SpaceEntity org.exoplatform.social.core.jpa.storage.entity.GroupSpaceBindingEntity org.exoplatform.social.core.jpa.storage.entity.ProfileExperienceEntity org.exoplatform.social.core.jpa.storage.entity.IdentityEntity -org.exoplatform.social.core.jpa.storage.entity.AppEntity org.exoplatform.social.core.jpa.storage.entity.ProfileLabelEntity org.exoplatform.social.core.jpa.storage.entity.SpaceExternalInvitationEntity org.exoplatform.social.core.jpa.storage.entity.MetadataItemEntity +org.exoplatform.social.core.jpa.storage.entity.UserBindingsQueueEntity +org.exoplatform.social.core.jpa.storage.entity.UserSpaceBindingEntity io.meeds.social.space.template.entity.SpaceTemplateEntity +io.meeds.social.space.invitation.entity.SpaceInvitationLinkEntity diff --git a/component/core/src/test/java/io/meeds/social/AbstractSpringConfigurationTest.java b/component/core/src/test/java/io/meeds/social/AbstractSpringConfigurationTest.java index f105606fdda..8b0979c1fc4 100644 --- a/component/core/src/test/java/io/meeds/social/AbstractSpringConfigurationTest.java +++ b/component/core/src/test/java/io/meeds/social/AbstractSpringConfigurationTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; +import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.context.annotation.PropertySource; import org.springframework.test.context.junit4.SpringRunner; diff --git a/component/core/src/test/java/io/meeds/social/category/service/CategoryServiceUnitTest.java b/component/core/src/test/java/io/meeds/social/category/service/CategoryServiceUnitTest.java index 511c66bb705..abefa45c13c 100644 --- a/component/core/src/test/java/io/meeds/social/category/service/CategoryServiceUnitTest.java +++ b/component/core/src/test/java/io/meeds/social/category/service/CategoryServiceUnitTest.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit4.SpringRunner; import org.exoplatform.portal.config.UserACL; @@ -86,22 +86,22 @@ public class CategoryServiceUnitTest { private static final String TEST_USER = "testuser"; - @MockBean + @MockitoBean private IdentityManager identityManager; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private CategoryStorage categoryStorage; - @MockBean + @MockitoBean private SpaceService spaceService; - @MockBean + @MockitoBean private UserACL userAcl; - @MockBean + @MockitoBean private CategoryPluginService categoryPluginService; @Autowired diff --git a/component/core/src/test/java/io/meeds/social/coediting/service/CoeditingServiceTest.java b/component/core/src/test/java/io/meeds/social/coediting/service/CoeditingServiceTest.java index 5866c4ba226..e72770013ac 100644 --- a/component/core/src/test/java/io/meeds/social/coediting/service/CoeditingServiceTest.java +++ b/component/core/src/test/java/io/meeds/social/coediting/service/CoeditingServiceTest.java @@ -38,7 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit4.SpringRunner; import org.exoplatform.commons.api.settings.SettingService; @@ -59,10 +59,10 @@ public class CoeditingServiceTest { private static final String USERNAME = "username"; - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private CacheService cacheService; @Autowired diff --git a/component/core/src/test/java/io/meeds/social/space/service/SpaceDirectoryServiceTest.java b/component/core/src/test/java/io/meeds/social/space/service/SpaceDirectoryServiceTest.java index 3d92b0f9162..4e8f223bf5f 100644 --- a/component/core/src/test/java/io/meeds/social/space/service/SpaceDirectoryServiceTest.java +++ b/component/core/src/test/java/io/meeds/social/space/service/SpaceDirectoryServiceTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit4.SpringRunner; import org.exoplatform.portal.config.UserACL; @@ -61,16 +61,16 @@ public class SpaceDirectoryServiceTest { private static final String SETTING_NAME = "settingName"; - @MockBean + @MockitoBean private CategoryService categoryService; - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private SpaceDirectoryStorage spaceDirectoryStorage; - @MockBean + @MockitoBean private SecuritySettingService securitySettingService; @Autowired diff --git a/component/core/src/test/java/io/meeds/social/space/storage/SpaceDirectoryStorageTest.java b/component/core/src/test/java/io/meeds/social/space/storage/SpaceDirectoryStorageTest.java index 7c117b08eb2..f89b7b15497 100644 --- a/component/core/src/test/java/io/meeds/social/space/storage/SpaceDirectoryStorageTest.java +++ b/component/core/src/test/java/io/meeds/social/space/storage/SpaceDirectoryStorageTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit4.SpringRunner; import org.exoplatform.commons.api.settings.SettingService; @@ -48,7 +48,7 @@ public class SpaceDirectoryStorageTest { private static final String SETTING_NAME = "settingName"; - @MockBean + @MockitoBean private SettingService settingService; @Autowired diff --git a/component/notification/pom.xml b/component/notification/pom.xml index b8be5fb6bfe..b8ae68053c7 100644 --- a/component/notification/pom.xml +++ b/component/notification/pom.xml @@ -22,7 +22,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT social-component-notification Meeds:: PLF:: Social Notification Component diff --git a/component/oauth-auth/pom.xml b/component/oauth-auth/pom.xml index c20f76c217d..b354d7d054b 100644 --- a/component/oauth-auth/pom.xml +++ b/component/oauth-auth/pom.xml @@ -21,7 +21,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT 4.0.0 diff --git a/component/pom.xml b/component/pom.xml index 3f51c50669e..141db8c070c 100644 --- a/component/pom.xml +++ b/component/pom.xml @@ -22,7 +22,7 @@ social io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT social-component pom diff --git a/component/service/pom.xml b/component/service/pom.xml index adf063deb8d..2421142b484 100644 --- a/component/service/pom.xml +++ b/component/service/pom.xml @@ -22,7 +22,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT social-component-service Meeds:: PLF:: Social Service Component diff --git a/component/service/src/test/java/io/meeds/social/category/rest/CategoryLinkRestTest.java b/component/service/src/test/java/io/meeds/social/category/rest/CategoryLinkRestTest.java index 749dc3a7bdf..410ea603705 100644 --- a/component/service/src/test/java/io/meeds/social/category/rest/CategoryLinkRestTest.java +++ b/component/service/src/test/java/io/meeds/social/category/rest/CategoryLinkRestTest.java @@ -30,14 +30,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; @@ -74,7 +74,7 @@ public class CategoryLinkRestTest { @Autowired private WebApplicationContext context; - @MockBean + @MockitoBean private CategoryLinkService categoryLinkService; private MockMvc mockMvc; diff --git a/component/service/src/test/java/io/meeds/social/category/rest/CategoryRestTest.java b/component/service/src/test/java/io/meeds/social/category/rest/CategoryRestTest.java index 5c46344e1b8..bee0663910a 100644 --- a/component/service/src/test/java/io/meeds/social/category/rest/CategoryRestTest.java +++ b/component/service/src/test/java/io/meeds/social/category/rest/CategoryRestTest.java @@ -40,10 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -94,10 +94,10 @@ public class CategoryRestTest { @Autowired private WebApplicationContext context; - @MockBean + @MockitoBean private CategoryService categoryService; - @MockBean + @MockitoBean private SpaceDirectoryService spaceDirectoryService; private MockMvc mockMvc; diff --git a/component/service/src/test/java/io/meeds/social/cms/rest/ContentLinkRestTest.java b/component/service/src/test/java/io/meeds/social/cms/rest/ContentLinkRestTest.java index a7c85819a3a..5d493663b7a 100644 --- a/component/service/src/test/java/io/meeds/social/cms/rest/ContentLinkRestTest.java +++ b/component/service/src/test/java/io/meeds/social/cms/rest/ContentLinkRestTest.java @@ -36,10 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -87,7 +87,7 @@ public class ContentLinkRestTest { @Autowired private WebApplicationContext context; - @MockBean + @MockitoBean private ContentLinkService contentLinkService; private MockMvc mockMvc; diff --git a/component/service/src/test/java/io/meeds/social/resource/rest/SkinRestTest.java b/component/service/src/test/java/io/meeds/social/resource/rest/SkinRestTest.java index bed221cd804..d4ff3d3d436 100644 --- a/component/service/src/test/java/io/meeds/social/resource/rest/SkinRestTest.java +++ b/component/service/src/test/java/io/meeds/social/resource/rest/SkinRestTest.java @@ -27,10 +27,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.security.web.SecurityFilterChain; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -66,7 +66,7 @@ public class SkinRestTest { @Autowired private WebApplicationContext context; - @MockBean + @MockitoBean private SkinService skinService; @Mock diff --git a/component/service/src/test/java/io/meeds/social/security/rest/LoginRestTest.java b/component/service/src/test/java/io/meeds/social/security/rest/LoginRestTest.java index 786ee510b03..136cabcd2b5 100644 --- a/component/service/src/test/java/io/meeds/social/security/rest/LoginRestTest.java +++ b/component/service/src/test/java/io/meeds/social/security/rest/LoginRestTest.java @@ -37,10 +37,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -80,25 +80,25 @@ public class LoginRestTest { @Autowired private WebApplicationContext context; - @MockBean + @MockitoBean private PasswordRecoveryService passwordRecoveryService; - @MockBean + @MockitoBean private OrganizationService organizationService; - @MockBean + @MockitoBean private UserDAOImpl userHandler; - @MockBean + @MockitoBean private RegisterUIParamsExtension registerUIParamsExtension; - @MockBean + @MockitoBean private SecuritySettingService securitySettingService; - @MockBean + @MockitoBean private RemindPasswordTokenService remindPasswordTokenService; - @MockBean + @MockitoBean private Captcha captcha; @Before diff --git a/component/web/pom.xml b/component/web/pom.xml index a6858da1b12..598f1a50b02 100644 --- a/component/web/pom.xml +++ b/component/web/pom.xml @@ -22,7 +22,7 @@ social-component io.meeds.social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT io.meeds.social social-component-web diff --git a/pom.xml b/pom.xml index 41f0b7dc6b3..b05bd744da6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.meeds.social social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT pom Meeds:: PLF:: Social Meeds Social - Enterprise Social Networking @@ -45,8 +45,8 @@ - 7.2.x-SNAPSHOT - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT meeds-io diff --git a/webapp/pom.xml b/webapp/pom.xml index 41212c06580..c5998c42172 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -22,7 +22,7 @@ io.meeds.social social - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT social-webapp war diff --git a/webapp/src/main/java/io/meeds/social/SocialApplication.java b/webapp/src/main/java/io/meeds/social/SocialApplication.java index 4b305f732c7..6d0ce122993 100644 --- a/webapp/src/main/java/io/meeds/social/SocialApplication.java +++ b/webapp/src/main/java/io/meeds/social/SocialApplication.java @@ -19,7 +19,7 @@ package io.meeds.social; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; +import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.context.annotation.PropertySource; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; diff --git a/webapp/src/main/webapp/vue-apps/content-link/components/ContentLinkCommandDrawer.vue b/webapp/src/main/webapp/vue-apps/content-link/components/ContentLinkCommandDrawer.vue index ad56b34cad1..08a6e5c3387 100644 --- a/webapp/src/main/webapp/vue-apps/content-link/components/ContentLinkCommandDrawer.vue +++ b/webapp/src/main/webapp/vue-apps/content-link/components/ContentLinkCommandDrawer.vue @@ -27,10 +27,10 @@ -