[8.x] [Stateful sidenav] Enable on-prem (#203239)

.buildkite/ftr_platform_stateful_configs.yml

@@ -263,7 +263,6 @@ enabled:
   - x-pack/test/functional/apps/security/config.ts
   - x-pack/test/functional/apps/snapshot_restore/config.ts
   - x-pack/test/functional/apps/spaces/config.ts
-  - x-pack/test/functional/apps/spaces/solution_view_flag_enabled/config.ts
   - x-pack/test/functional/apps/status_page/config.ts
   - x-pack/test/functional/apps/transform/creation/index_pattern/config.ts
   - x-pack/test/functional/apps/transform/creation/runtime_mappings_saved_search/config.ts

x-pack/plugins/spaces/public/config.ts

@@ -9,7 +9,4 @@ export interface ConfigType {
   maxSpaces: number;
   allowFeatureVisibility: boolean;
   allowSolutionVisibility: boolean;
-  experimental: {
-    forceSolutionVisibility: boolean;
-  };
 }

x-pack/plugins/spaces/public/management/management_service.test.ts

@@ -27,9 +27,6 @@ describe('ManagementService', () => {
     maxSpaces: 1000,
     allowFeatureVisibility: true,
     allowSolutionVisibility: true,
-    experimental: {
-      forceSolutionVisibility: false,
-    },
   };
 
   describe('#setup', () => {

x-pack/plugins/spaces/public/management/spaces_management_app.test.tsx

@@ -45,9 +45,6 @@ const config: ConfigType = {
   maxSpaces: 1000,
   allowFeatureVisibility: true,
   allowSolutionVisibility: true,
-  experimental: {
-    forceSolutionVisibility: false,
-  },
 };
 
 const eventTracker = new EventTracker({ reportEvent: jest.fn() });

x-pack/plugins/spaces/public/nav_control/solution_view_tour/solution_view_tour.tsx

@@ -72,6 +72,7 @@ export const SolutionViewTour: FC<Props> = ({ children, solution, isTourOpen, on
       onFinish={onFinishTour}
       step={1}
       stepsTotal={1}
+      repositionOnScroll
       title={i18n.translate('xpack.spaces.navControl.tour.title', {
         defaultMessage: 'You chose the {solution} solution view',
         values: { solution: solutionLabel },

x-pack/plugins/spaces/public/plugin.test.ts

@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { cloudMock } from '@kbn/cloud-plugin/public/mocks';
 import { coreMock } from '@kbn/core/public/mocks';
 import { homePluginMock } from '@kbn/home-plugin/public/mocks';
 import {
@@ -20,7 +19,7 @@ describe('Spaces plugin', () => {
     it('should register the space selector app when buildFlavor is traditional', () => {
       const coreSetup = coreMock.createSetup();
       const mockInitializerContext = coreMock.createPluginInitializerContext(
-        {},
+        { allowSolutionVisibility: true },
         { buildFlavor: 'traditional' }
       );
 
@@ -40,7 +39,7 @@ describe('Spaces plugin', () => {
     it('should not register the space selector app when buildFlavor is serverless and maxSpaces is 1', () => {
       const coreSetup = coreMock.createSetup();
       const mockInitializerContext = coreMock.createPluginInitializerContext(
-        { maxSpaces: 1 },
+        { maxSpaces: 1, allowSolutionVisibility: true },
         { buildFlavor: 'serverless' }
       );
 
@@ -60,7 +59,7 @@ describe('Spaces plugin', () => {
     it('should register the space selector app when buildFlavor is serverless and and maxSpaces is >1', () => {
       const coreSetup = coreMock.createSetup();
       const mockInitializerContext = coreMock.createPluginInitializerContext(
-        { maxSpaces: 2 },
+        { maxSpaces: 2, allowSolutionVisibility: true },
         { buildFlavor: 'serverless' }
       );
 
@@ -88,7 +87,7 @@ describe('Spaces plugin', () => {
       management.sections.section.kibana = mockSection;
 
       const mockInitializerContext = coreMock.createPluginInitializerContext(
-        {},
+        { allowSolutionVisibility: true },
         { buildFlavor: 'traditional' }
       );
 
@@ -122,7 +121,9 @@ describe('Spaces plugin', () => {
 
       management.sections.section.kibana = mockSection;
 
-      const plugin = new SpacesPlugin(coreMock.createPluginInitializerContext({ maxSpaces: 1 }));
+      const plugin = new SpacesPlugin(
+        coreMock.createPluginInitializerContext({ maxSpaces: 1, allowSolutionVisibility: true })
+      );
       plugin.setup(coreSetup, {
         management,
         home,
@@ -152,7 +153,9 @@ describe('Spaces plugin', () => {
 
       management.sections.section.kibana = mockSection;
 
-      const plugin = new SpacesPlugin(coreMock.createPluginInitializerContext({ maxSpaces: 2 }));
+      const plugin = new SpacesPlugin(
+        coreMock.createPluginInitializerContext({ maxSpaces: 2, allowSolutionVisibility: true })
+      );
       plugin.setup(coreSetup, {
         management,
         home,
@@ -179,7 +182,7 @@ describe('Spaces plugin', () => {
       const coreStart = coreMock.createStart();
 
       const mockInitializerContext = coreMock.createPluginInitializerContext(
-        {},
+        { allowSolutionVisibility: true },
         { buildFlavor: 'traditional' }
       );
 
@@ -196,7 +199,7 @@ describe('Spaces plugin', () => {
       const coreStart = coreMock.createStart();
 
       const mockInitializerContext = coreMock.createPluginInitializerContext(
-        { maxSpaces: 1 },
+        { maxSpaces: 1, allowSolutionVisibility: true },
         { buildFlavor: 'serverless' }
       );
 
@@ -214,7 +217,9 @@ describe('Spaces plugin', () => {
       const coreSetup = coreMock.createSetup();
       const coreStart = coreMock.createStart();
 
-      const plugin = new SpacesPlugin(coreMock.createPluginInitializerContext({ maxSpaces: 1 }));
+      const plugin = new SpacesPlugin(
+        coreMock.createPluginInitializerContext({ maxSpaces: 1, allowSolutionVisibility: true })
+      );
       const spacesSetup = plugin.setup(coreSetup, {});
       const spacesStart = plugin.start(coreStart);
 
@@ -226,7 +231,9 @@ describe('Spaces plugin', () => {
       const coreSetup = coreMock.createSetup();
       const coreStart = coreMock.createStart();
 
-      const plugin = new SpacesPlugin(coreMock.createPluginInitializerContext({ maxSpaces: 1000 }));
+      const plugin = new SpacesPlugin(
+        coreMock.createPluginInitializerContext({ maxSpaces: 1000, allowSolutionVisibility: true })
+      );
       const spacesSetup = plugin.setup(coreSetup, {});
       const spacesStart = plugin.start(coreStart);
 
@@ -236,129 +243,45 @@ describe('Spaces plugin', () => {
   });
 
   describe('isSolutionViewEnabled', () => {
-    it('when onCloud, not serverless and allowSolutionVisibility is "true"', () => {
+    it('when allowSolutionVisibility is "true"', () => {
       const coreSetup = coreMock.createSetup();
       const coreStart = coreMock.createStart();
-      const cloud = cloudMock.createSetup();
-      cloud.isCloudEnabled = true;
 
       const plugin = new SpacesPlugin(
-        coreMock.createPluginInitializerContext(
-          { allowSolutionVisibility: true },
-          { buildFlavor: 'traditional' }
-        )
+        coreMock.createPluginInitializerContext({ allowSolutionVisibility: true })
       );
-      const spacesSetup = plugin.setup(coreSetup, { cloud });
+      const spacesSetup = plugin.setup(coreSetup, {});
       const spacesStart = plugin.start(coreStart);
 
       expect(spacesSetup.isSolutionViewEnabled).toBe(true);
       expect(spacesStart.isSolutionViewEnabled).toBe(true);
     });
 
-    it('when not onCloud and allowSolutionVisibility is "true"', () => {
+    it('when allowSolutionVisibility is "false"', () => {
       const coreSetup = coreMock.createSetup();
       const coreStart = coreMock.createStart();
 
       {
         const plugin = new SpacesPlugin(
-          coreMock.createPluginInitializerContext(
-            { allowSolutionVisibility: true }, // it is true but we are not onCloud
-            { buildFlavor: 'traditional' }
-          )
+          coreMock.createPluginInitializerContext({ allowSolutionVisibility: false })
         );
         const spacesSetup = plugin.setup(coreSetup, {});
         const spacesStart = plugin.start(coreStart);
 
-        expect(spacesSetup.isSolutionViewEnabled).toBe(false); // so it should be false
-        expect(spacesStart.isSolutionViewEnabled).toBe(false);
-      }
-
-      {
-        // unless the forceSolutionVisibility flag is set
-        const plugin = new SpacesPlugin(
-          coreMock.createPluginInitializerContext(
-            { allowSolutionVisibility: false, experimental: { forceSolutionVisibility: true } },
-            { buildFlavor: 'traditional' }
-          )
-        );
-        const spacesSetup = plugin.setup(coreSetup, {}); // we are not onCloud but forceSolutionVisibility is true
-        const spacesStart = plugin.start(coreStart);
-
-        expect(spacesSetup.isSolutionViewEnabled).toBe(true);
-        expect(spacesStart.isSolutionViewEnabled).toBe(true);
-      }
-    });
-
-    it('when onCloud, not serverless and allowSolutionVisibility is "false"', () => {
-      const coreSetup = coreMock.createSetup();
-      const coreStart = coreMock.createStart();
-      const cloud = cloudMock.createSetup();
-      cloud.isCloudEnabled = true;
-
-      {
-        const plugin = new SpacesPlugin(
-          coreMock.createPluginInitializerContext(
-            { allowSolutionVisibility: false },
-            { buildFlavor: 'traditional' }
-          )
-        );
-        const spacesSetup = plugin.setup(coreSetup, { cloud });
-        const spacesStart = plugin.start(coreStart);
-
         expect(spacesSetup.isSolutionViewEnabled).toBe(false);
         expect(spacesStart.isSolutionViewEnabled).toBe(false);
       }
-
-      {
-        // unless the forceSolutionVisibility flag is set
-        const plugin = new SpacesPlugin(
-          coreMock.createPluginInitializerContext(
-            { allowSolutionVisibility: false, experimental: { forceSolutionVisibility: true } },
-            { buildFlavor: 'traditional' }
-          )
-        );
-        const spacesSetup = plugin.setup(coreSetup, { cloud });
-        const spacesStart = plugin.start(coreStart);
-
-        expect(spacesSetup.isSolutionViewEnabled).toBe(true);
-        expect(spacesStart.isSolutionViewEnabled).toBe(true);
-      }
     });
 
-    it('when onCloud and serverless', () => {
+    it('when allowSolutionVisibility is "undefined"', () => {
       const coreSetup = coreMock.createSetup();
-      const coreStart = coreMock.createStart();
-      const cloud = cloudMock.createSetup();
-      cloud.isCloudEnabled = true;
-
-      {
-        const plugin = new SpacesPlugin(
-          coreMock.createPluginInitializerContext(
-            { allowSolutionVisibility: true },
-            { buildFlavor: 'serverless' }
-          )
-        );
-        const spacesSetup = plugin.setup(coreSetup, { cloud });
-        const spacesStart = plugin.start(coreStart);
 
-        expect(spacesSetup.isSolutionViewEnabled).toBe(false);
-        expect(spacesStart.isSolutionViewEnabled).toBe(false);
-      }
-
-      {
-        // unless the forceSolutionVisibility flag is set
-        const plugin = new SpacesPlugin(
-          coreMock.createPluginInitializerContext(
-            { allowSolutionVisibility: true, experimental: { forceSolutionVisibility: true } },
-            { buildFlavor: 'serverless' }
-          )
-        );
-        const spacesSetup = plugin.setup(coreSetup, { cloud });
-        const spacesStart = plugin.start(coreStart);
-
-        expect(spacesSetup.isSolutionViewEnabled).toBe(true);
-        expect(spacesStart.isSolutionViewEnabled).toBe(true);
-      }
+      const plugin = new SpacesPlugin(
+        coreMock.createPluginInitializerContext({ allowSolutionVisibility: undefined })
+      );
+      expect(() => plugin.setup(coreSetup, {})).toThrowErrorMatchingInlineSnapshot(
+        `"allowSolutionVisibility has not been set in the Spaces plugin config."`
+      );
     });
   });
 });

x-pack/plugins/spaces/public/plugin.tsx

@@ -59,14 +59,11 @@ export class SpacesPlugin implements Plugin<SpacesPluginSetup, SpacesPluginStart
   }
 
   public setup(core: CoreSetup<PluginsStart, SpacesPluginStart>, plugins: PluginsSetup) {
-    const hasOnlyDefaultSpace = this.config.maxSpaces === 1;
-    const onCloud = plugins.cloud !== undefined && plugins.cloud.isCloudEnabled;
+    if (this.config.allowSolutionVisibility === undefined) {
+      throw new Error('allowSolutionVisibility has not been set in the Spaces plugin config.');
+    }
 
-    // We only allow "solution" to be set on cloud environments, not on prem
-    // unless the forceSolutionVisibility flag is set
-    const allowSolutionVisibility =
-      (onCloud && !this.isServerless && this.config.allowSolutionVisibility) ||
-      Boolean(this.config.experimental?.forceSolutionVisibility);
+    const hasOnlyDefaultSpace = this.config.maxSpaces === 1;
 
     this.spacesManager = new SpacesManager(core.http);
     this.spacesApi = {
@@ -77,12 +74,7 @@ export class SpacesPlugin implements Plugin<SpacesPluginSetup, SpacesPluginStart
       getActiveSpace$: () => this.spacesManager.onActiveSpaceChange$,
       getActiveSpace: () => this.spacesManager.getActiveSpace(),
       hasOnlyDefaultSpace,
-      isSolutionViewEnabled: allowSolutionVisibility,
-    };
-
-    this.config = {
-      ...this.config,
-      allowSolutionVisibility,
+      isSolutionViewEnabled: this.config.allowSolutionVisibility,
     };
 
     registerSpacesEventTypes(core);
@@ -166,7 +158,7 @@ export class SpacesPlugin implements Plugin<SpacesPluginSetup, SpacesPluginStart
 
     registerAnalyticsContext(core.analytics, this.spacesManager.onActiveSpaceChange$);
 
-    return { hasOnlyDefaultSpace, isSolutionViewEnabled: allowSolutionVisibility };
+    return { hasOnlyDefaultSpace, isSolutionViewEnabled: this.config.allowSolutionVisibility };
   }
 
   public start(core: CoreStart) {

x-pack/plugins/spaces/server/index.ts

@@ -34,9 +34,6 @@ export const config: PluginConfigDescriptor = {
     maxSpaces: true,
     allowFeatureVisibility: true,
     allowSolutionVisibility: true,
-    experimental: {
-      forceSolutionVisibility: true,
-    },
   },
 };
 

x-pack/plugins/spaces/server/plugin.test.ts

@@ -36,10 +36,7 @@ describe('Spaces plugin', () => {
           "hasOnlyDefaultSpace$": Observable {
             "operator": [Function],
             "source": Observable {
-              "operator": [Function],
-              "source": Observable {
-                "_subscribe": [Function],
-              },
+              "_subscribe": [Function],
             },
           },
           "spacesClient": Object {
@@ -123,10 +120,7 @@ describe('Spaces plugin', () => {
           "hasOnlyDefaultSpace$": Observable {
             "operator": [Function],
             "source": Observable {
-              "operator": [Function],
-              "source": Observable {
-                "_subscribe": [Function],
-              },
+              "_subscribe": [Function],
             },
           },
           "spacesService": Object {