Skip to content

Commit

Permalink
Merge branch 'main' into csv-separator
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuali925 committed Nov 4, 2021
2 parents ec256fd + b4ec424 commit c765590
Show file tree
Hide file tree
Showing 17 changed files with 321 additions and 923 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [pull_request, push]
env:
PLUGIN_NAME: reportsDashboards
ARTIFACT_NAME: reports-dashboards
OPENSEARCH_VERSION: '1.x'
OPENSEARCH_VERSION: '1.1'
OPENSEARCH_PLUGIN_VERSION: 1.1.0.0

jobs:
Expand Down
18 changes: 0 additions & 18 deletions dashboards-reports/.babelrc

This file was deleted.

23 changes: 23 additions & 0 deletions dashboards-reports/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

module.exports = {
presets: [
require('@babel/preset-env', {
targets: { node: '10' },
}),
require('@babel/preset-react'),
require('@babel/preset-typescript'),
],
plugins: [
require('@babel/plugin-proposal-class-properties'),
require('@babel/plugin-proposal-object-rest-spread'),
['@babel/plugin-transform-modules-commonjs', { allowTopLevelThis: true }],
[require('@babel/plugin-transform-runtime'), { regenerator: true }],
],
};
13 changes: 0 additions & 13 deletions dashboards-reports/public/components/main/main_utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,6 @@ import { i18n } from '@osd/i18n';
import { HttpFetchOptions, HttpSetup } from '../../../../../src/core/public';
import { uiSettingsService } from '../utils/settings_service';

export const displayDeliveryChannels = (configIds: Array<string>, channels: Array<{label: string, id: string}>) => {
let displayChannels = [];
for (let i = 0; i < configIds.length; ++i) {
for (let j = 0; j < channels.length; ++j) {
if (configIds[i] === channels[j].id) {
displayChannels.push(channels[j].label);
break;
}
}
}
return displayChannels.toString();
}

export const getAvailableNotificationsChannels = (configList: any) => {
let availableChannels = [];
for (let i = 0; i < configList.length; ++i) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,85 +382,6 @@ exports[`<ReportDefinitionDetails /> panel render 5 hours recurring definition d
</dl>
</div>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
<h3
class="euiTitle euiTitle--medium"
>
Notification settings
</h3>
<div
class="euiSpacer euiSpacer--l"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Config IDs
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Title
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Text description
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Html description
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
</div>
</div>
<div
aria-live="polite"
Expand Down Expand Up @@ -853,85 +774,6 @@ exports[`<ReportDefinitionDetails /> panel render disabled daily definition, cli
</dl>
</div>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
<h3
class="euiTitle euiTitle--medium"
>
Notification settings
</h3>
<div
class="euiSpacer euiSpacer--l"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Config IDs
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Title
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Text description
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Html description
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
</div>
</div>
<div
aria-live="polite"
Expand Down Expand Up @@ -1320,85 +1162,6 @@ exports[`<ReportDefinitionDetails /> panel render on demand definition details 1
</dl>
</div>
</div>
<div
class="euiSpacer euiSpacer--l"
/>
<h3
class="euiTitle euiTitle--medium"
>
Notification settings
</h3>
<div
class="euiSpacer euiSpacer--l"
/>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Config IDs
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Title
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Text description
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
<div
class="euiFlexItem"
>
<dl
class="euiDescriptionList euiDescriptionList--row"
>
<dt
class="euiDescriptionList__title"
>
Html description
</dt>
<dd
class="euiDescriptionList__description"
/>
</dl>
</div>
</div>
</div>
<div
aria-live="polite"
Expand Down
Loading

0 comments on commit c765590

Please sign in to comment.