Skip to content
This repository has been archived by the owner on Aug 9, 2022. It is now read-only.

Change Reports Table Display #291

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kibana-reports/public/components/context_menu/context_menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ const generateInContextReport = (
time_to: timeRanges.time_to.valueOf(),
report_definition: {
report_params: {
report_name: $('span.euiBreadcrumb').prop('title') + '_' + uuidv4(),
report_name: reportSource + '_' + uuidv4(),
report_source: reportSource,
description: 'In-context report download',
description: $('span.euiBreadcrumb').prop('title'),
core_params: {
base_url: baseUrl,
report_format: fileFormat,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ exports[`<Main /> panel render component 1`] = `
<input
aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
class="euiFieldSearch euiFieldSearch--fullWidth"
placeholder="Search by Report ID"
placeholder="Search by Report ID, Source"
type="search"
value=""
/>
Expand Down Expand Up @@ -377,7 +377,7 @@ exports[`<Main /> panel render component after create success 1`] = `
<input
aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
class="euiFieldSearch euiFieldSearch--fullWidth"
placeholder="Search by Report ID"
placeholder="Search by Report ID, Source"
type="search"
value=""
/>
Expand Down Expand Up @@ -1729,7 +1729,7 @@ exports[`<Main /> panel render component after edit success 1`] = `
<input
aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
class="euiFieldSearch euiFieldSearch--fullWidth"
placeholder="Search by Report ID"
placeholder="Search by Report ID, Source"
type="search"
value=""
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ exports[`<ReportsTable /> panel render empty component 1`] = `
<input
aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
class="euiFieldSearch euiFieldSearch--fullWidth"
placeholder="Search by Report ID"
placeholder="Search by Report ID, Source"
type="search"
value=""
/>
Expand Down
4 changes: 1 addition & 3 deletions kibana-reports/public/components/main/main_utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ export const addReportsTableContent = (data) => {
sender: `\u2014`,
kibanaRecipients: `\u2014`,
emailRecipients: `\u2014`,
reportSource: reportParams.report_name.substring(
0, reportParams.report_name.lastIndexOf('_')
), // remove uuid from report name to display report source
reportSource: reportParams.description, // display report source name
Copy link
Member

Choose a reason for hiding this comment

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

Is this a typo? We are assigning description to the source field

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not a typo- we need a place to store the raw report source name without parsing out any special characters. And the description field is not used anywhere else.

//TODO: wrong name
timeCreated: report.time_created,
state: report.state,
Expand Down
2 changes: 1 addition & 1 deletion kibana-reports/public/components/main/reports_table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export function ReportsTable(props) {
const reportsListSearch = {
box: {
incremental: true,
placeholder: 'Search by Report ID',
placeholder: 'Search by Report ID, Source',
},
// filters: [
// {
Expand Down
370 changes: 185 additions & 185 deletions kibana-reports/target/public/.kbn-optimizer-cache

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions kibana-reports/target/public/0.plugin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion kibana-reports/target/public/0.plugin.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kibana-reports/target/public/1.plugin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion kibana-reports/target/public/1.plugin.js.map

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions kibana-reports/target/public/opendistro_kibana_reports.plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@
/******/ ({

/***/ "../../node_modules/css-loader/dist/cjs.js?!../../node_modules/postcss-loader/src/index.js?!../../node_modules/resolve-url-loader/index.js?!../../node_modules/sass-loader/dist/cjs.js?!./public/index.scss?v7dark":
/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-0-1!/Users/szhongna/Desktop/reporting/kibana/node_modules/postcss-loader/src??ref--6-oneOf-0-2!/Users/szhongna/Desktop/reporting/kibana/node_modules/resolve-url-loader??ref--6-oneOf-0-3!/Users/szhongna/Desktop/reporting/kibana/node_modules/sass-loader/dist/cjs.js??ref--6-oneOf-0-4!./public/index.scss?v7dark ***!
\***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
/*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-0-1!/Users/davidcui/kibana-master/kibana/node_modules/postcss-loader/src??ref--6-oneOf-0-2!/Users/davidcui/kibana-master/kibana/node_modules/resolve-url-loader??ref--6-oneOf-0-3!/Users/davidcui/kibana-master/kibana/node_modules/sass-loader/dist/cjs.js??ref--6-oneOf-0-4!./public/index.scss?v7dark ***!
\*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand All @@ -220,9 +220,9 @@ module.exports = exports;
/***/ }),

/***/ "../../node_modules/css-loader/dist/cjs.js?!../../node_modules/postcss-loader/src/index.js?!../../node_modules/resolve-url-loader/index.js?!../../node_modules/sass-loader/dist/cjs.js?!./public/index.scss?v7light":
/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!/Users/szhongna/Desktop/reporting/kibana/node_modules/postcss-loader/src??ref--6-oneOf-1-2!/Users/szhongna/Desktop/reporting/kibana/node_modules/resolve-url-loader??ref--6-oneOf-1-3!/Users/szhongna/Desktop/reporting/kibana/node_modules/sass-loader/dist/cjs.js??ref--6-oneOf-1-4!./public/index.scss?v7light ***!
\************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!/Users/davidcui/kibana-master/kibana/node_modules/postcss-loader/src??ref--6-oneOf-1-2!/Users/davidcui/kibana-master/kibana/node_modules/resolve-url-loader??ref--6-oneOf-1-3!/Users/davidcui/kibana-master/kibana/node_modules/sass-loader/dist/cjs.js??ref--6-oneOf-1-4!./public/index.scss?v7light ***!
\********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand All @@ -238,9 +238,9 @@ module.exports = exports;
/***/ }),

/***/ "../../node_modules/css-loader/dist/runtime/api.js":
/*!********************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/css-loader/dist/runtime/api.js ***!
\********************************************************************************************/
/*!****************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/css-loader/dist/runtime/api.js ***!
\****************************************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand Down Expand Up @@ -343,9 +343,9 @@ function toComment(sourceMap) {
/***/ }),

/***/ "../../node_modules/style-loader/dist/runtime/injectStylesIntoStyleTag.js":
/*!*******************************************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/style-loader/dist/runtime/injectStylesIntoStyleTag.js ***!
\*******************************************************************************************************************/
/*!***************************************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/style-loader/dist/runtime/injectStylesIntoStyleTag.js ***!
\***************************************************************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand Down Expand Up @@ -623,9 +623,9 @@ module.exports = function (list, options) {
/***/ }),

/***/ "../../node_modules/uuid/lib/bytesToUuid.js":
/*!*************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/uuid/lib/bytesToUuid.js ***!
\*************************************************************************************/
/*!*********************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/uuid/lib/bytesToUuid.js ***!
\*********************************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

Expand Down Expand Up @@ -658,9 +658,9 @@ module.exports = bytesToUuid;
/***/ }),

