feat: Add Permission choice when creating Portlet Instance - MEED-698…

…2 - Meeds-io/MIPs#139 (#100)
Meeds-io · Jun 4, 2024 · f224bdd · f224bdd
1 parent 39ef525
commit f224bdd
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 91 deletions.
diff --git a/layout-service/src/main/java/io/meeds/layout/entity/PortletInstanceEntity.java b/layout-service/src/main/java/io/meeds/layout/entity/PortletInstanceEntity.java
@@ -66,9 +66,6 @@ public class PortletInstanceEntity implements Serializable {
   @Column(name = "IS_SYSTEM")
   private boolean           system;
 
-  @Column(name = "IS_SPACE_APPLICATION")
-  private boolean           spaceApplication;
-
   @Column(name = "IS_DISABLED")
   private boolean           disabled;
 

diff --git a/layout-service/src/main/java/io/meeds/layout/model/PortletInstance.java b/layout-service/src/main/java/io/meeds/layout/model/PortletInstance.java
@@ -51,6 +51,4 @@ public class PortletInstance {
 
   private boolean                         disabled;
 
-  private boolean                         spaceApplication;
-
 }
diff --git a/layout-service/src/main/java/io/meeds/layout/model/PortletInstanceDescriptor.java b/layout-service/src/main/java/io/meeds/layout/model/PortletInstanceDescriptor.java
@@ -46,8 +46,6 @@ public class PortletInstanceDescriptor {
 
   private boolean                         system;
 
-  private boolean                         spaceApplication;
-
   private String                          illustrationPath;
 
 }
diff --git a/...service/src/main/java/io/meeds/layout/service/injection/PortletInstanceImportService.java b/...service/src/main/java/io/meeds/layout/service/injection/PortletInstanceImportService.java
@@ -301,7 +301,6 @@ protected PortletInstance savePortletInstance(PortletInstanceDescriptor d, long
     portletInstance.setCategoryId(getCategorySettingValue(d.getCategoryNameId()));
     portletInstance.setPermissions(d.getPermissions());
     portletInstance.setPreferences(d.getPreferences());
-    portletInstance.setSpaceApplication(d.isSpaceApplication());
     portletInstance.setSystem(d.isSystem());
     if (isNew) {
       return portletInstanceService.createPortletInstance(portletInstance);

diff --git a/layout-service/src/main/java/io/meeds/layout/util/EntityMapper.java b/layout-service/src/main/java/io/meeds/layout/util/EntityMapper.java
@@ -64,8 +64,7 @@ public static PortletInstance fromEntity(PortletInstanceEntity entity, PortletDe
                                            entity.getPermissions().stream().filter(StringUtils::isNotBlank).toList(),
                                portlet == null ? null : portlet.getSupportedModes(),
                                entity.isSystem(),
-                               entity.isDisabled(),
-                               entity.isSpaceApplication());
+                               entity.isDisabled());
   }
 
   public static PortletInstanceCategoryEntity toEntity(PortletInstanceCategory instance) {
@@ -82,7 +81,6 @@ public static PortletInstanceEntity toEntity(PortletInstance instance) {
                                      instance.getPermissions(),
                                      getPreferencesString(instance),
                                      instance.isSystem(),
-                                     instance.isSpaceApplication(),
                                      instance.isDisabled(),
                                      Objects.hash(instance.getCategoryId(),
                                                   getPreferencesString(instance),

diff --git a/layout-service/src/main/resources/changelog/layout-rdbms.db.changelog-1.0.0.xml b/layout-service/src/main/resources/changelog/layout-rdbms.db.changelog-1.0.0.xml
@@ -503,22 +503,6 @@
     </addColumn>
   </changeSet>
 
-  <changeSet
-    author="layout"
-    id="1.0.0-31">
-    <preConditions onFail="MARK_RAN">
-      <not>
-        <columnExists tableName="PORTAL_APPLICATIONS" columnName="IS_SPACE_APPLICATION"/>
-      </not>
-    </preConditions>
-    <addColumn tableName="PORTAL_APPLICATIONS">
-      <column
-        name="IS_SPACE_APPLICATION"
-        type="Boolean"
-        defaultValueBoolean="false" />
-    </addColumn>
-  </changeSet>
-
   <changeSet
     author="layout"
     id="1.0.0-32">

diff --git a/layout-service/src/main/resources/portlet-instances.json b/layout-service/src/main/resources/portlet-instances.json
@@ -17,8 +17,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":true
+      "system":true
     },
     {
       "nameId":"SpaceSettingPortlet",
@@ -37,8 +36,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":true
+      "system":true
     },
     {
       "nameId":"Image",
@@ -57,8 +55,7 @@
       "permissions":[
         "Everyone"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"Links",
@@ -77,8 +74,7 @@
       "permissions":[
         "Everyone"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"ExternalSpacesList",
@@ -97,8 +93,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"GettingStarted",
@@ -111,10 +106,10 @@
         "en":"layout.portletInstance.GettingStarted.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"SpaceBannerPortlet",
@@ -133,8 +128,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"WhoIsOnLinePortlet",
@@ -153,8 +147,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"PeopleOverview",
@@ -173,8 +166,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"SpaceActivityStreamPortlet",
@@ -193,8 +185,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":true
+      "system":true
     },
     {
       "nameId":"SpacesOverview",
@@ -211,10 +202,10 @@
 
       ],
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"SuggestionsPeopleAndSpace",
@@ -231,10 +222,10 @@
 
       ],
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"UserActivityStreamPortlet",
@@ -251,10 +242,10 @@
 
       ],
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"SpaceInfos",
@@ -273,8 +264,7 @@
       "permissions":[
         "*:/platform/users"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"VerticalMenu",
@@ -291,10 +281,10 @@
 
       ],
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"VerticalMenu",
@@ -311,10 +301,10 @@
 
       ],
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"Breadcrumb",
@@ -331,10 +321,10 @@
 
       ],
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
-      "system":true,
-      "spaceApplication":false
+      "system":true
     },
     {
       "nameId":"GeneralSettings",
@@ -347,7 +337,8 @@
         "en":"layout.portletInstance.GeneralSettings.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -362,7 +353,8 @@
         "en":"layout.portletInstance.UserSettingLanguage.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -377,7 +369,8 @@
         "en":"layout.portletInstance.UserSettingNotifications.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -392,7 +385,8 @@
         "en":"layout.portletInstance.UserSettingSecurity.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -407,7 +401,8 @@
         "en":"layout.portletInstance.ProfileAboutMe.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -422,7 +417,8 @@
         "en":"layout.portletInstance.ProfileContactInformation.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -437,7 +433,8 @@
         "en":"layout.portletInstance.ProfileHeader.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     },
@@ -452,7 +449,8 @@
         "en":"layout.portletInstance.ProfileWorkExperience.description"
       },
       "permissions":[
-        "*:/platform/users"
+        "*:/platform/administrators",
+        "*:/platform/web-contributors"
       ],
       "system":true
     }

