diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageNameIdDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageNameIdDTO.java index f24d82c1a7..35e5904ac2 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageNameIdDTO.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageNameIdDTO.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonView; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter public class PageNameIdDTO { @@ -30,6 +32,9 @@ public class PageNameIdDTO { @JsonView(Views.Public.class) Boolean isHidden; + @JsonView(Views.Public.class) + Set userPermissions; + // This field will represent the default pageId for current page in git system where we are connecting resources // among the branches @JsonView(Views.Internal.class) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java index 9e662e8aa3..eccf760cfe 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java @@ -119,16 +119,17 @@ public class CustomNewPageRepositoryCEImpl extends BaseAppsmithRepositoryImpl includedFields = new ArrayList<>(List.of( FieldName.APPLICATION_ID, FieldName.DEFAULT_RESOURCES, - "unpublishedPage.name", - "unpublishedPage.icon", - "unpublishedPage.isHidden", - "unpublishedPage.slug", - "unpublishedPage.customSlug", - "publishedPage.name", - "publishedPage.icon", - "publishedPage.isHidden", - "publishedPage.slug", - "publishedPage.customSlug" + fieldName(QNewPage.newPage.policies), + (fieldName(QNewPage.newPage.unpublishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.name)), + (fieldName(QNewPage.newPage.unpublishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.icon)), + (fieldName(QNewPage.newPage.unpublishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.isHidden)), + (fieldName(QNewPage.newPage.unpublishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.slug)), + (fieldName(QNewPage.newPage.unpublishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.customSlug)), + (fieldName(QNewPage.newPage.publishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.name)), + (fieldName(QNewPage.newPage.publishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.icon)), + (fieldName(QNewPage.newPage.publishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.isHidden)), + (fieldName(QNewPage.newPage.publishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.slug)), + (fieldName(QNewPage.newPage.publishedPage) + "." + fieldName(QNewPage.newPage.unpublishedPage.customSlug)) )); Criteria idsCriterion = where("id").in(ids); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java index a24ea0261d..5f1a1716a1 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java @@ -342,6 +342,7 @@ public class NewPageServiceCEImpl extends BaseService assertThat(pageNameIdDTO.getUserPermissions()).isNotEmpty()); }) .verifyComplete(); } @@ -137,6 +138,7 @@ public class NewPageServiceTest { assertThat(applicationPagesDTO.getApplication().getViewMode()).isTrue(); assertThat(applicationPagesDTO.getApplication().getName()).isEqualTo("app_" + randomId); assertThat(applicationPagesDTO.getPages()).isNotEmpty(); + applicationPagesDTO.getPages().forEach(pageNameIdDTO -> assertThat(pageNameIdDTO.getUserPermissions()).isNotEmpty()); }) .verifyComplete(); } @@ -167,6 +169,7 @@ public class NewPageServiceTest { assertThat(applicationPagesDTO.getApplication()).isNotNull(); assertThat(applicationPagesDTO.getApplication().getName()).isEqualTo("app_" + randomId); assertThat(applicationPagesDTO.getPages()).isNotEmpty(); + applicationPagesDTO.getPages().forEach(pageNameIdDTO -> assertThat(pageNameIdDTO.getUserPermissions()).isNotEmpty()); }) .verifyComplete(); }