Make spaces optional on the front-end

x-pack/plugins/infra/public/hooks/use_kibana_space.ts

@@ -17,7 +17,11 @@ export type ActiveSpace =
 export const useActiveKibanaSpace = (): ActiveSpace => {
   const kibana = useKibanaContextForPlugin();
 
-  const asyncActiveSpace = useAsync(kibana.services.spaces.getActiveSpace);
+  const asyncActiveSpace = useAsync(
+    kibana.services.spaces
+      ? kibana.services.spaces.getActiveSpace
+      : () => Promise.resolve(undefined)
+  );
 
   if (asyncActiveSpace.loading) {
     return {

x-pack/plugins/infra/public/types.ts

@@ -67,7 +67,7 @@ export interface InfraClientStartDeps {
   unifiedSearch: UnifiedSearchPublicPluginStart;
   dataViews: DataViewsPublicPluginStart;
   observability: ObservabilityPublicStart;
-  spaces: SpacesPluginStart;
+  spaces?: SpacesPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   usageCollection: UsageCollectionStart;
   ml: MlPluginStart;

x-pack/plugins/lens/public/app_plugin/app.test.tsx

@@ -1563,7 +1563,7 @@ describe('Lens App', () => {
         },
       },
     });
-    expect(services.spaces.ui.components.getLegacyUrlConflict).toHaveBeenCalledWith({
+    expect(services.spaces?.ui.components.getLegacyUrlConflict).toHaveBeenCalledWith({
       currentObjectId: '1234',
       objectNoun: 'Lens visualization',
       otherObjectId: '2',

x-pack/plugins/lens/public/app_plugin/types.ts

@@ -151,7 +151,7 @@ export interface LensAppServices {
   savedObjectsTagging?: SavedObjectTaggingPluginStart;
   getOriginatingAppName: () => string | undefined;
   presentationUtil: PresentationUtilPluginStart;
-  spaces: SpacesApi;
+  spaces?: SpacesApi;
   charts: ChartsPluginSetup;
   share?: SharePluginStart;
   unifiedSearch: UnifiedSearchPublicPluginStart;

x-pack/plugins/lens/public/plugin.ts

@@ -144,7 +144,7 @@ export interface LensPluginStartDependencies {
   dataViewFieldEditor: IndexPatternFieldEditorStart;
   dataViewEditor: DataViewEditorStart;
   inspector: InspectorStartContract;
-  spaces: SpacesPluginStart;
+  spaces?: SpacesPluginStart;
   usageCollection?: UsageCollectionStart;
   docLinks: DocLinksStart;
   share?: SharePluginStart;

x-pack/plugins/lens/public/state_management/load_initial.test.tsx

@@ -309,7 +309,7 @@ describe('Initializing the store', () => {
       expect(deps.lensServices.attributeService.unwrapAttributes).toHaveBeenCalledWith({
         savedObjectId: defaultSavedObjectId,
       });
-      expect(deps.lensServices.spaces.ui.redirectLegacyUrl).toHaveBeenCalledWith({
+      expect(deps.lensServices.spaces?.ui.redirectLegacyUrl).toHaveBeenCalledWith({
         path: '#/edit/id2?search',
         aliasPurpose: 'savedObjectConversion',
         objectNoun: 'Lens visualization',

x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts

@@ -40,7 +40,7 @@ interface StartPlugins {
   usageCollection?: UsageCollectionSetup;
   fieldFormats: FieldFormatsRegistry;
   dashboard: DashboardSetup;
-  spacesApi: SpacesPluginStart;
+  spacesApi?: SpacesPluginStart;
   charts: ChartsPluginStart;
   cases?: CasesUiStart;
   unifiedSearch: UnifiedSearchPublicPluginStart;

x-pack/plugins/observability/public/hooks/use_kibana_space.tsx

@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Space } from '@kbn/spaces-plugin/common';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ObservabilityPublicPluginsStart, useFetcher } from '..';
 
@@ -15,7 +14,7 @@ export const useKibanaSpace = () => {
     data: space,
     loading,
     error,
-  } = useFetcher<Promise<Space>>(() => {
+  } = useFetcher(() => {
     return services.spaces?.getActiveSpace();
   }, [services.spaces]);
 

x-pack/plugins/observability/public/plugin.ts

@@ -103,7 +103,7 @@ export interface ObservabilityPublicPluginsStart {
   actionTypeRegistry: ActionTypeRegistryContract;
   security: SecurityPluginStart;
   guidedOnboarding: GuidedOnboardingPluginStart;
-  spaces: SpacesPluginStart;
+  spaces?: SpacesPluginStart;
 }
 
 export type ObservabilityPublicStart = ReturnType<Plugin['start']>;

x-pack/plugins/osquery/public/types.ts

@@ -50,7 +50,7 @@ export interface StartPlugins {
   fleet: FleetStart;
   lens?: LensPublicStart;
   security: SecurityPluginStart;
-  spaces: SpacesPluginStart;
+  spaces?: SpacesPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   cases: CasesUiStart;
   timelines: TimelinesUIStart;

x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.test.tsx

@@ -15,6 +15,8 @@ import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { KibanaFeature } from '@kbn/features-plugin/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import type { Space } from '@kbn/spaces-plugin/public';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
 import { mountWithIntl, nextTick } from '@kbn/test-jest-helpers';
 
 import { licenseMock } from '../../../../common/licensing/index.mock';
@@ -26,6 +28,10 @@ import { EditRolePage } from './edit_role_page';
 import { SpaceAwarePrivilegeSection } from './privileges/kibana/space_aware_privilege_section';
 import { TransformErrorSection } from './privileges/kibana/transform_error_section';
 
+const spacesManager = spacesManagerMock.create();
+const { getStartServices } = coreMock.createSetup();
+const spacesApiUi = getUiApi({ spacesManager, getStartServices });
+
 const buildFeatures = () => {
   return [
     new KibanaFeature({
@@ -183,6 +189,7 @@ function getProps({
     fatalErrors,
     uiCapabilities: buildUICapabilities(canManageSpaces),
     history: scopedHistoryMock.create(),
+    spacesApiUi,
   };
 }
 

x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx

@@ -470,6 +470,7 @@ export const EditRolePage: FunctionComponent<Props> = ({
         <KibanaPrivilegesRegion
           kibanaPrivileges={new KibanaPrivileges(kibanaPrivileges, features)}
           spaces={spaces.list}
+          spacesEnabled={spaces.enabled}
           uiCapabilities={uiCapabilities}
           canCustomizeSubFeaturePrivileges={license.getFeatures().allowSubFeaturePrivileges}
           editable={!isRoleReadOnly}

x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.test.tsx

@@ -8,13 +8,21 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '@kbn/core/public/mocks';
+import { spacesManagerMock } from '@kbn/spaces-plugin/public/spaces_manager/mocks';
+import { getUiApi } from '@kbn/spaces-plugin/public/ui_api';
+
 import type { Role } from '../../../../../../common/model';
 import { KibanaPrivileges } from '../../../model';
 import { RoleValidator } from '../../validate_role';
 import { KibanaPrivilegesRegion } from './kibana_privileges_region';
 import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section';
 import { TransformErrorSection } from './transform_error_section';
 
+const spacesManager = spacesManagerMock.create();
+const { getStartServices } = coreMock.createSetup();
+const spacesApiUi = getUiApi({ spacesManager, getStartServices });
+
 const buildProps = () => {
   return {
     role: {
@@ -62,6 +70,8 @@ const buildProps = () => {
     onChange: jest.fn(),
     validator: new RoleValidator(),
     canCustomizeSubFeaturePrivileges: true,
+    spacesEnabled: true,
+    spacesApiUi,
   };
 };
 

x-pack/plugins/security/public/management/roles/edit_role/privileges/kibana/kibana_privileges_region.tsx

@@ -14,11 +14,13 @@ import type { Role } from '../../../../../../common/model';
 import type { KibanaPrivileges } from '../../../model';
 import { CollapsiblePanel } from '../../collapsible_panel';
 import type { RoleValidator } from '../../validate_role';
+import { SimplePrivilegeSection } from './simple_privilege_section';
 import { SpaceAwarePrivilegeSection } from './space_aware_privilege_section';
 import { TransformErrorSection } from './transform_error_section';
 
 interface Props {
   role: Role;
+  spacesEnabled: boolean;
   canCustomizeSubFeaturePrivileges: boolean;
   spaces?: Space[];
   uiCapabilities: Capabilities;
@@ -42,6 +44,7 @@ export class KibanaPrivilegesRegion extends Component<Props, {}> {
     const {
       kibanaPrivileges,
       role,
+      spacesEnabled,
       canCustomizeSubFeaturePrivileges,
       spaces = [],
       uiCapabilities,
@@ -55,17 +58,29 @@ export class KibanaPrivilegesRegion extends Component<Props, {}> {
       return <TransformErrorSection />;
     }
 
+    if (spacesApiUi && spacesEnabled) {
+      return (
+        <SpaceAwarePrivilegeSection
+          kibanaPrivileges={kibanaPrivileges}
+          role={role}
+          spaces={spaces}
+          uiCapabilities={uiCapabilities}
+          onChange={onChange}
+          editable={editable}
+          canCustomizeSubFeaturePrivileges={canCustomizeSubFeaturePrivileges}
+          validator={validator}
+          spacesApiUi={spacesApiUi}
+        />
+      );
+    }
+
     return (
-      <SpaceAwarePrivilegeSection
+      <SimplePrivilegeSection
         kibanaPrivileges={kibanaPrivileges}
         role={role}
-        spaces={spaces}
-        uiCapabilities={uiCapabilities}
         onChange={onChange}
         editable={editable}
         canCustomizeSubFeaturePrivileges={canCustomizeSubFeaturePrivileges}
-        validator={validator}
-        spacesApiUi={spacesApiUi!}
       />
     );
   };