mirror of
https://github.com/getredash/redash.git
synced 2026-03-22 10:00:17 -04:00
* Improve sizing for Number inputs
Co-Authored-By: Ran Byron <ranbena@gmail.com>
* Migrate WidgetDialog
* Start migrating Widget
* Update textbox to use HtmlContent
* QueryLink migration and some updates
* Add visualization rendering
* Render widget
* Add delete button
* Update AutoHeight
* Add widget bottom
* Add Drodpown button
* Split Widget component
* Update with #4056 and trigger netlify
* In progress: use composition
* Add header and footer
* Update widget actions positioning
* Re-render when refreshing from widget
* Add workaround to force DashboardGrid re-render
* VisualizationWidgetFooter component
* VisualizationWidget menu
* Separate RestrictedWidget
* Update tests
* Update margin for Parameters
* Remove widget files
* Revert "Improve sizing for Number inputs"
This reverts commit a02ce8f0aa.
* Some cleanup
* Move refresh logic to the Dashboard
* Add loadingWidgets logic to the public dashboard
* Add onLoadWidget
* Remove parameter from URL when empty
* Recreate widget array instead of loadingWidgets
* Add comment about re-rendering + whitespace missing
* CR changes
* Use plain html instead of string syntax
Co-Authored-By: Ran Byron <ranbena@gmail.com>
94 lines
3.0 KiB
JavaScript
94 lines
3.0 KiB
JavaScript
import { isEqual, map, find } from 'lodash';
|
|
import React, { useState, useMemo, useEffect, useRef } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { react2angular } from 'react2angular';
|
|
import useQueryResult from '@/lib/hooks/useQueryResult';
|
|
import { Filters, FiltersType, filterData } from '@/components/Filters';
|
|
import { registeredVisualizations, VisualizationType } from './index';
|
|
|
|
function combineFilters(localFilters, globalFilters) {
|
|
// tiny optimization - to avoid unnecessary updates
|
|
if ((localFilters.length === 0) || (globalFilters.length === 0)) {
|
|
return localFilters;
|
|
}
|
|
|
|
return map(localFilters, (localFilter) => {
|
|
const globalFilter = find(globalFilters, f => f.name === localFilter.name);
|
|
if (globalFilter) {
|
|
return {
|
|
...localFilter,
|
|
current: globalFilter.current,
|
|
};
|
|
}
|
|
return localFilter;
|
|
});
|
|
}
|
|
|
|
export function VisualizationRenderer(props) {
|
|
const data = useQueryResult(props.queryResult);
|
|
const [filters, setFilters] = useState(data.filters);
|
|
const lastOptions = useRef();
|
|
|
|
// Reset local filters when query results updated
|
|
useEffect(() => {
|
|
setFilters(combineFilters(data.filters, props.filters));
|
|
}, [data]);
|
|
|
|
// Update local filters when global filters changed
|
|
useEffect(() => {
|
|
setFilters(combineFilters(filters, props.filters));
|
|
}, [props.filters]);
|
|
|
|
const filteredData = useMemo(() => ({
|
|
columns: data.columns,
|
|
rows: filterData(data.rows, filters),
|
|
}), [data, filters]);
|
|
|
|
const { showFilters, visualization } = props;
|
|
const { Renderer, getOptions } = registeredVisualizations[visualization.type];
|
|
|
|
// Avoid unnecessary updates (which may be expensive or cause issues with
|
|
// internal state of some visualizations like Table) - compare options deeply
|
|
// and use saved reference if nothing changed
|
|
// More details: https://github.com/getredash/redash/pull/3963#discussion_r306935810
|
|
let options = getOptions(visualization.options, data);
|
|
if (isEqual(lastOptions.current, options)) {
|
|
options = lastOptions.current;
|
|
}
|
|
lastOptions.current = options;
|
|
|
|
return (
|
|
<div className="visualization-renderer">
|
|
{showFilters && <Filters filters={filters} onChange={setFilters} />}
|
|
<div className="visualization-renderer-wrapper">
|
|
<Renderer
|
|
key={`visualization${visualization.id}`}
|
|
options={options}
|
|
data={filteredData}
|
|
visualizationName={visualization.name}
|
|
context={props.context}
|
|
/>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
VisualizationRenderer.propTypes = {
|
|
visualization: VisualizationType.isRequired,
|
|
queryResult: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
|
filters: FiltersType,
|
|
showFilters: PropTypes.bool,
|
|
context: PropTypes.oneOf(['query', 'widget']).isRequired,
|
|
};
|
|
|
|
VisualizationRenderer.defaultProps = {
|
|
filters: [],
|
|
showFilters: true,
|
|
};
|
|
|
|
export default function init(ngModule) {
|
|
ngModule.component('visualizationRenderer', react2angular(VisualizationRenderer));
|
|
}
|
|
|
|
init.init = true;
|