Reimplement in elastic/kibana: Saved filters list items accessibility fix

packages/kbn-config-schema/src/index.ts

@@ -36,7 +36,6 @@ import {
   MapOfOptions,
   MapOfType,
   MaybeType,
-  NullableType,
   NeverType,
   NumberOptions,
   NumberType,
@@ -102,7 +101,7 @@ function maybe<V>(type: Type<V>): Type<V | undefined> {
 }
 
 function nullable<V>(type: Type<V>): Type<V | null> {
-  return new NullableType(type);
+  return schema.oneOf([type, schema.literal(null)], { defaultValue: null });
 }
 
 function object<P extends Props>(props: P, options?: ObjectTypeOptions<P>): ObjectType<P> {

packages/kbn-config-schema/src/types/index.ts

@@ -26,7 +26,6 @@ export { ConditionalType, ConditionalTypeValue } from './conditional_type';
 export { DurationOptions, DurationType } from './duration_type';
 export { LiteralType } from './literal_type';
 export { MaybeType } from './maybe_type';
-export { NullableType } from './nullable_type';
 export { MapOfOptions, MapOfType } from './map_type';
 export { NumberOptions, NumberType } from './number_type';
 export { ObjectType, ObjectTypeOptions, Props, TypeOf } from './object_type';

packages/kbn-config-schema/src/types/nullable_type.test.ts

@@ -19,19 +19,66 @@
 
 import { schema } from '..';
 
-test('returns value if specified', () => {
+test('returns string value when passed string', () => {
   const type = schema.nullable(schema.string());
-  expect(type.validate('test')).toEqual('test');
+  expect(type.validate('test')).toBe('test');
 });
 
-test('returns null if null', () => {
+test('returns number value when passed number', () => {
+  const type = schema.nullable(schema.number());
+  expect(type.validate(42)).toBe(42);
+});
+
+test('returns boolean value when passed boolean', () => {
+  const type = schema.nullable(schema.boolean());
+  expect(type.validate(true)).toBe(true);
+});
+
+test('returns object value when passed object', () => {
+  const type = schema.nullable(
+    schema.object({
+      foo: schema.number(),
+      bar: schema.boolean(),
+      baz: schema.string(),
+    })
+  );
+  const object = {
+    foo: 666,
+    bar: true,
+    baz: 'foo bar baz',
+  };
+
+  expect(type.validate(object)).toEqual(object);
+});
+
+test('returns null if null for string', () => {
   const type = schema.nullable(schema.string());
-  expect(type.validate(null)).toEqual(null);
+  expect(type.validate(null)).toBe(null);
+});
+
+test('returns null if null for number', () => {
+  const type = schema.nullable(schema.number());
+  expect(type.validate(null)).toBe(null);
 });
 
-test('returns null if undefined', () => {
+test('returns null if null for boolean', () => {
+  const type = schema.nullable(schema.boolean());
+  expect(type.validate(null)).toBe(null);
+});
+
+test('returns null if undefined for string', () => {
   const type = schema.nullable(schema.string());
-  expect(type.validate(undefined)).toEqual(null);
+  expect(type.validate(undefined)).toBe(null);
+});
+
+test('returns null if undefined for number', () => {
+  const type = schema.nullable(schema.number());
+  expect(type.validate(undefined)).toBe(null);
+});
+
+test('returns null if undefined for boolean', () => {
+  const type = schema.nullable(schema.boolean());
+  expect(type.validate(undefined)).toBe(null);
 });
 
 test('returns null even if contained type has a default value', () => {
@@ -41,7 +88,7 @@ test('returns null even if contained type has a default value', () => {
     })
   );
 
-  expect(type.validate(undefined)).toEqual(null);
+  expect(type.validate(undefined)).toBe(null);
 });
 
 test('validates contained type', () => {
@@ -56,6 +103,27 @@ test('validates basic type', () => {
   expect(() => type.validate(666)).toThrowErrorMatchingSnapshot();
 });
 
+test('validates type in object', () => {
+  const type = schema.object({
+    foo: schema.nullable(schema.string({ maxLength: 1 })),
+    bar: schema.nullable(schema.boolean()),
+  });
+
+  expect(type.validate({ foo: 'a' })).toEqual({ foo: 'a', bar: null });
+  expect(type.validate({ foo: null })).toEqual({ foo: null, bar: null });
+  expect(type.validate({})).toEqual({ foo: null, bar: null });
+  expect(type.validate({ bar: null })).toEqual({ foo: null, bar: null });
+});
+
+test('validates type errors in object', () => {
+  const type = schema.object({
+    foo: schema.nullable(schema.string({ maxLength: 1 })),
+    bar: schema.nullable(schema.boolean()),
+  });
+
+  expect(() => type.validate({ foo: 'ab' })).toThrowErrorMatchingSnapshot();
+});
+
 test('includes namespace in failure', () => {
   const type = schema.nullable(schema.string({ maxLength: 1 }));
 

packages/kbn-plugin-helpers/lib/plugin_config.js

@@ -39,8 +39,9 @@ module.exports = function(root) {
   const kibanaExtraDir = resolve(root, '../../kibana');
   const kibanaPluginsDir = resolve(root, '../../');
   const isPluginOnKibanaExtra = pluginPackageJsonPath.includes(kibanaExtraDir);
+  const isPluginXpack = pkg.name === 'x-pack';
 
-  if (isPluginOnKibanaExtra) {
+  if (isPluginOnKibanaExtra && !isPluginXpack) {
     console.warn(
       `In the future we will disable ../kibana-extra/{pluginName}. You should move your plugin ${pkg.name} as soon as possible to ./plugins/{pluginName}`
     );
@@ -51,7 +52,7 @@ module.exports = function(root) {
   return Object.assign(
     {
       root: root,
-      kibanaRoot: pkg.name === 'x-pack' ? resolve(root, '..') : kibanaRootWhenNotXpackPlugin,
+      kibanaRoot: isPluginXpack ? resolve(root, '..') : kibanaRootWhenNotXpackPlugin,
       serverTestPatterns: ['server/**/__tests__/**/*.js'],
       buildSourcePatterns: buildSourcePatterns,
       skipInstallDependencies: false,

src/core/server/http/http_config.ts

@@ -26,6 +26,8 @@ const validBasePathRegex = /(^$|^\/.*[^\/]$)/;
 const match = (regex: RegExp, errorMsg: string) => (str: string) =>
   regex.test(str) ? undefined : errorMsg;
 
+// before update to make sure it's in sync with validation rules in Legacy
+// https://github.com/elastic/kibana/blob/master/src/legacy/server/config/schema.js
 export const config = {
   path: 'server',
   schema: schema.object(

src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts

@@ -20,7 +20,7 @@
 import Boom from 'boom';
 import { getProperty, IndexMapping } from '../../../mappings';
 
-const TOP_LEVEL_FIELDS = ['_id'];
+const TOP_LEVEL_FIELDS = ['_id', '_score'];
 
 export function getSortingParams(
   mappings: IndexMapping,

src/dev/build/tasks/nodejs_modules/webpack_dll.js

@@ -18,9 +18,10 @@
  */
 
 import { deleteAll, isFileAccessible, read, write } from '../../lib';
-import { dirname, sep, relative, resolve } from 'path';
+import { dirname, relative, resolve } from 'path';
 import pkgUp from 'pkg-up';
 import globby from 'globby';
+import normalizePosixPath from 'normalize-path';
 
 function checkDllEntryAccess(entry, baseDir = '') {
   const resolvedPath = baseDir ? resolve(baseDir, entry) : entry;
@@ -48,7 +49,7 @@ export async function getDllEntries(manifestPath, whiteListedModules, baseDir =
   // Only includes modules who are not in the white list of modules
   // and that are node_modules
   return modules.filter(entry => {
-    const isWhiteListed = whiteListedModules.some(nonEntry => entry.includes(`node_modules${sep}${nonEntry}${sep}`));
+    const isWhiteListed = whiteListedModules.some(nonEntry => normalizePosixPath(entry).includes(`node_modules/${nonEntry}`));
     const isNodeModule = entry.includes('node_modules');
 
     // NOTE: when using dynamic imports on webpack the entry paths could be created
@@ -69,6 +70,7 @@ export async function cleanDllModuleFromEntryPath(logger, entryPath) {
   const modulePkgPath = await pkgUp(entryPath);
   const modulePkg = JSON.parse(await read(modulePkgPath));
   const moduleDir = dirname(modulePkgPath);
+  const normalizedModuleDir = normalizePosixPath(moduleDir);
 
   // Cancel the cleanup for this module as it
   // was already done.
@@ -93,9 +95,9 @@ export async function cleanDllModuleFromEntryPath(logger, entryPath) {
   // until the following issue gets closed
   // https://github.com/sindresorhus/globby/issues/87
   const filesToDelete = await globby([
-    `${moduleDir}/**`,
-    `!${moduleDir}/**/*.+(css)`,
-    `!${moduleDir}/**/*.+(gif|ico|jpeg|jpg|tiff|tif|svg|png|webp)`,
+    `${normalizedModuleDir}/**`,
+    `!${normalizedModuleDir}/**/*.+(css)`,
+    `!${normalizedModuleDir}/**/*.+(gif|ico|jpeg|jpg|tiff|tif|svg|png|webp)`,
   ]);
 
   await deleteAll(filesToDelete.filter(path => {

src/legacy/core_plugins/data/index.ts

@@ -19,6 +19,7 @@
 
 import { resolve } from 'path';
 import { Legacy } from '../../../../kibana';
+import { mappings } from './mappings';
 
 // eslint-disable-next-line import/no-default-export
 export default function DataPlugin(kibana: any) {
@@ -35,6 +36,23 @@ export default function DataPlugin(kibana: any) {
     uiExports: {
       injectDefaultVars: () => ({}),
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+      mappings,
+      savedObjectsManagement: {
+        query: {
+          icon: 'search',
+          defaultSearchField: 'title',
+          isImportableAndExportable: true,
+          getTitle(obj: any) {
+            return obj.attributes.title;
+          },
+          getInAppUrl(obj: any) {
+            return {
+              path: `/app/kibana#/discover?_a=(savedQuery:'${encodeURIComponent(obj.id)}')`,
+              uiCapabilitiesPath: 'discover.show',
+            };
+          },
+        },
+      },
     },
   };
 

packages/kbn-config-schema/src/types/nullable_type.ts → src/legacy/core_plugins/data/mappings.ts

@@ -17,16 +17,31 @@
  * under the License.
  */
 
-import { Type } from './type';
-
-export class NullableType<V> extends Type<V | null> {
-  constructor(type: Type<V>) {
-    super(
-      type
-        .getSchema()
-        .optional()
-        .allow(null)
-        .default(null)
-    );
-  }
-}
+export const mappings = {
+  query: {
+    properties: {
+      title: {
+        type: 'text',
+      },
+      description: {
+        type: 'text',
+      },
+      query: {
+        properties: {
+          language: {
+            type: 'text',
+          },
+          query: {
+            type: 'text',
+          },
+        },
+      },
+      filters: {
+        type: 'text',
+      },
+      timefilter: {
+        type: 'text',
+      },
+    },
+  },
+};

src/legacy/core_plugins/data/public/index.scss

@@ -4,3 +4,4 @@
 
 @import './filter/filter_bar/index';
 
+@import './search/search_bar/index';

src/legacy/core_plugins/data/public/index.ts

@@ -34,7 +34,7 @@ export { ExpressionRenderer, ExpressionRendererProps, ExpressionRunner } from '.
 export { IndexPattern, IndexPatterns, StaticIndexPattern, Field } from './index_patterns';
 export { Query, QueryBar, QueryBarInput } from './query';
 export { FilterBar, ApplyFiltersPopover } from './filter';
-export { SearchBar, SearchBarProps } from './search';
+export { SearchBar, SearchBarProps, SavedQueryAttributes, SavedQuery } from './search';
 export {
   FilterManager,
   FilterStateManager,