diff --git a/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceServiceTest.java
@@ -515,8 +515,7 @@ private PortletInstance newPortletInstance() {
                                Collections.singletonList("Everyone"),
                                Collections.singletonList("edit"),
                                true,
-                               false,
-                               true);
+                               false);
   }
 
 }
diff --git a/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_en.properties b/layout-webapp/src/main/resources/locale/portlet/LayoutEditor_en.properties
@@ -275,8 +275,6 @@ layout.category.placeholder=Select a category
 layout.portlet=Portlet
 layout.portlet.placeholder=Select a portlet
 
-layout.portlet.allowUsingInSpaceContext=Allow space hosts use it for space apps
-
 layout.portletInstance.add=Add
 
 layout.portletInstanceCategoryCreatedSuccessfully=Portlet Instance Category created successfully
@@ -295,5 +293,10 @@ portlets.noPreviewAvailable=No preview available
 portlets.switchToEditMode=Edit mode
 portlets.switchToViewMode=View mode
 portlets.emptyPortletInstanceContent=Empty portlet instance
+portlets.selectWhoCanAddIt=Select who can add it inside a page
+portlets.administratorsMandatorySelectionTooltip=Admin has to access this app
+portlets.administrators=Administrators
+portlets.contentManagers=Content Managers
+portlets.spaceHost=Space Host
 
-layout.editPortletInstance=Edit portlet instance {0}
+layout.editPortletInstance=Edit portlet instance {0}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,6 +51,4 @@ public class PortletInstance {

		private boolean disabled;

		private boolean spaceApplication;

		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -515,8 +515,7 @@ private PortletInstance newPortletInstance() { @@
                                    Collections.singletonList("Everyone"),
                                    Collections.singletonList("edit"),
                                    true,
-                                   false,
-                                   true);
+                                   false);
       }
     }