refactor: copy

elastic · Sep 10, 2020 · 5cf7490 · 5cf7490
1 parent 871ec5b
commit 5cf7490
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx
@@ -69,7 +69,7 @@ export function BucketNestingEditor({
         values: { field: fieldName },
       }),
       filters: i18n.translate('xpack.lens.indexPattern.groupingOverallFilters', {
-        defaultMessage: 'Search query overall',
+        defaultMessage: 'Top values for each custom query',
       }),
       date_histogram: i18n.translate('xpack.lens.indexPattern.groupingOverallDateHistogram', {
         defaultMessage: 'Top values for each {field}',
@@ -83,7 +83,7 @@ export function BucketNestingEditor({
         values: { target: target.fieldName },
       }),
       filters: i18n.translate('xpack.lens.indexPattern.groupingSecondFilters', {
-        defaultMessage: 'Search query for each {target}',
+        defaultMessage: 'Overall top {target}',
         values: { target: target.fieldName },
       }),
       date_histogram: i18n.translate('xpack.lens.indexPattern.groupingSecondDateHistogram', {

diff --git a/...ins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx b/...ins/lens/public/indexpattern_datasource/operations/definitions/filters/filter_popover.tsx
@@ -130,15 +130,15 @@ const QueryInput = ({
       placeholder={
         inputValue.language === 'kuery'
           ? i18n.translate('xpack.lens.indexPattern.filters.queryPlaceholderKql', {
-              defaultMessage: 'Example: {example}',
+              defaultMessage: '{example}',
               values: { example: 'method : "GET" or status : "404"' },
             })
           : i18n.translate('xpack.lens.indexPattern.filters.queryPlaceholderLucene', {
-              defaultMessage: 'Example: {example}',
+              defaultMessage: '{example}',
               values: { example: 'method:GET OR status:404' },
             })
       }
-      dataTestSubj="transformQueryInput"
+      dataTestSubj="lns-indexPattern-searchQueryInput"
       languageSwitcherPopoverAnchorPosition="rightDown"
     />
   );

diff --git a/...ugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx b/...ugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.test.tsx
@@ -54,7 +54,7 @@ describe('filters', () => {
           columnOrder: ['col1', 'col2'],
           columns: {
             col1: {
-              label: 'Search query',
+              label: 'Custom query',
               dataType: 'document',
               operationType: 'filters',
               scale: 'ordinal',
@@ -209,7 +209,7 @@ describe('filters', () => {
       });
     });
 
-    describe('Modify search query', () => {
+    describe('Modify custom query', () => {
       it('should correctly show existing filters ', () => {
         const setStateSpy = jest.fn();
         const instance = mount(
@@ -236,7 +236,7 @@ describe('filters', () => {
         ).toEqual('src : 2');
       });
 
-      it('should remove search query', () => {
+      it('should remove custom query', () => {
         const setStateSpy = jest.fn();
         const instance = mount(
           <InlineOptions

diff --git a/...ck/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx b/...ck/plugins/lens/public/indexpattern_datasource/operations/definitions/filters/filters.tsx
@@ -43,8 +43,8 @@ export interface FilterValue {
   id: string;
 }
 
-const searchQueryLabel = i18n.translate('xpack.lens.indexPattern.searchQuery', {
-  defaultMessage: 'Search query',
+const customQueryLabel = i18n.translate('xpack.lens.indexPattern.customQuery', {
+  defaultMessage: 'Custom query',
 });
 
 export const defaultLabel = i18n.translate('xpack.lens.indexPattern.filters.label.placeholder', {
@@ -87,7 +87,7 @@ export interface FiltersIndexPatternColumn extends FieldBasedIndexPatternColumn
 
 export const filtersOperation: OperationDefinition<FiltersIndexPatternColumn> = {
   type: 'filters',
-  displayName: searchQueryLabel,
+  displayName: customQueryLabel,
   priority: 3, // Higher than any metric
   getPossibleOperationForField: ({ type }) => {
     if (type === 'document') {
@@ -116,12 +116,10 @@ export const filtersOperation: OperationDefinition<FiltersIndexPatternColumn> =
           },
         ],
       };
-    } else if (previousColumn?.operationType === 'filters' && previousColumn.params?.filters) {
-      params = previousColumn.params;
     }
 
     return {
-      label: searchQueryLabel,
+      label: customQueryLabel,
       dataType: 'string',
       operationType: 'filters',
       scale: 'ordinal',
@@ -163,12 +161,7 @@ export const filtersOperation: OperationDefinition<FiltersIndexPatternColumn> =
       );
 
     return (
-      <EuiFormRow
-        label={i18n.translate('xpack.lens.indexPattern.filters.queries', {
-          defaultMessage: 'Queries',
-        })}
-        labelType="legend"
-      >
+      <EuiFormRow>
         <FilterList
           filters={filters}
           setFilters={setFilters}
@@ -241,7 +234,7 @@ export const FilterList = ({
 
   return (
     <>
-      <EuiDragDropContext onDragEnd={onDragEnd}>
+      <EuiDragDropContext onDragEnd={onDragEnd} onDragStart={() => setIsOpenByCreation(false)}>
         <EuiDroppable droppableId="FILTERS_DROPPABLE_AREA" spacing="s">
           {localFilters?.map((filter: FilterValue, idx: number) => {
             const { input, label, id } = filter;
@@ -312,9 +305,9 @@ export const FilterList = ({
                             onRemoveFilter(filter.id);
                           }}
                           aria-label={i18n.translate(
-                            'xpack.lens.indexPattern.filters.removeSearchQuery',
+                            'xpack.lens.indexPattern.filters.removeCustomQuery',
                             {
-                              defaultMessage: 'Remove search query',
+                              defaultMessage: 'Remove custom query',
                             }
                           )}
                           title={i18n.translate('xpack.lens.indexPattern.filters.remove', {
@@ -339,8 +332,8 @@ export const FilterList = ({
           setIsOpenByCreation(true);
         }}
       >
-        {i18n.translate('xpack.lens.indexPattern.filters.addSearchQuery', {
-          defaultMessage: 'Add a search query',
+        {i18n.translate('xpack.lens.indexPattern.filters.addCustomQuery', {
+          defaultMessage: 'Add a custom query',
         })}
       </EuiButtonEmpty>
     </>