Fix buggy validation when editing an existing space (#109709)

elastic · Aug 23, 2021 · c3086b0 · c3086b0
1 parent a0bd0af
commit c3086b0
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 2 deletions.
diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -166,6 +166,69 @@ describe('ManageSpacePage', () => {
     });
   });
 
+  it('sets calculated fields for existing spaces', async () => {
+    // The Spaces plugin provides functions to calculate the initials and color of a space if they have not been customized. The new space
+    // management page explicitly sets these fields when a new space is created, but it should also handle existing "legacy" spaces that do
+    // not already have these fields set.
+    const spaceToUpdate = {
+      id: 'existing-space',
+      name: 'Existing Space',
+      description: 'hey an existing space',
+      color: undefined,
+      initials: undefined,
+      imageUrl: undefined,
+      disabledFeatures: [],
+    };
+
+    const spacesManager = spacesManagerMock.create();
+    spacesManager.getSpace = jest.fn().mockResolvedValue({
+      ...spaceToUpdate,
+    });
+    spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
+
+    const onLoadSpace = jest.fn();
+
+    const wrapper = mountWithIntl(
+      <ManageSpacePage
+        spaceId={'existing-space'}
+        spacesManager={(spacesManager as unknown) as SpacesManager}
+        onLoadSpace={onLoadSpace}
+        getFeatures={featuresStart.getFeatures}
+        notifications={notificationServiceMock.createStartContract()}
+        history={history}
+        capabilities={{
+          navLinks: {},
+          management: {},
+          catalogue: {},
+          spaces: { manage: true },
+        }}
+      />
+    );
+
+    await waitFor(() => {
+      wrapper.update();
+      expect(spacesManager.getSpace).toHaveBeenCalledWith('existing-space');
+    });
+
+    expect(onLoadSpace).toHaveBeenCalledWith({
+      ...spaceToUpdate,
+    });
+
+    await Promise.resolve();
+
+    wrapper.update();
+
+    // not changing anything, just clicking the "Update space" button
+    await clickSaveButton(wrapper);
+
+    expect(spacesManager.updateSpace).toHaveBeenCalledWith({
+      ...spaceToUpdate,
+      color: '#E7664C',
+      initials: 'ES',
+      imageUrl: '',
+    });
+  });
+
   it('notifies when there is an error retrieving features', async () => {
     const spacesManager = spacesManagerMock.create();
     spacesManager.createSpace = jest.fn(spacesManager.createSpace);

diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -328,9 +328,11 @@ export class ManageSpacePage extends Component<Props, State> {
             ...space,
             avatarType: space.imageUrl ? 'image' : 'initials',
             initials: space.initials || getSpaceInitials(space),
+            color: space.color || getSpaceColor(space),
             customIdentifier: false,
-            customAvatarInitials: getSpaceInitials({ name: space.name }) !== space.initials,
-            customAvatarColor: getSpaceColor({ name: space.name }) !== space.color,
+            customAvatarInitials:
+              !!space.initials && getSpaceInitials({ name: space.name }) !== space.initials,
+            customAvatarColor: !!space.color && getSpaceColor({ name: space.name }) !== space.color,
           },
           features,
           originalSpace: space,