Merge branch 'main' into fix/184496

elastic · Jul 3, 2024 · 6f68bcd · 6f68bcd
2 parents 3cccc1a + 0ec428b
commit 6f68bcd
Show file tree

Hide file tree

Showing 171 changed files with 2,589 additions and 999 deletions.
diff --git a/examples/controls_example/public/react_controls/data_controls/data_control_editor.tsx b/examples/controls_example/public/react_controls/data_controls/data_control_editor.tsx
@@ -30,21 +30,22 @@ import {
   EuiTitle,
   EuiToolTip,
 } from '@elastic/eui';
+import {
+  ControlWidth,
+  DEFAULT_CONTROL_GROW,
+  DEFAULT_CONTROL_WIDTH,
+} from '@kbn/controls-plugin/common';
+import { CONTROL_WIDTH_OPTIONS } from '@kbn/controls-plugin/public';
+import { DataControlFieldRegistry } from '@kbn/controls-plugin/public/types';
 import { DataViewField } from '@kbn/data-views-plugin/common';
+import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { useBatchedPublishingSubjects } from '@kbn/presentation-publishing';
 import {
   LazyDataViewPicker,
   LazyFieldPicker,
   withSuspense,
 } from '@kbn/presentation-util-plugin/public';
 
-import {
-  ControlWidth,
-  DEFAULT_CONTROL_GROW,
-  DEFAULT_CONTROL_WIDTH,
-} from '@kbn/controls-plugin/common';
-import { CONTROL_WIDTH_OPTIONS } from '@kbn/controls-plugin/public';
-import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { getAllControlTypes, getControlFactory } from '../control_factory_registry';
 import { ControlGroupApi } from '../control_group/types';
 import { ControlStateManager } from '../types';
@@ -69,6 +70,65 @@ export interface ControlEditorProps<
 const FieldPicker = withSuspense(LazyFieldPicker, null);
 const DataViewPicker = withSuspense(LazyDataViewPicker, null);
 
