Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract common 'listing table' behavior into an external module that exposes pure functions. #16

Conversation

cjcenizal
Copy link
Owner

@cjcenizal cjcenizal commented Feb 25, 2017

In this PR I tried to extract and encapsulate the behavior (but not the UI) of this type of view to a) codify the behavior, b) de-duplicate code, and c) make this file shorter and easier to scan.

Completely unintentionally, I'm apparently borrowing concepts from Redux here (https://gist.github.com/gaearon/64e2c4adce2b4918c96c3db2b44d8f68#file-counter-js-L18, original context at https://medium.com/@dan_abramov/you-might-not-need-redux-be46360cf367#53d3).

Next, I would want to see if we could create abstractions for:

  • onSort
  • onDelete

I'd also like to take a closer look at how the table is being configured, and see if we can make it more explicit and transparent.

};
}

export function areAllItemsSelected(state, pager) {
Copy link
Owner Author

@cjcenizal cjcenizal Feb 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely comfortable with the dependency on Pager that we have in this module, especially in this function. I wonder what it would look like if we only depended on pageOfItems instead.

return this.state.selectedIds.length > 0
? <DeleteButton onClick={this.onDelete} />
: <CreateButtonLink href={'#' + VisualizeConstants.WIZARD_STEP_1_PAGE_PATH} />;
}

getTableContents() {
renderTableContents() {
Copy link
Owner Author

@cjcenizal cjcenizal Feb 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some thoughts on designing Table components...

A Table is composed of two things: a TableHeader and a TableBody.

The TableHeader consists of a single row of cells. The TableBody consists of multiple rows, each of which consists of cells. So we can think about configuring both the TableHeader and TableBody with one-dimensional arrays (1 row of N cells).

Within the configuration arrays, each index will provide the configuration for a particular cell (TableHeaderCell or TableRowCell). We'll need to be able to configure specific properties of each cell:

  • Cell content (children), an obvious one. This could literally be anything.
  • Presentational properties, e.g. whether overflowing content should be clipped. These could change over time as we discover new UI requirements.

So the general idea is:

// A TableHeader instance containing TableHeaderCell instances.
const tableHeader = configureTableHeader();

// An array of TableRow instances, each of which contains TableRowCell instance.
const tableBody = configureTableBody(items);

This assumes a row-centric view of the table, which I think makes more sense than a column-centric view, since each row represents a single "model" or entity, and these are the primary units of abstraction in OOP or when modeling a domain.

If very similar instances of Tables exist in different parts of the UI, we could abstract out these configuration definitions into functions. We could call these functions with configuration parameters to customize specific parts of the table configurations for different contexts.

We could also abstract out the functions that render different parts of a Table, if that improves the code's readability.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the row-centric approach, because it appears to be more powerful (also applies to other representations like list-of-cards). Creating the whole table body in one go though feels very restrictive. It would make stuff like infinite loading and virtual scrolling a lot more inefficient/difficult to implement. How about providing "blueprints" for the header and rows to the table, which it "instantiates" using React.cloneElement. This way jsx provides a declarative way to configure the table. Different representations for different rows can then be delegated to row components that choose a particular way of rendering depending on the document:

(just a quick draft, expect typos)

class DashboardLandingPageTable {
  render() {
    const headerRow = (
      <ItemTableHeaderRow>
        <ItemTableHeader
          label="Name"
          onChangeSort={this.actions.sortBy("name")}
          // ...
        />
        <ItemTableHeader
          label="Created At"
          onChangeSort={this.actions.sortBy("creation_date")}
          // ...
        />
        // ...
      </ItemTableHeaderRow>
    );

    const bodyRow = (
      <ItemTableBodyRow>
        <ItemTableStringCell
          key="name"
        />
        <ItemTableDateCell
          key="creation_date"
          format="YYYY-mm-dd"
        />
      </ItemTableBodyRow>
    );

    return (
      <ItemTable
        bodyRow={bodyRow}
        headerRow={headerRow}
        items={items}
      />
    );
  }
}

function ItemTable({bodyRow, headerRow, items}) {
  return (
    <table class="kuiItemTable">
      <thead>
        { React.cloneElement(headerRow) }
      </thead>
      <tbody>
        { items.map((item) => React.cloneElement(bodyRow, { item })) }
      </tbody>
    </table>
  );
}

function ItemTableBodyRow({ children, item }) {

  if (item.confidential) {
    return (
      <tr class="">
        <td>You do not need to know</td>
      </tr>
    );
  } else {
    return (
      <tr class="tableRow--highlight">
        { React.Children.map(children, (child) => React.cloneElement(child, { item })) }
      </tr>
    );
  }
}

function ItemTableDateCell({ format, item, key }) {
  return (
    <td>
      { formatDate(item[key], format) }
    </td>
  );
}

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! This is a really interesting idea. I love how readable this is. I wonder if there's a way for this to consume generic table components in the UI Framework, such as Table, TableHeader, SortableTableHeaderCell, TableRow, TableRowCell. These would simply enforce markup and class names.

Copy link

@weltenwort weltenwort Feb 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely, I just made up the component names in a hurry. Although we should choose appropriate names to differentiate between representational components like <KuiTableRow>, that just enforce the css classes and something like the <ItemTableBodyRow>, that implement the { children, item } interface.

Copy link

@stacey-gammon stacey-gammon Feb 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of the reasons I went with a column centric approach was because it would be easier to implement moveable columns. If you wanted to give a header cell functionality to change it's position in the table, this would be difficult with a bodyRow react element like that. In the current column implementation, you just reorder the columns array, and it works.

If you made bodyRow and headerRow an array of cells, you could still rearrange pretty easily but you'd have to do some extra work to make sure they are in sync.

Rearranging columns doesn't really make sense in the landing page tables, but I think it would be useful functionality for the discover table.

What do you think if I modified @weltenwort's suggestion to still use the columns definition like the below?
I still don't love this because then ItemTable can't encapsulate the knowledge of moveable columns, which it could if it was passed just the columns.

class DashboardLandingPageTable {
  render() {
    this.columns = getDashboardColumns();
    const headerCells = columns.forEach(column => getHeaderCell());
    const headerRow = <ItemTableHeaderRow> { headerCells }</ItemTableHeaderRow>
    const bodyCells = columns.ForEach(column => getRowCell());
    const bodyRow = <ItemTableBodyRow> { bodyCells } </ItemTableBodyRow>

    return (
      <ItemTable
        bodyRow={bodyRow}
        headerRow={headerRow}
        items={items}
      />
    );
  }
}
... the same

@weltenwort I'm a little confused how this works with the item being passed in though. Would ItemTableStringCell be a react element that takes in an item props and embeds item.name inside? Or does it automatically somehow use the key to fill the inner children?

@cjcenizal I understand your thinking that the row is a single entity, but for a table, the row cells and the header cells are coupled - it doesn't really make sense for them to exist separately, IMO. Also think about giving the user the ability to add or hide columns. That also would be easy given the column centric approach.

Copy link
Owner Author

@cjcenizal cjcenizal Mar 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be ideal to separate the "column order" concern from the "table configuration" concern. Ideally, the second concern should provide an interface which can be driven by the first concern. Here's an example of how we can provide column ordering, while preserving a row-centric way of configuring the table.

EDIT: I re-read your suggestion and your suggestion also separates the two concerns. So I should say that my line of thought is, a) row-centric is a more malleable mental model for me, so I would prefer to try to stick with it if possible and, b) keeping the order of columns in the header and body in sync isn't too difficult (see example). What do you think of this?

