feat: Remove Mandatory Flag in Space Form inputs - MEED-7750 - Meeds-…

…io/MIPs#160
Meeds-io · Nov 11, 2024 · a31c7af · a31c7af
1 parent 096aded
commit a31c7af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 40 deletions.
diff --git a/component/core/src/main/java/io/meeds/social/space/service/SpaceServiceImpl.java b/component/core/src/main/java/io/meeds/social/space/service/SpaceServiceImpl.java
@@ -980,7 +980,7 @@ private void copySpaceTemplateProperties(Space space,
                                            String username,
                                            List<String> invitees) throws SpaceException {
     setSpaceAccess(space, spaceTemplate);
-    setSpaceDisplayName(space, spaceTemplate, invitees);
+    setSpaceDisplayName(space, invitees);
     // Creates the associated group to the space
     String groupId = createSpaceGroup(space, username);
     setDeletePermissions(space, spaceTemplate, groupId);
@@ -1009,9 +1009,8 @@ private void setSpaceAccess(Space space, SpaceTemplate spaceTemplate) {
     }
   }
 
-  private void setSpaceDisplayName(Space space, SpaceTemplate spaceTemplate, List<String> invitees) throws SpaceException {
-    if (!spaceTemplate.getSpaceFields().contains("name")
-        && StringUtils.isBlank(space.getDisplayName())) {
+  private void setSpaceDisplayName(Space space, List<String> invitees) throws SpaceException {
+    if (StringUtils.isBlank(space.getDisplayName())) {
       if (CollectionUtils.isNotEmpty(invitees)) {
         invitees = new ArrayList<>(invitees);
         invitees.removeAll(Arrays.asList(space.getMembers()));

diff --git a/component/core/src/test/java/org/exoplatform/social/core/space/spi/SpaceServiceTest.java b/component/core/src/test/java/org/exoplatform/social/core/space/spi/SpaceServiceTest.java
@@ -870,29 +870,15 @@ public void testCreateSpaceNameTooShort() {
     assertThrows(SpaceException.class, () -> spaceService.createSpace(space, ROOT_NAME));
   }
 
-  public void testCreateSpaceWithNoNameWhenSpaceTemplateAllowsIt() throws ObjectNotFoundException {
-    SpaceTemplateService spaceTemplateService = getService(SpaceTemplateService.class);
-    SpaceTemplate spaceTemplate = spaceTemplateService.getSpaceTemplates().getFirst();
-    List<String> originalSpaceFields = spaceTemplate.getSpaceFields();
-
-    try {
-      Space space = new Space();
-      space.setRegistration(Space.OPEN);
-      space.setDescription(SPACE_DESCRIPTION);
-      space.setVisibility(Space.PUBLIC);
-      space.setRegistration(Space.VALIDATION);
-      assertThrows(SpaceException.class, () -> spaceService.createSpace(space, ROOT_NAME));
-
-      spaceTemplate.setSpaceFields(Collections.singletonList("invitation"));
-      spaceTemplateService.updateSpaceTemplate(spaceTemplate);
-
-      Space createdSpace = spaceService.createSpace(space, DRAGON_NAME);
-      assertNotNull(createdSpace);
-      assertEquals("Dragon Ball", createdSpace.getDisplayName());
-    } finally {
-      spaceTemplate.setSpaceFields(originalSpaceFields);
-      spaceTemplateService.updateSpaceTemplate(spaceTemplate);
-    }
+  public void testCreateSpaceWithNoName() {
+    Space space = new Space();
+    space.setRegistration(Space.OPEN);
+    space.setDescription(SPACE_DESCRIPTION);
+    space.setVisibility(Space.PUBLIC);
+    space.setRegistration(Space.VALIDATION);
+    Space createdSpace = spaceService.createSpace(space, DRAGON_NAME);
+    assertNotNull(createdSpace);
+    assertEquals("Dragon Ball", createdSpace.getDisplayName());
   }
 
   public void testCreateSpaceWithTemplateCharacteristics() throws ObjectNotFoundException, SpaceException {

diff --git a/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormDrawer.vue b/webapp/src/main/webapp/vue-apps/space-form/components/SpaceFormDrawer.vue
@@ -53,9 +53,6 @@
               <input
                 ref="autoFocusInput1"
                 v-model="space.displayName"
-                v-bind="nameIsRequired && {
-                  required: 'required',
-                }"
                 :aria-label="$t('spacesList.label.displayName')"
                 :placeholder="$t('spacesList.label.displayName')"
                 type="text"
@@ -194,7 +191,6 @@
                 v-model="space.invitedMembers"
                 :labels="suggesterLabels"
                 :disabled="savingSpace || spaceSaved"
-                :required="invitationIsRequired"
                 :search-options="{
                   spaceURL: space.prettyName,
                 }"
@@ -269,8 +265,7 @@ export default {
       return this.savingSpace
         || this.spaceSaved
         || this.stepper < 3 && !this.space.id
-        || (this.space.description?.length || 0) > this.maxDescriptionLength
-        || (this.invitationIsRequired && !this.space.invitedMembers?.length);
+        || (this.space.description?.length || 0) > this.maxDescriptionLength;
     },
     sortedTemplates() {
       const spaceTemplates = this.templates?.filter?.(t => t.name) || [];
@@ -285,12 +280,6 @@ export default {
     spaceTemplate() {
       return this.templates?.find?.(temp => temp.id === this.templateId);
     },
-    nameIsRequired() {
-      return this.spaceTemplate?.spaceFields?.includes?.('name');
-    },
-    invitationIsRequired() {
-      return this.spaceTemplate?.spaceFields?.includes?.('invitation');
-    },
     displayedForm() {
       return this.$refs && this.$refs[`form${this.stepper}`];
     },
@@ -411,7 +400,7 @@ export default {
         return;
       }
       this.spaceToUpdate = space;
-      this.space = Object.assign({}, space);
+      this.space = {...space};
       this.templateId = this.space.templateId;
       this.title = this.$t('spacesList.label.editSpace', { 0: this.space.displayName });
       this.$spaceTemplateService.getSpaceTemplates()