+const CompatibleControlTypesComponent = ({
+  fieldRegistry,
+  selectedFieldName,
+  selectedControlType,
+  setSelectedControlType,
+}: {
+  fieldRegistry?: DataControlFieldRegistry;
+  selectedFieldName: string;
+  selectedControlType?: string;
+  setSelectedControlType: (type: string) => void;
+}) => {
+  const dataControlFactories = useMemo(() => {
+    return getAllControlTypes()
+      .map((type) => getControlFactory(type))
+      .filter((factory) => {
+        return isDataControlFactory(factory);
+      });
+  }, []);
+
+  return (
+    <EuiKeyPadMenu data-test-subj={`controlTypeMenu`} aria-label={'type'}>
+      {dataControlFactories.map((factory) => {
+        const disabled =
+          fieldRegistry && selectedFieldName
+            ? !fieldRegistry[selectedFieldName]?.compatibleControlTypes.includes(factory.type)
+            : true;
+        const keyPadMenuItem = (
+          <EuiKeyPadMenuItem
+            key={factory.type}
+            id={`create__${factory.type}`}
+            aria-label={factory.getDisplayName()}
+            data-test-subj={`create__${factory.type}`}
+            isSelected={factory.type === selectedControlType}
+            disabled={disabled}
+            onClick={() => setSelectedControlType(factory.type)}
+            label={factory.getDisplayName()}
+          >
+            <EuiIcon type={factory.getIconType()} size="l" />
+          </EuiKeyPadMenuItem>
+        );
+
+        return disabled ? (
+          <EuiToolTip
+            key={`disabled__${factory.type}`}
+            content={DataControlEditorStrings.manageControl.dataSource.getControlTypeErrorMessage({
+              fieldSelected: Boolean(selectedFieldName),
+              controlType: factory.getDisplayName(),
+            })}
+          >
+            {keyPadMenuItem}
+          </EuiToolTip>
+        ) : (
+          keyPadMenuItem
+        );
+      })}
+    </EuiKeyPadMenu>
+  );
+};
+
 export const DataControlEditor = ({
   controlId,
   controlType,
@@ -139,57 +199,6 @@ export const DataControlEditor = ({
     );
   }, [selectedFieldName, setControlEditorValid, selectedDataView, selectedControlType]);
 
-  const dataControlFactories = useMemo(() => {
-    return getAllControlTypes()
-      .map((type) => getControlFactory(type))
-      .filter((factory) => {
-        return isDataControlFactory(factory);
-      });
-  }, []);
-
-  const CompatibleControlTypesComponent = useMemo(() => {
-    return (
-      <EuiKeyPadMenu data-test-subj={`controlTypeMenu`} aria-label={'type'}>
-        {dataControlFactories.map((factory) => {
-          const disabled =
-            fieldRegistry && selectedFieldName
-              ? !fieldRegistry[selectedFieldName]?.compatibleControlTypes.includes(factory.type)
-              : true;
-          const keyPadMenuItem = (
-            <EuiKeyPadMenuItem
-              key={factory.type}
-              id={`create__${factory.type}`}
-              aria-label={factory.getDisplayName()}
-              data-test-subj={`create__${factory.type}`}
-              isSelected={factory.type === selectedControlType}
-              disabled={disabled}
-              onClick={() => setSelectedControlType(factory.type)}
-              label={factory.getDisplayName()}
-            >
-              <EuiIcon type={factory.getIconType()} size="l" />
-            </EuiKeyPadMenuItem>
-          );
-
-          return disabled ? (
-            <EuiToolTip
-              key={`disabled__${controlType}`}
-              content={DataControlEditorStrings.manageControl.dataSource.getControlTypeErrorMessage(
-                {
-                  fieldSelected: Boolean(selectedFieldName),
-                  controlType,
-                }
-              )}
-            >
-              {keyPadMenuItem}
-            </EuiToolTip>
-          ) : (
-            keyPadMenuItem
-          );
-        })}
-      </EuiKeyPadMenu>
-    );
-  }, [selectedFieldName, fieldRegistry, selectedControlType, controlType, dataControlFactories]);
-
   const CustomSettingsComponent = useMemo(() => {
     if (!selectedControlType || !selectedFieldName || !fieldRegistry) return;
 
@@ -254,6 +263,7 @@ export const DataControlEditor = ({
                   selectedDataViewId={selectedDataViewId}
                   onChangeDataViewId={(newDataViewId) => {
                     stateManager.dataViewId.next(newDataViewId);
+                    setSelectedControlType(undefined);
                   }}
                   trigger={{
                     label:
@@ -300,7 +310,15 @@ export const DataControlEditor = ({
             <EuiFormRow
               label={DataControlEditorStrings.manageControl.dataSource.getControlTypeTitle()}
             >
-              {CompatibleControlTypesComponent}
+              {/* wrapping in `div` so that focus gets passed properly to the form row */}
+              <div>
+                <CompatibleControlTypesComponent
+                  fieldRegistry={fieldRegistry}
+                  selectedFieldName={selectedFieldName}
+                  selectedControlType={selectedControlType}
+                  setSelectedControlType={setSelectedControlType}
+                />
+              </div>
             </EuiFormRow>
           </EuiDescribedFormGroup>
           <EuiDescribedFormGroup

diff --git a/packages/kbn-openapi-generator/src/template_service/templates/ts_input_type.handlebars b/packages/kbn-openapi-generator/src/template_service/templates/ts_input_type.handlebars
@@ -3,7 +3,8 @@
 {{~/if~}}
 
 {{~#if $ref~}}
-  {{referenceName}}Input
+  {{referenceName}}
+  {{~#if (isCircularRef $ref)}}Input{{/if~}}
   {{~#if nullable}} | null {{/if~}}
 {{~/if~}}
 

diff --git a/x-pack/packages/kbn-elastic-assistant-common/impl/schemas/index.ts b/x-pack/packages/kbn-elastic-assistant-common/impl/schemas/index.ts
@@ -52,3 +52,6 @@ export * from './knowledge_base/bulk_crud_knowledge_base_route.gen';
 export * from './knowledge_base/common_attributes.gen';
 export * from './knowledge_base/crud_knowledge_base_route.gen';
 export * from './knowledge_base/find_knowledge_base_entries_route.gen';
+
+export * from './prompts/find_prompts_route.gen';
+export { PromptResponse, PromptTypeEnum } from './prompts/bulk_crud_prompts_route.gen';
diff --git a/...packages/kbn-elastic-assistant-common/impl/schemas/prompts/bulk_crud_prompts_route.gen.ts b/...packages/kbn-elastic-assistant-common/impl/schemas/prompts/bulk_crud_prompts_route.gen.ts
@@ -34,6 +34,14 @@ export const PromptDetailsInError = z.object({
   name: z.string().optional(),
 });
 
+/**
+ * Prompt type
+ */
+export type PromptType = z.infer<typeof PromptType>;
+export const PromptType = z.enum(['system', 'quick']);
+export type PromptTypeEnum = typeof PromptType.enum;
+export const PromptTypeEnum = PromptType.enum;
+
 export type NormalizedPromptError = z.infer<typeof NormalizedPromptError>;
 export const NormalizedPromptError = z.object({
   message: z.string(),
@@ -47,11 +55,13 @@ export const PromptResponse = z.object({
   id: NonEmptyString,
   timestamp: NonEmptyString.optional(),
   name: z.string(),
-  promptType: z.string(),
+  promptType: PromptType,
   content: z.string(),
+  categories: z.array(z.string()).optional(),
+  color: z.string().optional(),
   isNewConversationDefault: z.boolean().optional(),
   isDefault: z.boolean().optional(),
-  isShared: z.boolean().optional(),
+  consumer: z.string().optional(),
   updatedAt: z.string().optional(),
   updatedBy: z.string().optional(),
   createdAt: z.string().optional(),
@@ -107,20 +117,24 @@ export const BulkActionBase = z.object({
 export type PromptCreateProps = z.infer<typeof PromptCreateProps>;
 export const PromptCreateProps = z.object({
   name: z.string(),
-  promptType: z.string(),
+  promptType: PromptType,
   content: z.string(),
+  color: z.string().optional(),
+  categories: z.array(z.string()).optional(),
   isNewConversationDefault: z.boolean().optional(),
   isDefault: z.boolean().optional(),
-  isShared: z.boolean().optional(),
+  consumer: z.string().optional(),
 });
 
 export type PromptUpdateProps = z.infer<typeof PromptUpdateProps>;
 export const PromptUpdateProps = z.object({
   id: z.string(),
   content: z.string().optional(),
+  color: z.string().optional(),
+  categories: z.array(z.string()).optional(),
   isNewConversationDefault: z.boolean().optional(),
   isDefault: z.boolean().optional(),
-  isShared: z.boolean().optional(),
+  consumer: z.string().optional(),
 });
 
 export type PerformBulkActionRequestBody = z.infer<typeof PerformBulkActionRequestBody>;

diff --git a/...ges/kbn-elastic-assistant-common/impl/schemas/prompts/bulk_crud_prompts_route.schema.yaml b/...ges/kbn-elastic-assistant-common/impl/schemas/prompts/bulk_crud_prompts_route.schema.yaml
@@ -78,6 +78,13 @@ components:
       required:
         - id
 
+    PromptType:
+      type: string
+      description: Prompt type
+      enum:
+        - system
+        - quick
+
     NormalizedPromptError:
       type: object
       properties:
@@ -111,15 +118,21 @@ components:
         name:
           type: string
         promptType:
-          type: string
+          $ref: '#/components/schemas/PromptType'
         content:
           type: string
+        categories:
+          type: array
+          items:
+            type: string
+        color:
+          type: string
         isNewConversationDefault:
           type: boolean
         isDefault:
           type: boolean
-        isShared:
-          type: boolean
+        consumer:
+          type: string
         updatedAt:
           type: string
         updatedBy:
@@ -231,15 +244,21 @@ components:
         name:
           type: string
         promptType:
-          type: string
+          $ref: '#/components/schemas/PromptType'
         content:
           type: string
+        color:
+          type: string
+        categories:
+          type: array
+          items:
+            type: string
         isNewConversationDefault:
           type: boolean
         isDefault:
           type: boolean
-        isShared:
-          type: boolean
+        consumer:
+          type: string
 
     PromptUpdateProps:
       type: object
@@ -250,9 +269,15 @@ components:
           type: string
         content:
           type: string
+        color:
+          type: string
+        categories:
+          type: array
+          items:
+            type: string
         isNewConversationDefault:
           type: boolean
         isDefault:
           type: boolean
-        isShared:
-          type: boolean
+        consumer:
+          type: string
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/api/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/api/index.tsx
@@ -11,6 +11,7 @@ import { API_ERROR } from '../translations';
 import { getOptionalRequestParams } from '../helpers';
 import { TraceOptions } from '../types';
 export * from './conversations';
+export * from './prompts';
 
 export interface FetchConnectorExecuteAction {
   conversationId: string;