/***/ "../../node_modules/uuid/lib/rng-browser.js":
/*!*************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/uuid/lib/rng-browser.js ***!
\*************************************************************************************/
/*!*********************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/uuid/lib/rng-browser.js ***!
\*********************************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

Expand Down Expand Up @@ -703,9 +703,9 @@ if (getRandomValues) {
/***/ }),

/***/ "../../node_modules/uuid/v4.js":
/*!************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/uuid/v4.js ***!
\************************************************************************/
/*!********************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/uuid/v4.js ***!
\********************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand Down Expand Up @@ -743,9 +743,9 @@ module.exports = v4;
/***/ }),

/***/ "../../node_modules/val-loader/dist/cjs.js?key=opendistro_kibana_reports!../../packages/kbn-ui-shared-deps/public_path_module_creator.js":
/*!*********************************************************************************************************************************************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/node_modules/val-loader/dist/cjs.js?key=opendistro_kibana_reports!/Users/szhongna/Desktop/reporting/kibana/packages/kbn-ui-shared-deps/public_path_module_creator.js ***!
\*********************************************************************************************************************************************************************************************************************/
/*!*************************************************************************************************************************************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/node_modules/val-loader/dist/cjs.js?key=opendistro_kibana_reports!/Users/davidcui/kibana-master/kibana/packages/kbn-ui-shared-deps/public_path_module_creator.js ***!
\*************************************************************************************************************************************************************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand Down Expand Up @@ -785,9 +785,9 @@ module.exports = g;
/***/ }),

/***/ "../../packages/elastic-datemath/target/index.js":
/*!******************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/packages/elastic-datemath/target/index.js ***!
\******************************************************************************************/
/*!**************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/packages/elastic-datemath/target/index.js ***!
\**************************************************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {

Expand Down Expand Up @@ -1039,9 +1039,9 @@ module.exports = exports.default;
/***/ }),

/***/ "../../packages/kbn-optimizer/target/worker/entry_point_creator.js":
/*!************************************************************************************************************!*\
!*** /Users/szhongna/Desktop/reporting/kibana/packages/kbn-optimizer/target/worker/entry_point_creator.js ***!
\************************************************************************************************************/
/*!********************************************************************************************************!*\
!*** /Users/davidcui/kibana-master/kibana/packages/kbn-optimizer/target/worker/entry_point_creator.js ***!
\********************************************************************************************************/
/*! no exports provided */
/***/ (function(module, __webpack_exports__, __webpack_require__) {

Expand Down Expand Up @@ -12222,9 +12222,9 @@ const generateInContextReport = (timeRanges, queryUrl, fileFormat, rest = {}) =>
time_to: timeRanges.time_to.valueOf(),
report_definition: {
report_params: {
report_name: jquery__WEBPACK_IMPORTED_MODULE_0___default()('span.euiBreadcrumb').prop('title') + '_' + uuid_v4__WEBPACK_IMPORTED_MODULE_5___default()(),
report_name: reportSource + '_' + uuid_v4__WEBPACK_IMPORTED_MODULE_5___default()(),
report_source: reportSource,
description: 'In-context report download',
description: jquery__WEBPACK_IMPORTED_MODULE_0___default()('span.euiBreadcrumb').prop('title'),
core_params: {
base_url: baseUrl,
report_format: fileFormat,
Expand Down Expand Up @@ -12947,8 +12947,8 @@ const addReportsTableContent = data => {
sender: `\u2014`,
kibanaRecipients: `\u2014`,
emailRecipients: `\u2014`,
reportSource: reportParams.report_name.substring(0, reportParams.report_name.lastIndexOf('_')),
// remove uuid from report name to display report source
reportSource: reportParams.description,
// display report source name
//TODO: wrong name
timeCreated: report.time_created,
state: report.state,
Expand Down

Large diffs are not rendered by default.