diff --git a/frontend/app/components/Dashboard/Widgets/CallWithErrors/CallWithErrors.js b/frontend/app/components/Dashboard/Widgets/CallWithErrors/CallWithErrors.js index 3f24ba40e..6c7379a2a 100644 --- a/frontend/app/components/Dashboard/Widgets/CallWithErrors/CallWithErrors.js +++ b/frontend/app/components/Dashboard/Widgets/CallWithErrors/CallWithErrors.js @@ -68,6 +68,7 @@ export default class CallWithErrors extends React.PureComponent { diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTable/CustomMetricTable.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTable/CustomMetricTable.tsx index a43a35fc8..b9d0f73a2 100644 --- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTable/CustomMetricTable.tsx +++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTable/CustomMetricTable.tsx @@ -27,9 +27,10 @@ interface Props { metric?: any, data: any; onClick?: (filters) => void; + isTemplate?: boolean; } function CustomMetriTable(props: Props) { - const { metric = {}, data = { values: [] }, onClick = () => null } = props; + const { metric = {}, data = { values: [] }, onClick = () => null, isTemplate } = props; const rows = List(data.values); const onClickHandler = (event, data) => { @@ -56,6 +57,7 @@ function CustomMetriTable(props: Props) { rows={ rows } rowClass="group" onRowClick={ onClickHandler } + isTemplate={isTemplate} /> diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx index 15acd21bb..432cef988 100644 --- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx +++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx @@ -5,7 +5,7 @@ import { Styles } from '../../common'; import { ResponsiveContainer } from 'recharts'; import { LAST_24_HOURS, LAST_30_MINUTES, YESTERDAY, LAST_7_DAYS } from 'Types/app/period'; import stl from './CustomMetricWidget.css'; -import { getChartFormatter, getStartAndEndTimestampsByDensity } from 'Types/dashboard/helper'; +import { getChartFormatter, getStartAndEndTimestampsByDensity } from 'Types/dashboard/helper'; import { init, edit, remove, setAlertMetricId, setActiveWidget, updateActiveState } from 'Duck/customMetrics'; import APIClient from 'App/api_client'; import { setShowAlerts } from 'Duck/dashboard'; @@ -21,7 +21,7 @@ const customParams = rangeName => { // if (rangeName === LAST_30_MINUTES) params.density = 70 // if (rangeName === YESTERDAY) params.density = 70 // if (rangeName === LAST_7_DAYS) params.density = 70 - + return params } @@ -41,9 +41,10 @@ interface Props { edit: (setDefault?) => void; setActiveWidget: (widget) => void; updateActiveState: (metricId, state) => void; + isTemplate?: boolean; } function CustomMetricWidget(props: Props) { - const { metric, showSync, compare, period } = props; + const { metric, showSync, compare, period, isTemplate } = props; const [loading, setLoading] = useState(false) const [data, setData] = useState([]); const [seriesMap, setSeriesMap] = useState([]); @@ -97,7 +98,7 @@ function CustomMetricWidget(props: Props) { const periodTimestamps = metric.metricType === 'timeseries' ? getStartAndEndTimestampsByDensity(timestamp, period.start, period.end, params.density) : period.toTimestamps(); - + const activeWidget = { widget: metric, period: period, @@ -166,6 +167,7 @@ function CustomMetricWidget(props: Props) { metric={ metric } data={ data[0] } onClick={ clickHandlerTable } + isTemplate={isTemplate} /> )} @@ -202,4 +204,4 @@ const WidgetIcon = ({ className = '', tooltip = '', icon, onClick }) => ( position="top center" inverted /> -) \ No newline at end of file +) diff --git a/frontend/app/components/Dashboard/Widgets/MissingResources/MissingResources.js b/frontend/app/components/Dashboard/Widgets/MissingResources/MissingResources.js index 765104efb..c9803e43d 100644 --- a/frontend/app/components/Dashboard/Widgets/MissingResources/MissingResources.js +++ b/frontend/app/components/Dashboard/Widgets/MissingResources/MissingResources.js @@ -8,7 +8,7 @@ const cols = [ { key: 'resource', title: 'Resource', - Component: ResourceInfo, + Component: ResourceInfo, width: '40%', }, { @@ -49,6 +49,7 @@ export default class MissingResources extends React.PureComponent { rows={ resources } rowClass="group" compare={compare} + isTemplate={this.props.isTemplate} /> diff --git a/frontend/app/components/Dashboard/Widgets/MostImpactfulErrors/MostImpactfulErrors.js b/frontend/app/components/Dashboard/Widgets/MostImpactfulErrors/MostImpactfulErrors.js index f5d252e08..ef10f02e6 100644 --- a/frontend/app/components/Dashboard/Widgets/MostImpactfulErrors/MostImpactfulErrors.js +++ b/frontend/app/components/Dashboard/Widgets/MostImpactfulErrors/MostImpactfulErrors.js @@ -53,6 +53,7 @@ export default class MostImpactfulErrors extends React.PureComponent { cols={ cols } rows={ errors } rowProps={ { findJourneys: this.findJourneys } } + isTemplate={this.props.isTemplate} /> diff --git a/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/CallWithErrors/CallWithErrors.tsx b/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/CallWithErrors/CallWithErrors.tsx index 4e5d0f637..698c8ee18 100644 --- a/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/CallWithErrors/CallWithErrors.tsx +++ b/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/CallWithErrors/CallWithErrors.tsx @@ -45,6 +45,7 @@ const cols = [ interface Props { data: any metric?: any + isTemplate?: boolean } function CallWithErrors(props: Props) { const { data, metric } = props; @@ -57,7 +58,7 @@ function CallWithErrors(props: Props) { }; return ( - + ); } -export default CallWithErrors; \ No newline at end of file +export default CallWithErrors; diff --git a/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/MissingResources/MissingResources.tsx b/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/MissingResources/MissingResources.tsx index 0a3d5567e..69517328c 100644 --- a/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/MissingResources/MissingResources.tsx +++ b/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/MissingResources/MissingResources.tsx @@ -11,7 +11,7 @@ const cols = [ { key: 'resource', title: 'Resource', - Component: ResourceInfo, + Component: ResourceInfo, width: '40%', }, { @@ -38,9 +38,10 @@ const cols = [ interface Props { data: any metric?: any + isTemplate?: boolean } function MissingResources(props: Props) { - const { data, metric } = props; + const { data, metric, isTemplate } = props; return ( ); } -export default MissingResources; \ No newline at end of file +export default MissingResources; diff --git a/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/SlowestResources/SlowestResources.tsx b/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/SlowestResources/SlowestResources.tsx index c4bbb1ed9..ac400904a 100644 --- a/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/SlowestResources/SlowestResources.tsx +++ b/frontend/app/components/Dashboard/Widgets/PredefinedWidgets/SlowestResources/SlowestResources.tsx @@ -56,9 +56,10 @@ const cols = [ interface Props { data: any metric?: any + isTemplate?: boolean } function SlowestResources(props: Props) { - const { data, metric } = props; + const { data, metric, isTemplate } = props; return ( ); } -export default SlowestResources; \ No newline at end of file +export default SlowestResources; diff --git a/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js b/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js index fe48ceb81..670cbf524 100644 --- a/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js +++ b/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js @@ -35,7 +35,7 @@ const cols = [ @widgetHOC('slowestImages', { fitContent: true }) export default class SlowestImages extends React.PureComponent { render() { - const { data: images, loading } = this.props; + const { data: images, loading, isTemplate } = this.props; return ( diff --git a/frontend/app/components/Dashboard/Widgets/SlowestResources/SlowestResources.js b/frontend/app/components/Dashboard/Widgets/SlowestResources/SlowestResources.js index 830326b87..5124938f3 100644 --- a/frontend/app/components/Dashboard/Widgets/SlowestResources/SlowestResources.js +++ b/frontend/app/components/Dashboard/Widgets/SlowestResources/SlowestResources.js @@ -65,13 +65,13 @@ export default class SlowestResources extends React.PureComponent { }; writeOption = (e, { name, value }) => { - this.setState({ [ name ]: value }) + this.setState({ [ name ]: value }) this.props.fetchWidget(WIDGET_KEY, this.props.period, this.props.platform, { [ name ]: value === 'all' ? null : value }) } render() { - const { data, loading, compare } = this.props; - + const { data, loading, compare, isTemplate } = this.props; + return (
@@ -86,8 +86,8 @@ export default class SlowestResources extends React.PureComponent { -
+ > +
diff --git a/frontend/app/components/Dashboard/Widgets/common/Table.js b/frontend/app/components/Dashboard/Widgets/common/Table.js index e3d88502f..9c8c1928f 100644 --- a/frontend/app/components/Dashboard/Widgets/common/Table.js +++ b/frontend/app/components/Dashboard/Widgets/common/Table.js @@ -19,9 +19,10 @@ export default class Table extends React.PureComponent { compare = false, maxHeight = 200, onRowClick = null, + isTemplate, } = this.props; const { showAll } = this.state; - + return (
@@ -47,9 +48,9 @@ export default class Table extends React.PureComponent {
)) }
- )) } + )) } - { rows.size > (small ? 3 : 5) && !showAll && + { !isTemplate && rows.size > (small ? 3 : 5) && !showAll &&