More changes for PR review feedback

elastic · Oct 2, 2020 · e0ad362 · e0ad362
1 parent bdcf5fe
commit e0ad362
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/x-pack/plugins/spaces/public/lib/index.ts b/x-pack/plugins/spaces/public/lib/index.ts
@@ -4,6 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DocumentationLinksService } from './documentation_links';
-
-export { DocumentationLinksService };
+export { DocumentationLinksService } from './documentation_links';
diff --git a/x-pack/plugins/spaces/server/lib/utils/namespace.ts b/x-pack/plugins/spaces/server/lib/utils/namespace.ts
@@ -6,8 +6,6 @@
 
 import { SavedObjectsUtils } from '../../../../../../src/core/server';
 
-export const ALL_SPACES_STRING = '*';
-
 /**
  * Converts a Space ID string to its namespace ID representation. Note that a Space ID string is equivalent to a namespace string.
  *

diff --git a/x-pack/plugins/spaces/server/routes/api/external/share_to_space.ts b/x-pack/plugins/spaces/server/routes/api/external/share_to_space.ts
@@ -7,9 +7,9 @@
 import { schema } from '@kbn/config-schema';
 import { wrapError } from '../../../lib/errors';
 import { ExternalRouteDeps } from '.';
+import { ALL_SPACES_ID } from '../../../../common/constants';
 import { SPACE_ID_REGEX } from '../../../lib/space_schema';
 import { createLicensedRouteHandler } from '../../lib';
-import { ALL_SPACES_STRING } from '../../../lib/utils/namespace';
 
 const uniq = <T>(arr: T[]): T[] => Array.from(new Set<T>(arr));
 export function initShareToSpacesApi(deps: ExternalRouteDeps) {
@@ -19,7 +19,7 @@ export function initShareToSpacesApi(deps: ExternalRouteDeps) {
     spaces: schema.arrayOf(
       schema.string({
         validate: (value) => {
-          if (value !== ALL_SPACES_STRING && !SPACE_ID_REGEX.test(value)) {
+          if (value !== ALL_SPACES_ID && !SPACE_ID_REGEX.test(value)) {
             return `lower case, a-z, 0-9, "_", and "-" are allowed, OR "*"`;
           }
         },

diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
@@ -20,8 +20,9 @@ import {
   SavedObjectsUtils,
   ISavedObjectTypeRegistry,
 } from '../../../../../src/core/server';
+import { ALL_SPACES_ID } from '../../common/constants';
 import { SpacesServiceSetup } from '../spaces_service/spaces_service';
-import { ALL_SPACES_STRING, spaceIdToNamespace } from '../lib/utils/namespace';
+import { spaceIdToNamespace } from '../lib/utils/namespace';
 import { SpacesClient } from '../lib/spaces_client';
 
 interface SpacesSavedObjectsClientOptions {
@@ -169,7 +170,7 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
 
       try {
         const availableSpaces = await spacesClient.getAll('findSavedObjects');
-        if (namespaces.includes(ALL_SPACES_STRING)) {
+        if (namespaces.includes(ALL_SPACES_ID)) {
           namespaces = availableSpaces.map((space) => space.id);
         } else {
           namespaces = namespaces.filter((namespace) =>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,6 @@ @@
     import { SavedObjectsUtils } from '../../../../../../src/core/server';
-    export const ALL_SPACES_STRING = '*';
     /**
      * Converts a Space ID string to its namespace ID representation. Note that a Space ID string is equivalent to a namespace string.
      *
@@ Expand Down @@