// This array gets updated when the user drags and drops a header cell.
const cellOrder = [
  "id",
  "name",
  "date",
];

const headerCells = {
  "id": (
    <ItemTableHeaderCell
      key="id"
    />
  ),
  "date": (
    <ItemTableHeaderCell
      key="date"
    />
  ),
  "name": (
    <ItemTableHeaderCell
      key="name"
    />
  ),
};

const header = (
  <ItemTableHeaderRow>
    {cellOrder.map(cell => headerCells[cell])}
  </ItemTableHeaderRow>
);

const cells = {
  "id": (
    <ItemTableCell
      key="id"
    />
  ),
  "date": (
    <ItemTableCell
      key="date"
    />
  ),
  "name": (
    <ItemTableCell
      key="name"
    />
  ),
};

const bodyRow = (
  <ItemTableBodyRow>
    {cellOrder.map(cell => cells[cell])}
  </ItemTableBodyRow>
);

@@ -71,17 +45,11 @@ export class VisualizeLandingPageTable extends React.Component {
}

onFilter = (newFilter) => {
const PAGE_SIZE = 3;
this.setState(filterItems());

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't very readable imo, because I'd see this and think, why am I filtering here? What do you think of something like this:

this.setState(ListingTableActions.startFetching());
 this.props.fetch(newFilter).then((results) => {
      const items = results.hits;
		  const pagesCount = this.pager.getPagesCount(items.length);
      this.setState(ListingTableActions.setFilteredItems(this.state, items, pagesCount));
}.finally(() => {
  this.setState(ListingTableActions.endFetching());
}

This also gives us a place to show any errors.

What did you think of @weltenwort's suggestion of passing in setState? I ask because it could simplify this refactor if we passed in that function. Doesn't have to be tied to React, all the Actions class needs to know is to call the function with the new state.

Then we could further refactor to:

ListingTableActions.filter(this.setState, this.state, this.props.fetch, this.pager); 

or do you think that is too abstracted?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really like the names you're suggesting for the actions -- much more understandable!

I do think passing in setState is a step too far in terms of abstraction. This shifts the call site of setState from one place to another, and I think the only effect on someone reading the code is that now it's more difficult to figure out the role of filter. By keeping the call site of setState local, we form a relationship between it and filter. This relationship helps the reader intuit the role of filter (to derive and return a new state object that is somehow filtered).

I'm also hesitant to pass this.props.fetch into it. This would give it knowledge of network requests and asynchronous logic. A lot more complexity than it has now, but for what benefit?

return this.state.selectedIds.length > 0
? <DeleteButton onClick={this.onDelete} />
: <CreateButtonLink href={'#' + VisualizeConstants.WIZARD_STEP_1_PAGE_PATH} />;
}

getTableContents() {
renderTableContents() {
const { isFetchingItems, currentPage, items } = this.state;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some rambling thoughts:

For the sake of the following explanation, note that I put back the namespacing and renamed the file listing_table_state => listing_table_actions.

How do you feel about having these state variable names both inside listing_table_actions and out here? I feel like they could get out of sync and why @weltenwort's selectors suggestion works well. Just now I accidentally had return { isFetching: true } inside ListingTableActions, but out here had isFetchingItems still.

I can see this being an easy mistake to make during a refactor. Say we are using ListingTableActions for dashboard too. Someone makes a refactor and updates the variable name in here and ListingTableActions but forgets that DashboadLandingPageTable uses it as well and forgets to update there.

I see a few options to help this:

  1. Push getters into listing_table_actions, so this becomesListingTableActions.getIsFetchingItems(this.state);.
    Cons: A lot of extra text. Perhaps over-engineered? Could simplify this by having ListingTableActions hold a reference to this.state. Then can just do listingTableActions.getIsFetchingItems(). Well, now I am going around in circles because this is pretty much just what I had in the first iteration.
  1. Create a typed state definition, ListingTableState so the variables are defined in a single location. A single source of truth if you will, in regard to the variable name. A single location for comments, a jsdoc definition, and reusable no matter what UI framework we are using.
    Could maybe use this like so:
constructor() {
  this.state = new ListingTableState();
}

Cons: not sure how react would handle a non-native object in state. Still going around in circles as this is also close to what I first had originally: this.state = { tableState: new ListingTableState() }. My first implementation violated the prefer primitives in state style decision we were talking about.

  1. Implement @weltenwort's selectors.

... we can chat more about this in our meeting in a few minutes

@cjcenizal
Copy link
Owner Author

cjcenizal commented Mar 1, 2017

These ideas will be incorporated in a separate PR into the original branch.

@cjcenizal cjcenizal closed this Mar 1, 2017
cjcenizal pushed a commit that referenced this pull request Jan 13, 2018
* add tutorial directory and home promo section

* tutorial components

* use KuiCodeEditor for displaying instruction code

* move spec files to server so joi can be used. Fetch via rest API

* Adding more tutorials (#4)

* More edits on the Apache logs tutorial

* Added nginx, mysql, and sytem modules for FB

* Moved apache to apacheLogs and added an apacheMetrics tutorial

* Added mysqlMetrics, nginxMetrics, systemMetrics tutorials

* Reduce duplication in the tutorials

This uses common objects for the install and start steps for Filebeat.
Same can be done for MB.

* fix windows path for config file

* add markdown parsing

* use mustache to replace config.kibana.version with kibana version

* add image preview to tutorial introduction

* fix css class name

* add param types constants

* add docs variables

* [WIP] Logstash Netflow module tutorial (#5)

* First draft of Logstash Netflow module tutorial

* Incorporated writing style suggestions

* pass params to template replace logic

* parameter inputs

* use isReadOnly flag from ui-framework for KuiCodeEditor

* dedemorton commits on netflow

* remove trailing slash from base links

* add config.docs.logstash and fix vertical spacing between Content component and commands

* Use logstash docs config variable

* Starting to add Deb instructions

* Fix Logstash documentation link

* Make commands optional

* Refactor: extract common LS instructions

* Edits for the existing tutorials

* change schema to support three instruction types

* [Netflow tutorial] Simplify OSX instructions

* replace axios with fetch

* pass credentials to tutorial fetch

* display cloud instructions when cloud set

* RadioButtonGroup component

* update copy

* add tutorial component jest tests

* content component test

* load isCloudEnabled in home_app

* add functional test ensuring add data tutorials are fetch and displayed

* rename card btns to 'Add data', fix type in tutorial directory tab, remove 'Set up index pattern from tutorial directory'

* move parameters form to right of instruction set title

* add copy snippet button, remove line numbers from command block

* add breadcrumb to tutorial view

* update tutorial jest snapshot

* use componentDidMount and ignore async results if componenent has been unmounted

* define shape of prop for instructionVariants and params. Create NumberParameter and StringParameter components

* add bread crumb to add data directory page

* Add cloud version of the apache_logs tutorial (#16)

* Add cloud version of the apache_logs tutorial

* Added onprem-cloud version as well

* fix styling broken by EUI rebase

* add artifacts to tutorial schema

* fix styling for code block

* [Tutorials] Netflow: instructions for onPremCloud (#18)

* Extract common on-prem cloud instructions so LS and Beats can share them

* Extracting common instructions; adding onPremCloud instructions

* fix copy bug where copy would only contain previously selected text

* make string parameter input type be text

* Implementing Elastic Cloud tutorial for Netflow module (#19)

* More tutorial edits (#20)

* More tutorial edits

This updates the on prem instructions with a step that installs the GeoIP and
UA plugins in ES. It also makes the on-prem steps more consistent with the cloud
instructions which results in less redundancy in the code.

* Show config step for all variants

* More DRY in the tutorial content

* Updated screenshot for apache_logs

* wrap markdown content in markdown-body class

* use EuiFlexGroup to remove wasted space with 'copy snippet' button and instruction text

* change OSX to macOS, use Computed property names for instruction_variant DISPLAY_MAP, replace /app/kibana with kbnBaseUrl, remove unneeded if check in copy_to_clippboard, put getTutorials mixin on server instead of request

* capitilize 'C' in Elastic Cloud

* remove try/catch from copy_to_clipboard

* Removing unrelated instructions

* Copy editing fixes

* Multiply edits to the Beats tutorials (#21)

* Updated Nginx module

* Updated MySQL logs module

* Updated system logs module

* Correct the on_prem_cloud enable steps

* Updated the Nginx metrics tutorial and added screenshot

* Updated the Apache metrics module + screenshot

* Updated the MySQL metrics module + screenshot

* Updated the system metrics module + screenshot

* prevent 'Copy snippet' button text from wrapping

* [Netflow tutorial] Windows instructions (#22)

* [Netflow tutorial] Adding onPrem instructions for Windows

* Removing unrelated/superfluous instructions

* Adding Windows instructions for onPremElasticCloud and elasticCloud

* use EuiImage so tutorial images are clickable to view in full screen

* fix jest tests

* set fullScreenIconColor and alt options for EuiImage, add space between command block and instruction text
cjcenizal pushed a commit that referenced this pull request Jan 18, 2018
* Kibana Home page - phase two (elastic#14749)

* add tutorial directory and home promo section

* tutorial components

* use KuiCodeEditor for displaying instruction code

* move spec files to server so joi can be used. Fetch via rest API

* Adding more tutorials (#4)

* More edits on the Apache logs tutorial

* Added nginx, mysql, and sytem modules for FB

* Moved apache to apacheLogs and added an apacheMetrics tutorial

* Added mysqlMetrics, nginxMetrics, systemMetrics tutorials

* Reduce duplication in the tutorials

This uses common objects for the install and start steps for Filebeat.
Same can be done for MB.

* fix windows path for config file

* add markdown parsing

* use mustache to replace config.kibana.version with kibana version

* add image preview to tutorial introduction

* fix css class name

* add param types constants

* add docs variables

* [WIP] Logstash Netflow module tutorial (#5)

* First draft of Logstash Netflow module tutorial

* Incorporated writing style suggestions

* pass params to template replace logic

* parameter inputs

* use isReadOnly flag from ui-framework for KuiCodeEditor

* dedemorton commits on netflow

* remove trailing slash from base links

* add config.docs.logstash and fix vertical spacing between Content component and commands

* Use logstash docs config variable

* Starting to add Deb instructions

* Fix Logstash documentation link

* Make commands optional

* Refactor: extract common LS instructions

* Edits for the existing tutorials

* change schema to support three instruction types

* [Netflow tutorial] Simplify OSX instructions

* replace axios with fetch

* pass credentials to tutorial fetch

* display cloud instructions when cloud set

* RadioButtonGroup component

* update copy

* add tutorial component jest tests

* content component test

* load isCloudEnabled in home_app

* add functional test ensuring add data tutorials are fetch and displayed

* rename card btns to 'Add data', fix type in tutorial directory tab, remove 'Set up index pattern from tutorial directory'

* move parameters form to right of instruction set title

* add copy snippet button, remove line numbers from command block

* add breadcrumb to tutorial view

* update tutorial jest snapshot

* use componentDidMount and ignore async results if componenent has been unmounted

* define shape of prop for instructionVariants and params. Create NumberParameter and StringParameter components

* add bread crumb to add data directory page

* Add cloud version of the apache_logs tutorial (#16)

* Add cloud version of the apache_logs tutorial

* Added onprem-cloud version as well

* fix styling broken by EUI rebase

* add artifacts to tutorial schema

* fix styling for code block

* [Tutorials] Netflow: instructions for onPremCloud (#18)

* Extract common on-prem cloud instructions so LS and Beats can share them

* Extracting common instructions; adding onPremCloud instructions

* fix copy bug where copy would only contain previously selected text

* make string parameter input type be text

* Implementing Elastic Cloud tutorial for Netflow module (#19)

* More tutorial edits (#20)

* More tutorial edits

This updates the on prem instructions with a step that installs the GeoIP and
UA plugins in ES. It also makes the on-prem steps more consistent with the cloud
instructions which results in less redundancy in the code.

* Show config step for all variants

* More DRY in the tutorial content

* Updated screenshot for apache_logs

* wrap markdown content in markdown-body class

* use EuiFlexGroup to remove wasted space with 'copy snippet' button and instruction text

* change OSX to macOS, use Computed property names for instruction_variant DISPLAY_MAP, replace /app/kibana with kbnBaseUrl, remove unneeded if check in copy_to_clippboard, put getTutorials mixin on server instead of request

* capitilize 'C' in Elastic Cloud

* remove try/catch from copy_to_clipboard

* Removing unrelated instructions

* Copy editing fixes

* Multiply edits to the Beats tutorials (#21)

* Updated Nginx module

* Updated MySQL logs module

* Updated system logs module

* Correct the on_prem_cloud enable steps

* Updated the Nginx metrics tutorial and added screenshot

* Updated the Apache metrics module + screenshot

* Updated the MySQL metrics module + screenshot

* Updated the system metrics module + screenshot

* prevent 'Copy snippet' button text from wrapping

* [Netflow tutorial] Windows instructions (#22)

* [Netflow tutorial] Adding onPrem instructions for Windows

* Removing unrelated/superfluous instructions

* Adding Windows instructions for onPremElasticCloud and elasticCloud

* use EuiImage so tutorial images are clickable to view in full screen

* fix jest tests

* set fullScreenIconColor and alt options for EuiImage, add space between command block and instruction text

* fix broken depenencies (elastic#15960)

* update yarn.lock
@cjcenizal cjcenizal deleted the experiment/react-landing-page/abstract-listing-table-logic branch July 6, 2018 00:39
elasticmachine added a commit that referenced this pull request Jul 14, 2020
* Initial App Search in Kibana plugin work

- Initializes a new platform plugin that ships out of the box w/ x-pack
- Contains a very basic front-end that shows AS engines, error states, or a Setup Guide
- Contains a very basic server that remotely calls the AS internal engines API and returns results

* Update URL casing to match Kibana best practices

- URL casing appears to be snake_casing, but kibana.json casing appears to be camelCase

* Register App Search plugin in Home Feature Catalogue

* Add custom App Search in Kibana logo

- I haven't had much success in surfacing a SVG file via a server-side endpoint/URL, but then I realized EuiIcon supports passing in a ReactElement directly. Woo!

* Fix appSearch.host config setting to be optional

- instead of crashing folks on load

* Rename plugin to Enterprise Search

- per product decision, URL should be enterprise_search/app_search and Workplace Search should also eventually live here
- reorganize folder structure in anticipation for another workplace_search plugin/codebase living alongside app_search
- rename app.tsx/main.tsx to a standard top-level index.tsx (which will contain top-level routes/state)
- rename AS->ES files/vars where applicable
- TODO: React Router

* Set up React Router URL structure

* Convert showSetupGuide action/flag to a React Router link

- remove showSetupGuide flag
- add a new shared helper component for combining EuiButton/EuiLink with React Router behavior (https://github.com/elastic/eui/blob/master/wiki/react-router.md#react-router-51)

* Implement Kibana Chrome breadcrumbs

- create shared helper (WS will presumably also want this) for generating EUI breadcrumb objects with React Router links+click behavior
- create React component that calls chrome.setBreadcrumbs on page mount
- clean up type definitions - move app-wide props to IAppSearchProps and update most pages/views to simply import it instead of calling their own definitions

* Added server unit tests (#2)

* Added unit test for server

* PR Feedback

* Refactor top-level Kibana props to a global context state

- rather them passing them around verbosely as props, the components that need them should be able to call the useContext hook

+ Remove IAppSearchProps in favor of IKibanaContext

+ Also rename `appSearchUrl` to `enterpriseSearchUrl`, since this context will contained shared/Kibana-wide values/actions useful to both AS and WS

* Added unit tests for public (#4)

* application.test.ts

* Added Unit Test for EngineOverviewHeader

* Added Unit Test for generate_breadcrumbs

* Added Unit Test for set_breadcrumb.tsx

* Added a unit test for link_events

- Also changed link_events.tsx to link_events.ts since it's just TS, no
React
- Modified letBrowserHandleEvent so it will still return a false
boolean when target is blank

* Betterize these tests

Co-Authored-By: Constance <constancecchen@users.noreply.github.com>

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* Add UI telemetry tracking to AS in Kibana (#5)

* Set up Telemetry usageCollection, savedObjects, route, & shared helper

- The Kibana UsageCollection plugin handles collecting our telemetry UI data (views, clicks, errors, etc.) and pushing it to elastic's telemetry servers
- That data is stored in incremented in Kibana's savedObjects lib/plugin (as well as mapped)
- When an end-user hits a certain view or action, the shared helper will ping the app search telemetry route which increments the savedObject store

* Update client-side views/links to new shared telemetry helper

* Write tests for new telemetry files

* Implement remaining unit tests (#7)

* Write tests for React Router+EUI helper components

* Update generate_breadcrumbs test

- add test suite for generateBreadcrumb() itself (in order to cover a missing branch)
- minor lint fixes
- remove unnecessary import from set_breadcrumbs test

* Write test for get_username util

+ update test to return a more consistent falsey value (null)

* Add test for SetupGuide

* [Refactor] Pull out various Kibana context mocks into separate files

- I'm creating a reusable useContext mock for shallow()ed enzyme components
+ add more documentation comments + examples

* Write tests for empty state components

+ test new usecontext shallow mock

* Empty state components: Add extra getUserName branch test

* Write test for app search index/routes

* Write tests for engine overview table

+ fix bonus bug

* Write Engine Overview tests

+ Update EngineOverview logic to account for issues found during tests :)
  - Move http to async/await syntax instead of promise syntax (works better with existing HttpServiceMock jest.fn()s)
  - hasValidData wasn't strict enough in type checking/object nest checking and was causing the app itself to crash (no bueno)

* Refactor EngineOverviewHeader test to use shallow + to full coverage

- missed adding this test during telemetry work
- switching to shallow and beforeAll reduces the test time from 5s to 4s!

* [Refactor] Pull out React Router history mocks into a test util helper

+ minor refactors/updates

* Add small tests to increase branch coverage

- mostly testing fallbacks or removing fallbacks in favor of strict type interface
- these are slightly obsessive so I'd also be fine ditching them if they aren't terribly valuable

* Address larger tech debt/TODOs (#8)

* Fix optional chaining TODO

- turns out my local Prettier wasn't up to date, completely my bad

* Fix constants TODO

- adds a common folder/architecture for others to use in the future

* Remove TODO for eslint-disable-line and specify lint rule being skipped

- hopefully that's OK for review, I can't think of any other way to sanely do this without re-architecting the entire file or DDoSing our API

* Add server-side logging to route dependencies

+ add basic example of error catching/logging to Telemetry route
+ [extra] refactor mockResponseFactory name to something slightly easier to read

* Move more Engines Overview API logic/logging to server-side

- handle data validation in the server-side
- wrap server-side API in a try/catch to account for fetch issues
- more correctly return 2xx/4xx statuses and more correctly deal with those responses in the front-end
- Add server info/error/debug logs (addresses TODO)
- Update tests + minor refactors/cleanup
    - remove expectResponseToBe200With helper (since we're now returning multiple response types) and instead make mockResponse var name more readable
    - one-line header auth
    - update tests with example error logs
    - update schema validation for `type` to be an enum of `indexed`/`meta` (more accurately reflecting API)

* Per telemetry team feedback, rename usageCollection telemetry mapping name to simpler 'app_search'

- since their mapping already nests under 'kibana.plugins'
- note: I left the savedObjects name with the '_telemetry' suffix, as there very well may be a use case for top-level generic 'app_search' saved objects

* Update Setup Guide installation instructions (#9)

Co-authored-by: Chris Cressman <chris@chriscressman.com>

* [Refactor] DRY out route test helper

* [Refactor] Rename public/test_utils to public/__mocks__

- to better follow/use jest setups and for .mock.ts suffixes

* Add platinum licensing check to Meta Engines table/call (#11)

* Licensing plugin setup

* Add LicensingContext setup

* Update EngineOverview to not hit meta engines API on platinum license

* Add Jest test helpers for future shallow/context use

* Update plugin to use new Kibana nav + URL update (#12)

* Update new nav categories to add Enterprise Search + update plugin to use new category

- per @johnbarrierwilson and Matt Riley, Enterprise Search should be under Kibana and above Observability
- Run `node scripts/check_published_api_changes.js --accept` since this new category affects public API

* [URL UPDATE] Change '/app/enterprise_search/app_search' to '/app/app_search'

- This needs to be done because App Search and Workplace search *have* to be registered as separate plugins to have 2 distinct nav links
- Currently Kibana doesn't support nested app names (see: elastic#59190) but potentially will in the future

- To support this change, we need to update applications/index.tsx to NOT handle '/app/enterprise_search' level routing, but instead accept an async imported app component (e.g. AppSearch, WorkplaceSearch).
- AppSearch should now treat its router as root '/' instead of '/app_search'

- (Addl) Per Josh Dover's recommendation, switch to `<Router history={params.history}>` from `<BrowserRouter basename={params.appBasePath}>` since they're deprecating appBasePath

* Update breadcrumbs helper to account for new URLs

- Remove path for Enterprise Search breadcrumb, since '/app/enterprise_search' will not link anywhere meaningful for the foreseeable future, so the Enterprise Search root should not go anywhere
- Update App Search helper to go to root path, per new React Router setup

Test changes:
- Mock custom basepath for App Search tests
- Swap enterpriseSearchBreadcrumbs and appSearchBreadcrumbs test order (since the latter overrides the default mock)

* Add create_first_engine_button telemetry tracking to EmptyState

* Switch plugin URLs back to /app/enterprise_search/app_search

Now that elastic#66455 has been merged in 🎉

* Add i18n formatted messages / translations (#13)

* Add i18n provider and formatted/i18n translated messages

* Update tests to account for new I18nProvider context + FormattedMessage components

- Add new mountWithContext helper that provides all contexts+providers used in top-level app
- Add new shallowWithIntl helper for shallow() components that dive into FormattedMessage

* Format i18n dates and numbers

+ update some mock tests to not throw react-intl invalid date messages

* Update EngineOverviewHeader to disable button on prop

* Address review feedback (#14)

* Fix Prettier linting issues

* Escape App Search API endpoint URLs

- per PR feedback
- querystring should automatically encodeURIComponent / escape query param strings

* Update server plugin.ts to use getStartServices() rather than storing local references from start()

- Per feedback: https://github.com/elastic/kibana/blob/master/src/core/CONVENTIONS.md#applications

- Note: savedObjects.registerType needs to be outside of getStartServices, or an error is thrown

- Side update to registerTelemetryUsageCollector to simplify args

- Update/fix tests to account for changes

* E2E testing (#6)

* Wired up basics for E2E testing

* Added version with App Search

* Updated naming

* Switched configuration around

* Added concept of 'fixtures'

* Figured out how to log in as the enterprise_search user

* Refactored to use an App Search service

* Added some real tests

* Added a README

* Cleanup

* More cleanup

* Error handling + README updatre

* Removed unnecessary files

* Apply suggestions from code review

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* Update x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_table.tsx

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* PR feedback - updated README

* Additional lint fixes

Co-authored-by: Constance <constancecchen@users.noreply.github.com>

* Add README and CODEOWNERS (#15)

* Add plugin README and CODEOWNERS

* Fix Typescript errors (#16)

* Fix public mocks

* Fix empty states types

* Fix engine table component errors

* Fix engine overview component errors

* Fix setup guide component errors

- SetBreadcrumbs will be fixed in a separate commit

* Fix App Search index errors

* Fix engine overview header component errors

* Fix applications context index errors

* Fix kibana breadcrumb helper errors

* Fix license helper errors

* ❗ Refactor React Router EUI link/button helpers
- in order to fix typescript errors

- this changes the component logic significantly to a react render prop, so that the Link and Button components can have different types - however, end behavior should still remain the same

* Fix telemetry helper errors

* Minor unused var cleanup in plugin files

* Fix telemetry collector/savedobjects errors

* Fix MockRouter type errors and add IRouteDependencies export

- routes will use IRouteDependencies in the next few commits

* Fix engines route errors

* Fix telemetry route errors

* Remove any type from source code

- thanks to Scotty for the inspiration

* Add eslint rules for Enterprise Search plugin

- Add checks for type any, but only on non-test files
- Disable react-hooks/exhaustive-deps, since we're already disabling it in a few files and other plugins also have it turned off

* Cover uncovered lines in engines_table and telemetry tests

* Fixed TS warnings in E2E tests (#17)

* Feedback: Convert static CSS values to EUI variables where possible

* Feedback: Flatten nested CSS where possible

- Prefer setting CSS class overrides on individual EUI components, not on a top-level page

+ Change CSS class casing from kebab-case to camelCase to better match EUI/Kibana

+ Remove unnecessary .euiPageContentHeader margin-bottom override by changing the panelPaddingSize of euiPageContent

+ Decrease engine overview table padding on mobile

* Refactor out components shared with Workplace Search (#18)

* Move getUserName helper to shared

- in preparation for Workplace Search plugin also using this helper

* Move Setup Guide layout to a shared component

* Setup Guide: add extra props for standard/native auth links

Note: It's possible this commit may be unnecessary if we can publish shared Enterprise Search security mode docs

* Update copy per feedback from copy team

* Address various telemetry issues

- saved objects: removing indexing per elastic#43673
- add schema and generate json per elastic#64942
- move definitions over to collectors since saved objects is mostly empty at this point, and schema throws an error when it imports an obj instead of being defined inline
- istanbul ignore saved_objects file since it doesn't have anything meaningful to test but was affecting code coverage

* Disable plugin access if a normal user does not have access to App Search (#19)

* Set up new server security dependency and configs

* Set up access capabilities

* Set up checkAccess helper/caller

* Remove NoUserState component from the public UI

- Since this is now being handled by checkAccess / normal users should never see the plugin at all if they don't have an account/access, the component is no longer needed

* Update server routes to account for new changes

- Remove login redirect catch from routes, since the access helper should now handle that for most users by disabling the plugin (superusers will see a generic cannot connect/error screen)
- Refactor out new config values to a shared mock

* Refactor Enterprise Search http call to hit/return new internal API endpoint

+ pull out the http call to a separate library for upcoming public URL work (so that other files can call it directly as well)

* [Discussion] Increase timeout but add another warning timeout for slow servers

- per recommendation/convo with Brandon

* Register feature control

* Remove no_as_account from UI telemetry

- since we're no longer tracking that in the UI

* Address PR feedback - isSuperUser check

* Public URL support for Elastic Cloud (#21)

* Add server-side public URL route

- Per feedback from Kibana platform team, it's not possible to pass info from server/ to public/ without a HTTP call :[

* Update MockRouter for routes without any payload/params

* Add client-side helper for calling the new public URL API

+ API seems to return a URL a trailing slash, which we need to omit

* Update public/plugin.ts to check and set a public URL

- relies on this.hasCheckedPublicUrl to only make the call once per page load instead of on every page nav

* Fix failing feature control tests

- Split up scenario cases as needed
- Add plugin as an exception alongside ML & Monitoring

* Address PR feedback

- version: kibana
- copy edits
- Sass vars
- code cleanup

* Casing feedback: change all plugin registration IDs from snake_case to camelCase

- note: current remainng snake_case exceptions are telemetry keys
- file names and api endpoints are snake_case per conventions

* Misc security feedback

- remove set
- remove unnecessary capabilities registration
- telemetry namespace agnostic

* Security feedback: add warn logging to telemetry collector

see elastic#66922 (comment)
- add if statement
- pass log dependency around (this is kinda medium, should maybe refactor)
- update tests
- move test file comment to the right file (was meant for telemetry route file)

* Address feedback from Pierre

- Remove unnecessary ServerConfigType
- Remove unnecessary uiCapabilities
- Move registerTelemetryRoute / SavedObjectsServiceStart workaround
- Remove unnecessary license optional chaining

* PR feedback

Address type/typos

* Fix telemetry API call returning 415 on Chrome

- I can't even?? I swear charset=utf-8 fixed the same error a few weeks ago

* Fix failing tests

* Update Enterprise Search functional tests (without host) to run on CI

- Fix incorrect navigateToApp slug (hadn't realized this was a URL, not an ID)
- Update without_host_configured tests to run without API key
- Update README

* Address PR feedback from Pierre

- remove unnecessary authz?
- remove unnecessary content-type json headers
- add loggingSystemMock.collect(mockLogger).error assertion
- reconstrcut new MockRouter on beforeEach for better sandboxing
- fix incorrect describe()s -should be it()
- pull out reusable mockDependencies helper (renamed/extended from mockConfig) for tests that don't particularly use config/log but still want to pass type definitions
- Fix comment copy

Co-authored-by: Jason Stoltzfus <jastoltz24@gmail.com>
Co-authored-by: Chris Cressman <chris@chriscressman.com>
Co-authored-by: scottybollinger <scotty.bollinger@elastic.co>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants