Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chore]: Technical: js to ts convertion components root modals (#1801)
dariaterekhovaaefe293e71d7bb
diff --git a/package.json b/package.jsonindex 2f2c341b1..882e2c60a 100644--- a/package.json+++ b/package.json@@ -123,6 +123,7 @@"@types/lodash.xor": "^4.5.7","@types/mapbox__geo-viewport": "^0.4.1","@types/react-dom": "^18.0.0",+ "@types/react-copy-to-clipboard": "^5.0.2","@types/react-lifecycles-compat": "^3.0.1","@types/react-map-gl": "^6.1.2","@types/react-modal": "^3.13.1",diff --git a/src/actions/vis-state-actions.ts b/src/actions/vis-state-actions.tsindex cc0ed944c..34175eaea 100644--- a/src/actions/vis-state-actions.ts+++ b/src/actions/vis-state-actions.ts@@ -496,7 +496,7 @@ export function updateTableColor(export type SortTableColumnUpdaterAction = {dataId: string;column: string;- mode: string;+ mode?: string;};/*** Sort dataset column, for table display@@ -510,7 +510,7 @@ export type SortTableColumnUpdaterAction = {export function sortTableColumn(dataId: string,column: string,- mode: string+ mode?: string): Merge<SortTableColumnUpdaterAction, {type: typeof ActionTypes.SORT_TABLE_COLUMN}> {return {type: ActionTypes.SORT_TABLE_COLUMN,diff --git a/src/cloud-providers/provider.ts b/src/cloud-providers/provider.tsindex e68a60bc1..c95719329 100644--- a/src/cloud-providers/provider.ts+++ b/src/cloud-providers/provider.ts@@ -46,7 +46,7 @@ export type ProviderProps = {thumbnail?: Thumbnail;};-interface IconProps {+export interface IconProps {height?: string;width?: string;}@@ -169,7 +169,7 @@ export default class Provider {* @param {function} onCloudLogoutSuccess - callbacks to be called after logout success* @public*/- async logout(onCloudLogoutSuccess) {+ async logout(onCloudLogoutSuccess: () => void) {onCloudLogoutSuccess();return;}diff --git a/src/components/bottom-widget.tsx b/src/components/bottom-widget.tsxindex ead329ca9..235be0131 100644--- a/src/components/bottom-widget.tsx+++ b/src/components/bottom-widget.tsx@@ -33,7 +33,7 @@ const maxWidth = 1080;interface BottomWidgetContainerProps {hasPadding?: boolean;- width: number;+ width?: number;}const BottomWidgetContainer = styled.div<BottomWidgetContainerProps>`diff --git a/src/components/common/data-table/index.tsx b/src/components/common/data-table/index.tsxindex a5657a787..bd7e35452 100644--- a/src/components/common/data-table/index.tsx+++ b/src/components/common/data-table/index.tsx@@ -19,7 +19,7 @@// THE SOFTWARE.import React, {Component, createRef} from 'react';-import {ScrollSync, AutoSizer} from 'react-virtualized';+import {ScrollSync, AutoSizer, OnScrollParams, GridProps, Index} from 'react-virtualized';import styled, {withTheme} from 'styled-components';import classnames from 'classnames';import {createSelector} from 'reselect';@@ -37,6 +37,7 @@ import {adjustCellsToContainer} from './cell-size';import {ALL_FIELD_TYPES, SORT_ORDER} from 'constants/default-settings';import FieldTokenFactory from 'components/common/field-token';+import {DataContainerInterface} from 'utils/table-utils/data-container-interface';const defaultHeaderRowHeight = 55;const defaultRowHeight = 32;@@ -229,10 +230,26 @@ const columnWidthFunction = (columns, cellSizeCache, ghost?) => ({index}) => {return (columns[index] || {}).ghost ? ghost : cellSizeCache[columns[index]] || defaultColumnWidth;};+interface GetRowCellProps {+ dataContainer: DataContainerInterface;+ columns: (string & {ghost?: boolean})[];+ column: string;+ colMeta;+ rowIndex: number;+ sortOrder?: number[] | null;+}+/** This is an accessor method used to generalize getting a cell from a data row*/-const getRowCell = ({dataContainer, columns, column, colMeta, rowIndex, sortOrder}) => {+const getRowCell = ({+ dataContainer,+ columns,+ column,+ colMeta,+ rowIndex,+ sortOrder+}: GetRowCellProps) => {const rowIdx = sortOrder && sortOrder.length ? get(sortOrder, rowIndex) : rowIndex;const {type} = colMeta[column];@@ -241,6 +258,29 @@ const getRowCell = ({dataContainer, columns, column, colMeta, rowIndex, sortOrdereturn parseFieldValue(value, type);};+interface TableSectionProps {+ classList?: {+ header: string;+ rows: string;+ };+ isPinned?: boolean;+ columns: (string & {ghost?: boolean})[];+ headerGridProps?;+ fixedWidth?: number;+ fixedHeight?: number;+ onScroll?: (params: OnScrollParams) => void;+ scrollTop?: number;+ dataGridProps: {+ rowHeight: number | ((params: Index) => number);+ rowCount: number;+ } & Partial<GridProps>;+ columnWidth?;+ setGridRef?: Function;+ headerCellRender?;+ dataCellRender?;+ scrollLeft?: number;+}+export const TableSection = ({classList,isPinned,@@ -256,7 +296,7 @@ export const TableSection = ({headerCellRender,dataCellRender,scrollLeft = 0-}) => (+}: TableSectionProps) => (<AutoSizer>{({width, height}) => {const gridDimension = {@@ -303,10 +343,22 @@ type CellSizeCache = {[id: string]: number};interface DataTableProps {cellSizeCache?: CellSizeCache;pinnedColumns?: string[];+ columns: (string & {ghost?: boolean})[];fixedWidth?: number;theme?: any;- dataContainer;- fixedHeight;+ dataContainer: DataContainerInterface;+ fixedHeight?: number;+ colMeta: {+ [id: string]: {+ name: string;+ type: string;+ };+ };+ sortColumn?: {[id: string]: string};+ sortTableColumn: (id: string, mode?: string) => void;+ pinTableColumn: (id: string) => void;+ copyTableColumn: (id: string) => void;+ sortOrder?: number[] | null;}interface DataTableState {@@ -357,8 +409,8 @@ function DataTableFactory(FieldToken: ReturnType<typeof FieldTokenFactory>) {}root = createRef<HTMLDivElement>();- columns = props => props.columns;- pinnedColumns = props => props.pinnedColumns;+ columns = (props: DataTableProps) => props.columns;+ pinnedColumns = (props: DataTableProps) => props.pinnedColumns;unpinnedColumns = createSelector(this.columns, this.pinnedColumns, (columns, pinnedColumns) =>!Array.isArray(pinnedColumns) ? columns : columns.filter(c => !pinnedColumns.includes(c)));@@ -396,11 +448,17 @@ function DataTableFactory(FieldToken: ReturnType<typeof FieldTokenFactory>) {scaleCellsToWidth = debounce(this.doScaleCellsToWidth, 300);- renderHeaderCell = (columns, isPinned, props, toggleMoreOptions, moreOptionsColumn) => {+ renderHeaderCell = (+ columns: (string & {ghost?: boolean})[],+ isPinned: boolean,+ props: DataTableProps,+ toggleMoreOptions,+ moreOptionsColumn+ ) => {// eslint-disable-next-line react/display-namereturn cellInfo => {const {columnIndex, key, style} = cellInfo;- const {colMeta, sortColumn, sortTableColumn, pinTableColumn, copyTableColumn} = props;+ const {colMeta, sortColumn = {}, sortTableColumn, pinTableColumn, copyTableColumn} = props;const column = columns[columnIndex];const isGhost = column.ghost;@@ -468,7 +526,7 @@ function DataTableFactory(FieldToken: ReturnType<typeof FieldTokenFactory>) {};};- renderDataCell = (columns, isPinned, props) => {+ renderDataCell = (columns, isPinned, props: DataTableProps) => {return cellInfo => {const {columnIndex, key, style, rowIndex} = cellInfo;const {dataContainer, colMeta} = props;@@ -483,7 +541,7 @@ function DataTableFactory(FieldToken: ReturnType<typeof FieldTokenFactory>) {const endCell = columnIndex === columns.length - 1;const firstCell = columnIndex === 0;const bottomCell = rowIndex === lastRowIndex;- const alignRight = fieldToAlignRight[type];+ const alignRight = fieldToAlignRight[Number(type)];const cell = (<div@@ -509,11 +567,19 @@ function DataTableFactory(FieldToken: ReturnType<typeof FieldTokenFactory>) {};render() {- const {dataContainer, pinnedColumns = [], theme = {}, fixedWidth, fixedHeight} = this.props;+ const {+ dataContainer,+ pinnedColumns = [],+ theme = {},+ fixedWidth,+ fixedHeight = 0+ } = this.props;const unpinnedColumns = this.unpinnedColumns(this.props);const {cellSizeCache = {}, moreOptionsColumn, ghost} = this.state;- const unpinnedColumnsGhost = ghost ? [...unpinnedColumns, {ghost: true}] : unpinnedColumns;+ const unpinnedColumnsGhost = ghost+ ? [...unpinnedColumns, {ghost: true} as string & {ghost: boolean}]+ : unpinnedColumns;const pinnedColumnsWidth = pinnedColumns.reduce((acc, val) => acc + get(cellSizeCache, val, 0),0diff --git a/src/components/common/data-table/option-dropdown.tsx b/src/components/common/data-table/option-dropdown.tsxindex 6ce13384c..82fc49212 100644--- a/src/components/common/data-table/option-dropdown.tsx+++ b/src/components/common/data-table/option-dropdown.tsx@@ -59,7 +59,7 @@ interface OptionDropdownProps {pinTableColumn: () => void;copyTableColumn: () => void;sortMode?: string;- isSorted?: boolean;+ isSorted?: string;isPinned?: boolean;}diff --git a/src/components/common/item-selector/item-selector.d.ts b/src/components/common/item-selector/item-selector.d.tsindex 1c818b120..814bb3a6c 100644--- a/src/components/common/item-selector/item-selector.d.ts+++ b/src/components/common/item-selector/item-selector.d.ts@@ -1,30 +1,30 @@import {FunctionComponent, ComponentType} from 'react';export type ItemSelectorProps = {- selectedItems: ReadonlyArray<string | number | boolean | object>,- options: ReadonlyArray<string | number | boolean | object>,- onChange: (items: ReadonlyArray<string | number | boolean | object>) => void,- fixedOptions?: any[],- erasable?: boolean,- showArrow?: boolean,- searchable?: boolean,- displayOption?: string | ((opt: any) => any),- getOptionValue?: string | ((opt: any) => any),- filterOption?: string | ((opt: any) => any),- placement?: string,- disabled?: boolean,- isError?: boolean,- multiSelect?: boolean,- inputTheme?: string,- size?: string,- onBlur?: () => void,- placeholder?: string,- closeOnSelect?: boolean,- typeaheadPlaceholder?: string,- DropdownHeaderComponent?: ComponentType<any> | null,- DropDownRenderComponent?: ComponentType<any>,- DropDownLineItemRenderComponent?: ComponentType<any>,- CustomChickletComponent?: ComponentType<any>+ selectedItems: ReadonlyArray<string | number | boolean | object>;+ options: ReadonlyArray<string | number | boolean | object>;+ onChange: (items: ReadonlyArray<string | number | boolean | object>) => void;+ fixedOptions?: any[];+ erasable?: boolean;+ showArrow?: boolean;+ searchable?: boolean;+ displayOption?: string | ((opt: any) => any);+ getOptionValue?: string | ((opt: any) => any);+ filterOption?: string | ((opt: any) => any);+ placement?: string;+ disabled?: boolean;+ isError?: boolean;+ multiSelect?: boolean;+ inputTheme?: string;+ size?: string;+ onBlur?: () => void;+ placeholder?: string;+ closeOnSelect?: boolean;+ typeaheadPlaceholder?: string;+ DropdownHeaderComponent?: ComponentType<any> | null;+ DropDownRenderComponent?: ComponentType<any>;+ DropDownLineItemRenderComponent?: ComponentType<any>;+ CustomChickletComponent?: ComponentType<any>;};const ItemSelector: FunctionComponent<ItemSelectorProps>;diff --git a/src/components/common/modal.tsx b/src/components/common/modal.tsxindex 26460dafa..dda16facb 100644--- a/src/components/common/modal.tsx+++ b/src/components/common/modal.tsx@@ -18,7 +18,7 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React, {Component} from 'react';+import React, {Component, ReactNode} from 'react';import {FormattedMessage} from 'localization';import styled, {FlattenSimpleInterpolation} from 'styled-components';@@ -155,9 +155,10 @@ export interface ModalDialogProps {cssStyle?: FlattenSimpleInterpolation | string;style?: React.CSSProperties;theme: any;+ children?: ReactNode;}-class ModalDialog extends Component<ModalDialogProps> {+export class ModalDialog extends Component<ModalDialogProps> {static defaultProps = {footer: false,close: true,diff --git a/src/components/common/styled-components.tsx b/src/components/common/styled-components.tsxindex 424889184..447f41101 100644--- a/src/components/common/styled-components.tsx+++ b/src/components/common/styled-components.tsx@@ -477,9 +477,9 @@ export const StyledModalVerticalPanel = styled.div.attrs({}`;-export const StyledModalSection = styled.div.attrs({- className: 'modal-section'-})`+export const StyledModalSection = styled.div.attrs(({className}) => ({+ className: classnames('modal-section', className)+}))`margin-bottom: 32px;.modal-section-title {@@ -559,7 +559,7 @@ export const StyledAttrbution = styled.div.attrs({}`;-interface StyledExportSectionProps {+export interface StyledExportSectionProps {disabled?: boolean;}diff --git a/src/components/modal-container.tsx b/src/components/modal-container.tsxindex f197022c1..f06f20768 100644--- a/src/components/modal-container.tsx+++ b/src/components/modal-container.tsx@@ -20,7 +20,6 @@import React, {Component} from 'react';import {css} from 'styled-components';-import {findDOMNode} from 'react-dom';import {createSelector} from 'reselect';import get from 'lodash.get';import document from 'global/document';@@ -70,6 +69,7 @@ import * as UIStateActions from 'actions/ui-state-actions';import * as MapStyleActions from 'actions/map-style-actions';import * as ProviderActions from 'actions/provider-actions';import {ModalDialogProps} from './common/modal';+import {Provider} from 'cloud-providers';const DataTableModalStyle = css`top: 80px;@@ -114,7 +114,7 @@ export type ModalContainerProps = {mapStyleActions: typeof MapStyleActions;providerActions: typeof ProviderActions;onSaveToStorage?: () => void;- cloudProviders: object[];+ cloudProviders: Provider[];onLoadCloudMapSuccess?: OnSuccessCallBack;onLoadCloudMapError?: OnErrorCallBack;onExportToCloudSuccess?: OnSuccessCallBack;@@ -274,7 +274,6 @@ export default function ModalContainerFactory(mapState,uiState,visState,- rootNode,visStateActions,uiStateActions,providerState@@ -300,8 +299,6 @@ export default function ModalContainerFactory(const width = containerW * 0.9;template = (<DataTableModal- width={containerW * 0.9}- height={containerH * 0.85}datasets={datasets}dataId={editingDataset}showDatasetTable={visStateActions.showDatasetTable}@@ -395,7 +392,6 @@ export default function ModalContainerFactory(supportedDataTypes={EXPORT_DATA_TYPE_OPTIONS}datasets={datasets}applyCPUFilter={this.props.visStateActions.applyCPUFilter}- onClose={this._closeModal}onChangeExportDataType={uiStateActions.setExportDataType}onChangeExportSelectedDataset={uiStateActions.setExportSelectedDataset}onChangeExportFiltered={uiStateActions.setExportFiltered}@@ -501,7 +497,6 @@ export default function ModalContainerFactory({...providerState}cloudProviders={this.props.cloudProviders}title={get(visState, ['mapInfo', 'title'])}- onSetCloudProvider={this.props.providerActions.setCloudProvider}onUpdateImageSetting={uiStateActions.setExportImageSetting}cleanupExportImage={uiStateActions.cleanupExportImage}/>@@ -547,7 +542,6 @@ export default function ModalContainerFactory(return this.props.rootNode ? (<ModalDialog- parentSelector={() => findDOMNode(rootNode)}isOpen={Boolean(currentModal)}onCancel={this._closeModal}{...modalProps}diff --git a/src/components/modals/add-map-style-modal.js b/src/components/modals/add-map-style-modal.tsxsimilarity index 94%rename from src/components/modals/add-map-style-modal.jsrename to src/components/modals/add-map-style-modal.tsxindex 9768007a0..ef89e13d3 100644--- a/src/components/modals/add-map-style-modal.js+++ b/src/components/modals/add-map-style-modal.tsx@@ -20,7 +20,6 @@import React, {Component} from 'react';import {polyfill} from 'react-lifecycles-compat';-import PropTypes from 'prop-types';import classnames from 'classnames';import styled from 'styled-components';import MapboxGLMap from 'react-map-gl';@@ -35,8 +34,10 @@ import {media} from 'styles/media-breakpoints';// Utilsimport {transformRequest} from 'utils/map-style-utils/mapbox-utils';-import {injectIntl} from 'react-intl';+import {injectIntl, IntlShape} from 'react-intl';import {FormattedMessage} from 'localization';+import {InputStyle, MapState} from 'reducers';+import mapboxgl from 'mapbox-gl';const MapH = 190;const MapW = 264;@@ -104,17 +105,18 @@ const InlineLink = styled.a`}`;-function AddMapStyleModalFactory() {- class AddMapStyleModal extends Component {- static propTypes = {- inputMapStyle: PropTypes.func.isRequired,- inputStyle: PropTypes.object.isRequired,- loadCustomMapStyle: PropTypes.func.isRequired,- mapboxApiAccessToken: PropTypes.string.isRequired,- mapboxApiUrl: PropTypes.string.isRequired,- mapState: PropTypes.object.isRequired- };+interface AddMapStyleModalProps {+ inputMapStyle: Function;+ inputStyle: InputStyle;+ loadCustomMapStyle: Function;+ mapboxApiAccessToken: string;+ mapboxApiUrl?: string;+ mapState: MapState;+ intl: IntlShape;+}+function AddMapStyleModalFactory() {+ class AddMapStyleModal extends Component<AddMapStyleModalProps> {state = {reRenderKey: 0,previousToken: null@@ -139,6 +141,9 @@ function AddMapStyleModalFactory() {return null;}+ mapRef: MapboxGLMap | null | undefined;+ _map: mapboxgl.Map | undefined;+componentDidUpdate() {const map = this.mapRef && this.mapRef.getMap();if (map && this._map !== map) {@@ -283,7 +288,7 @@ function AddMapStyleModalFactory() {key={this.state.reRenderKey}width={MapW}height={MapH}- mapStyle={inputStyle.url}+ mapStyle={inputStyle.url === null ? undefined : inputStyle.url}/></StyledMapContainer>)}diff --git a/src/components/modals/cloud-tile.js b/src/components/modals/cloud-tile.tsxsimilarity index 79%rename from src/components/modals/cloud-tile.jsrename to src/components/modals/cloud-tile.tsxindex 2aecaa492..eb5ef6504 100644--- a/src/components/modals/cloud-tile.js+++ b/src/components/modals/cloud-tile.tsx@@ -18,15 +18,20 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React from 'react';+import React, {ReactNode} from 'react';import styled from 'styled-components';import {Logout, Login} from 'components/common/icons';import {CenterVerticalFlexbox, Button, CheckMark} from 'components/common/styled-components';import LoadingSpinner from 'components/common/loading-spinner';+import {Provider} from 'cloud-providers';++interface StyledTileWrapperProps {+ selected?: boolean;+}const StyledTileWrapper = styled.div.attrs({className: 'provider-tile__wrapper'-})`+})<StyledTileWrapperProps>`display: flex;flex-direction: column;align-items: center;@@ -72,28 +77,57 @@ const StyledUserName = styled.div`text-overflow: ellipsis;`;-const LoginButton = ({onClick}) => (+interface OnClickProps {+ onClick?: React.MouseEventHandler<HTMLDivElement>;+}++const LoginButton = ({onClick}: OnClickProps) => (<Button className="login-button" link small onClick={onClick}><Login />Login</Button>);-const LogoutButton = ({onClick}) => (+const LogoutButton = ({onClick}: OnClickProps) => (<Button className="logout-button" link small onClick={onClick}><Logout />Logout</Button>);-const ActionButton = ({isConnected, actionName = null, isReady}) =>+interface ActionButtonProps {+ isConnected?: boolean;+ actionName?: ReactNode | null;+ isReady?: boolean;+}++const ActionButton = ({isConnected, actionName = null, isReady}: ActionButtonProps) =>isConnected && actionName ? (<Button className="cloud-tile__action" small secondary disabled={!isReady}>{isReady ? actionName : <LoadingSpinner size={12} />}</Button>) : null;-const CloudTile = ({+interface CloudTileProps {+ onSelect?: React.MouseEventHandler<HTMLDivElement>;+ // default to login+ onConnect?: React.MouseEventHandler<HTMLDivElement> | null;+ // default to logout+ onLogout?: React.MouseEventHandler<HTMLDivElement> | null;+ // action name+ actionName?: ReactNode | null;+ // cloud provider class+ cloudProvider: Provider;+ // function to take after login or logout+ onSetCloudProvider;+ // whether provider is selected as currentProvider+ isSelected?: boolean;+ // whether user has logged in+ isConnected?: boolean;+ isReady?: boolean;+}++const CloudTile: React.FC<CloudTileProps> = ({// action when click on the tileonSelect,// default to logindiff --git a/src/components/modals/data-table-modal.js b/src/components/modals/data-table-modal.tsxsimilarity index 77%rename from src/components/modals/data-table-modal.jsrename to src/components/modals/data-table-modal.tsxindex 1aee58282..1eca6b3ee 100644--- a/src/components/modals/data-table-modal.js+++ b/src/components/modals/data-table-modal.tsx@@ -25,6 +25,8 @@ import DataTableFactory from 'components/common/data-table';import {createSelector} from 'reselect';import {renderedSize} from 'components/common/data-table/cell-size';import CanvasHack from 'components/common/data-table/canvas';+import {Datasets} from 'reducers';+import KeplerTable from 'utils/table-utils/kepler-table';const dgSettings = {sidePadding: '38px',@@ -43,7 +45,11 @@ const DatasetCatalog = styled.div`padding: ${dgSettings.verticalPadding} ${dgSettings.sidePadding} 0;`;-export const DatasetModalTab = styled.div`+interface DatasetModalTabProps {+ active?: boolean;+}++export const DatasetModalTab = styled.div<DatasetModalTabProps>`align-items: center;border-bottom: 3px solid ${props => (props.active ? 'black' : 'transparent')};cursor: pointer;@@ -58,7 +64,17 @@ export const DatasetModalTab = styled.div`}`;-const DatasetTabsUnmemoized = ({activeDataset, datasets, showDatasetTable}) => (+interface DatasetTabsUnmemoizedProps {+ activeDataset: KeplerTable;+ datasets: Datasets;+ showDatasetTable: (id: string) => void;+}++const DatasetTabsUnmemoized: React.FC<DatasetTabsUnmemoizedProps> = ({+ activeDataset,+ datasets,+ showDatasetTable+}) => (<DatasetCatalog className="dataset-modal-catalog">{Object.values(datasets).map(dataset => (<DatasetModalTab@@ -87,12 +103,23 @@ const TableContainer = styled.div`max-height: 100%;`;-function DataTableModalFactory(DataTable) {- class DataTableModal extends React.Component {+interface DataTableModalProps {+ theme: any;+ dataId?: string;+ sortTableColumn: (id: string, column: string, mode?: string) => void;+ pinTableColumn: (id: string, column: string) => void;+ copyTableColumn: (id: string, column: string) => void;+ datasets: Datasets;+ showDatasetTable: (id: string) => void;+ showTab?: boolean;+}++function DataTableModalFactory(DataTable: ReturnType<typeof DataTableFactory>): React.ComponentType<Omit<DataTableModalProps, "theme">> {+ class DataTableModal extends React.Component<DataTableModalProps> {datasetCellSizeCache = {};- dataId = props => props.dataId;- datasets = props => props.datasets;- fields = props => (props.datasets[props.dataId] || {}).fields;+ dataId = ({dataId = ''}: DataTableModalProps) => dataId;+ datasets = (props: DataTableModalProps) => props.datasets;+ fields = ({datasets, dataId = ''}: DataTableModalProps) => (datasets[dataId] || {}).fields;columns = createSelector(this.fields, fields => fields.map(f => f.name));colMeta = createSelector(this.fields, fields =>fields.reduce(@@ -113,7 +140,7 @@ function DataTableModalFactory(DataTable) {}const {fields, dataContainer} = datasets[dataId];- let showCalculate = null;+ let showCalculate: boolean | null = null;if (!this.datasetCellSizeCache[dataId]) {showCalculate = true;} else if (@@ -152,23 +179,23 @@ function DataTableModalFactory(DataTable) {return cellSizeCache;});- copyTableColumn = column => {- const {dataId, copyTableColumn} = this.props;+ copyTableColumn = (column: string) => {+ const {dataId = '', copyTableColumn} = this.props;copyTableColumn(dataId, column);};- pinTableColumn = column => {- const {dataId, pinTableColumn} = this.props;+ pinTableColumn = (column: string) => {+ const {dataId = '', pinTableColumn} = this.props;pinTableColumn(dataId, column);};- sortTableColumn = (column, mode) => {- const {dataId, sortTableColumn} = this.props;+ sortTableColumn = (column: string, mode?: string) => {+ const {dataId = '', sortTableColumn} = this.props;sortTableColumn(dataId, column, mode);};render() {- const {datasets, dataId, showDatasetTable, showTab} = this.props;+ const {datasets, dataId, showDatasetTable, showTab = true} = this.props;if (!datasets || !dataId) {return null;}@@ -208,9 +235,6 @@ function DataTableModalFactory(DataTable) {);}}- DataTableModal.defaultProps = {- showTab: true- };return withTheme(DataTableModal);}diff --git a/src/components/modals/delete-data-modal.js b/src/components/modals/delete-data-modal.tsxsimilarity index 87%rename from src/components/modals/delete-data-modal.jsrename to src/components/modals/delete-data-modal.tsxindex 970bf81a4..66f3b82d7 100644--- a/src/components/modals/delete-data-modal.js+++ b/src/components/modals/delete-data-modal.tsx@@ -22,12 +22,19 @@ import React from 'react';import styled from 'styled-components';import DatasetLabel from 'components/common/dataset-label';import {FormattedMessage} from 'localization';+import {Layer} from 'layers';+import KeplerTable from 'utils/table-utils/kepler-table';const StyledMsg = styled.div`margin-top: 24px;`;-export const DeleteDatasetModal = ({dataset, layers = []}) => {+export interface DeleteDatasetModalProps {+ dataset: KeplerTable;+ layers: Layer[];+}++export const DeleteDatasetModal: React.FC<DeleteDatasetModalProps> = ({dataset, layers = []}) => {// retrieve only layers related to the current datasetconst currDatasetLayers = layers.filter(layer => layer.config.dataId === (dataset && dataset.id));diff --git a/src/components/modals/error-display.js b/src/components/modals/error-display.tsxsimilarity index 93%rename from src/components/modals/error-display.jsrename to src/components/modals/error-display.tsxindex 7791120c9..7bb5f4e7a 100644--- a/src/components/modals/error-display.js+++ b/src/components/modals/error-display.tsx@@ -23,7 +23,11 @@ import ErrorBoundary from 'components/common/error-boundary';import NotificationItemFactory from 'components/notification-panel/notification-item';const NotificationItem = NotificationItemFactory();-const ErrorDisplay = ({error}) => (+interface ErrorDisplayProps {+ error: string;+}++const ErrorDisplay: React.FC<ErrorDisplayProps> = ({error}) => (<ErrorBoundary><NotificationItemnotification={{diff --git a/src/components/modals/export-data-modal.js b/src/components/modals/export-data-modal.tsxsimilarity index 85%rename from src/components/modals/export-data-modal.jsrename to src/components/modals/export-data-modal.tsxindex 988d6f66f..dbeed73d4 100644--- a/src/components/modals/export-data-modal.js+++ b/src/components/modals/export-data-modal.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';import {EXPORT_DATA_TYPE_OPTIONS} from 'constants/default-settings';import {FileType} from 'components/common/icons';@@ -30,23 +29,19 @@ import {StyledType,CheckMark} from 'components/common/styled-components';-import {injectIntl} from 'react-intl';+import {injectIntl, IntlShape} from 'react-intl';import {FormattedMessage} from 'localization';+import {Datasets} from 'reducers';-const propTypes = {- datasets: PropTypes.object.isRequired,- selectedDataset: PropTypes.string,- dataType: PropTypes.string.isRequired,- filtered: PropTypes.bool.isRequired,- // callbacks- applyCPUFilter: PropTypes.func.isRequired,- onClose: PropTypes.func.isRequired,- onChangeExportSelectedDataset: PropTypes.func.isRequired,- onChangeExportDataType: PropTypes.func.isRequired,- onChangeExportFiltered: PropTypes.func.isRequired-};--const getDataRowCount = (datasets, selectedDataset, filtered, intl) => {+const getDataRowCount = (+ datasets: Datasets,+ selectedDataset: string | undefined,+ filtered: boolean,+ intl: IntlShape+) => {+ if (selectedDataset === undefined) {+ return;+ }const selectedData = datasets[selectedDataset];if (!selectedData) {return intl.formatMessage(@@ -60,29 +55,47 @@ const getDataRowCount = (datasets, selectedDataset, filtered, intl) => {return '-';}- const rowCount = filtered ? filteredIdxCPU.length : dataContainer.numRows();+ const rowCount = filtered ? filteredIdxCPU?.length : dataContainer.numRows();return intl.formatMessage({id: 'modal.exportData.rowCount'},- {rowCount: rowCount.toLocaleString()}+ {rowCount: rowCount?.toLocaleString()});};+export interface ExportDataModalProps {+ datasets: Datasets;+ selectedDataset?: string;+ dataType: string;+ filtered: boolean;+ // callbacks+ applyCPUFilter: (filter: string | string[]) => void;+ onChangeExportSelectedDataset: (dataset: string) => void;+ onChangeExportDataType: (type: string) => void;+ onChangeExportFiltered: (isFiltered: boolean) => void;+ intl: IntlShape;+ supportedDataTypes: {+ id: string;+ label: string;+ available: boolean;+ }[];+}+const ExportDataModalFactory = () => {- class ExportDataModal extends Component {+ class ExportDataModal extends Component<ExportDataModalProps> {componentDidMount() {const toCPUFilter = this.props.selectedDataset || Object.keys(this.props.datasets);this.props.applyCPUFilter(toCPUFilter);}- _onSelectDataset = ({target: {value}}) => {+ _onSelectDataset: React.ChangeEventHandler<HTMLSelectElement> = ({target: {value}}) => {this.props.applyCPUFilter(value);this.props.onChangeExportSelectedDataset(value);};render() {const {- supportedDataTypes,+ supportedDataTypes = EXPORT_DATA_TYPE_OPTIONS,datasets,selectedDataset,dataType,@@ -130,7 +143,6 @@ const ExportDataModalFactory = () => {<StyledTypekey={op.id}selected={dataType === op.id}- available={op.available}onClick={() => op.available && onChangeExportDataType(op.id)}><FileType ext={op.label} height="80px" fontSize="11px" />@@ -182,10 +194,6 @@ const ExportDataModalFactory = () => {);}}- ExportDataModal.propTypes = propTypes;- ExportDataModal.defaultProps = {- supportedDataTypes: EXPORT_DATA_TYPE_OPTIONS- };return injectIntl(ExportDataModal);};diff --git a/src/components/modals/export-image-modal.d.ts b/src/components/modals/export-image-modal.d.tsdeleted file mode 100644index 9ff387b75..000000000--- a/src/components/modals/export-image-modal.d.ts+++ /dev/null@@ -1,21 +0,0 @@-import {FunctionComponent} from 'react';-import {SetExportImageSettingUpdaterAction} from '../../actions';-import {ExportImage} from 'reducers';-import {IntlShape} from 'react-intl';--export type ExportImageModalProps = {- exportImage: ExportImage;- mapW: number;- mapH: number;- onUpdateImageSetting: (payload: SetExportImageSettingUpdaterAction.payload) => void;- cleanupExportImage: () => void;-};--type IntlProps = {- intl: IntlShape;-};--export const ExportImageModal: FunctionComponent<ExportImageModalProps & IntlProps>;-function ExportImageModalFactory(): FunctionComponent<ExportImageModalProps>;--export default ExportImageModalFactory;diff --git a/src/components/modals/export-image-modal.js b/src/components/modals/export-image-modal.tsxsimilarity index 91%rename from src/components/modals/export-image-modal.jsrename to src/components/modals/export-image-modal.tsxindex 3a3d73f90..1fd801ca0 100644--- a/src/components/modals/export-image-modal.js+++ b/src/components/modals/export-image-modal.tsx@@ -21,13 +21,15 @@import React, {useEffect} from 'react';import styled from 'styled-components';import ImagePreview from 'components/common/image-preview';+import {SetExportImageSettingUpdaterAction} from '../../actions';import {EXPORT_IMG_RATIO_OPTIONS, EXPORT_IMG_RESOLUTION_OPTIONS} from 'constants/default-settings';import {StyledModalContent, SelectionButton, CheckMark} from 'components/common/styled-components';import Switch from 'components/common/switch';-import {injectIntl} from 'react-intl';+import {injectIntl, IntlShape} from 'react-intl';import {FormattedMessage} from 'localization';+import {ExportImage} from 'reducers';const ImageOptionList = styled.div`display: flex;@@ -53,9 +55,18 @@ const ImageOptionList = styled.div`}`;+export interface ExportImageModalProps {+ exportImage: ExportImage;+ mapW: number;+ mapH: number;+ onUpdateImageSetting: (payload: SetExportImageSettingUpdaterAction['payload']) => void;+ cleanupExportImage: () => void;+ intl: IntlShape;+}+const ExportImageModalFactory = () => {/** @type {typeof import('./export-image-modal').ExportImageModal} */- const ExportImageModal = ({+ const ExportImageModal: React.FC<ExportImageModalProps> = ({mapW,mapH,exportImage,diff --git a/src/components/modals/export-map-modal/components.js b/src/components/modals/export-map-modal/components.tsxsimilarity index 100%rename from src/components/modals/export-map-modal/components.jsrename to src/components/modals/export-map-modal/components.tsxdiff --git a/src/components/modals/export-map-modal/export-html-map.d.ts b/src/components/modals/export-map-modal/export-html-map.d.tsdeleted file mode 100644index 504e182b1..000000000--- a/src/components/modals/export-map-modal/export-html-map.d.ts+++ /dev/null@@ -1,21 +0,0 @@-import React from 'react';-import {setUserMapboxAccessToken, setExportHTMLMapMode} from '../../actions';-import {IntlShape} from 'react-intl';--export type ExportHtmlMapProps = {- onChangeExportMapHTMLMode: typeof setExportHTMLMapMode;- onEditUserMapboxAccessToken: typeof setUserMapboxAccessToken;- options: {- userMapboxToken?: string;- mode?: string;- };-};--type IntlProps = {- intl: IntlShape;-};--export const ExportHtmlMap: React.FunctionComponent<ExportHtmlMapProps & IntlProps>;-function ExportHtmlMapFactory(): React.FunctionComponent<ExportHtmlMapProps>;--export default ExportHtmlMapFactory;diff --git a/src/components/modals/export-map-modal/export-html-map.js b/src/components/modals/export-map-modal/export-html-map.tsxsimilarity index 88%rename from src/components/modals/export-map-modal/export-html-map.jsrename to src/components/modals/export-map-modal/export-html-map.tsxindex 0ac200643..a50e0c42a 100644--- a/src/components/modals/export-map-modal/export-html-map.js+++ b/src/components/modals/export-map-modal/export-html-map.tsx@@ -26,6 +26,9 @@ import {EXPORT_HTML_MAP_DOC, EXPORT_HTML_MAP_MODES_DOC} from 'constants/user-guiimport styled from 'styled-components';import {injectIntl} from 'react-intl';import {FormattedMessage} from 'localization';+import {IntlShape} from 'react-intl';++import {setUserMapboxAccessToken, setExportHTMLMapMode, ActionHandler} from 'actions';const ExportMapStyledExportSection = styled(StyledExportSection)`.disclaimer {@@ -35,7 +38,11 @@ const ExportMapStyledExportSection = styled(StyledExportSection)`}`;-const StyledInput = styled.input`+interface StyledInputProps {+ error?: boolean;+}++const StyledInput = styled.input<StyledInputProps>`width: 100%;padding: ${props => props.theme.inputPadding};color: ${props => (props.error ? 'red' : props.theme.titleColorLT)};@@ -60,9 +67,22 @@ const BigStyledTile = styled(StyledType)`}`;-function ExportHtmlMapFactory() {+type ExportHtmlMapProps = {+ onChangeExportMapHTMLMode: ActionHandler<typeof setExportHTMLMapMode>;+ onEditUserMapboxAccessToken: ActionHandler<typeof setUserMapboxAccessToken>;+ options: {+ userMapboxToken?: string;+ mode?: string;+ };+};++type IntlProps = {+ intl: IntlShape;+};++function ExportHtmlMapFactory(): React.ComponentType<ExportHtmlMapProps> {/** @type {typeof import('./export-html-map').ExportHtmlMap} */- const ExportHtmlMap = ({+ const ExportHtmlMap: React.FC<ExportHtmlMapProps & IntlProps> = ({onChangeExportMapHTMLMode = mode => {},onEditUserMapboxAccessToken = token => {},options = {},@@ -119,7 +139,6 @@ function ExportHtmlMapFactory() {<BigStyledTilekey={mode.id}selected={options.mode === mode.id}- available={mode.available}onClick={() => mode.available && onChangeExportMapHTMLMode(mode.id)}><img src={mode.url} alt="" />diff --git a/src/components/modals/export-map-modal/export-json-map.js b/src/components/modals/export-map-modal/export-json-map.tsxsimilarity index 90%rename from src/components/modals/export-map-modal/export-json-map.jsrename to src/components/modals/export-map-modal/export-json-map.tsxindex f2287a836..7cb5764d7 100644--- a/src/components/modals/export-map-modal/export-json-map.js+++ b/src/components/modals/export-map-modal/export-json-map.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React, {useState} from 'react';-import PropTypes from 'prop-types';import JSONPretty from 'react-json-pretty';import {ADD_DATA_TO_MAP_DOC} from 'constants/user-guides';import styled from 'styled-components';@@ -62,11 +61,11 @@ const StyledJsonExportSection = styled(StyledExportSection)`}`;-const exportJsonPropTypes = {- options: PropTypes.object+type ExportJsonPropTypes = {+ config: any;};-const ExportJsonMapUnmemoized = ({config = {}}) => {+const ExportJsonMapUnmemoized = ({config = {}}: ExportJsonPropTypes) => {const [copied, setCopy] = useState(false);return (<div>@@ -89,11 +88,7 @@ const ExportJsonMapUnmemoized = ({config = {}}) => {<div className="selection"><div className="viewer"><JSONPretty id="json-pretty" json={config} />- <CopyToClipboard- className="copy-button"- text={JSON.stringify(config)}- onCopy={() => setCopy(true)}- >+ <CopyToClipboard text={JSON.stringify(config)} onCopy={() => setCopy(true)}><Button width="80px">{copied ? 'Copied!' : 'Copy'}</Button></CopyToClipboard></div>@@ -108,8 +103,6 @@ const ExportJsonMapUnmemoized = ({config = {}}) => {);};-ExportJsonMapUnmemoized.propTypes = exportJsonPropTypes;-ExportJsonMapUnmemoized.displayName = 'ExportJsonMap';const ExportJsonMap = React.memo(ExportJsonMapUnmemoized);diff --git a/src/components/modals/export-map-modal/export-map-modal.js b/src/components/modals/export-map-modal/export-map-modal.tsxsimilarity index 81%rename from src/components/modals/export-map-modal/export-map-modal.jsrename to src/components/modals/export-map-modal/export-map-modal.tsxindex 4c992ba96..c8a863d1a 100644--- a/src/components/modals/export-map-modal/export-map-modal.js+++ b/src/components/modals/export-map-modal/export-map-modal.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React from 'react';-import PropTypes from 'prop-types';import {FileType} from 'components/common/icons';import {StyledModalContent, StyledType, CheckMark} from 'components/common/styled-components';@@ -28,30 +27,34 @@ import {StyledExportMapSection} from './components';import ExportHtmlMapFactory from './export-html-map';import ExportJsonMapFactory from './export-json-map';import {FormattedMessage} from 'localization';+import {ActionHandler, setExportHTMLMapMode, setUserMapboxAccessToken} from 'actions';-const propTypes = {- options: PropTypes.object,- onEditUserMapboxAccessToken: PropTypes.func.isRequired,- onChangeExportData: PropTypes.func,- onChangeExportMapType: PropTypes.func,- mapFormat: PropTypes.string-};+interface ExportMapModalFactoryProps {+ options?: {format: string};+ config: any;+ onEditUserMapboxAccessToken: ActionHandler<typeof setUserMapboxAccessToken>;+ onChangeExportMapHTMLMode?: ActionHandler<typeof setExportHTMLMapMode>;+ onChangeExportMapFormat?: (format: string) => any;+ mapFormat?: string;+}const style = {width: '100%'};-const NO_OP = () => {};+const NO_OP = (...args: any[]) => ({} as any);ExportMapModalFactory.deps = [ExportHtmlMapFactory, ExportJsonMapFactory];-function ExportMapModalFactory(ExportHtmlMap, ExportJsonMap) {+function ExportMapModalFactory(+ ExportHtmlMap: ReturnType<typeof ExportHtmlMapFactory>,+ ExportJsonMap: ReturnType<typeof ExportJsonMapFactory>+) {const ExportMapModalUnmemoized = ({config = {},- onChangeExportData = NO_OP,- onChangeExportMapFormat = format => {},+ onChangeExportMapFormat = NO_OP,onChangeExportMapHTMLMode = NO_OP,onEditUserMapboxAccessToken = NO_OP,options = {format: ''}- }) => (+ }: ExportMapModalFactoryProps) => (<StyledModalContent className="export-map-modal"><div style={style}><StyledExportMapSection>@@ -68,7 +71,6 @@ function ExportMapModalFactory(ExportHtmlMap, ExportJsonMap) {<StyledTypekey={op.id}selected={options.format === op.id}- available={op.available}onClick={() => op.available && onChangeExportMapFormat(op.id)}><FileType ext={op.label} height="80px" fontSize="11px" />@@ -87,13 +89,7 @@ function ExportMapModalFactory(ExportHtmlMap, ExportJsonMap) {options={options[options.format]}/>),- [EXPORT_MAP_FORMATS.JSON]: (- <ExportJsonMap- config={config}- onChangeExportData={onChangeExportData}- options={options[options.format]}- />- )+ [EXPORT_MAP_FORMATS.JSON]: <ExportJsonMap config={config} />}[// @ts-ignoreoptions.format@@ -103,7 +99,6 @@ function ExportMapModalFactory(ExportHtmlMap, ExportJsonMap) {</StyledModalContent>);- ExportMapModalUnmemoized.propTypes = propTypes;ExportMapModalUnmemoized.displayName = 'ExportMapModal';const ExportMapModal = React.memo(ExportMapModalUnmemoized);diff --git a/src/components/modals/image-modal-container.d.ts b/src/components/modals/image-modal-container.d.tsdeleted file mode 100644index e8257808f..000000000--- a/src/components/modals/image-modal-container.d.ts+++ /dev/null@@ -1,13 +0,0 @@-import React from 'react';-import {SetExportImageSettingUpdaterAction} from '../../actions';-import {Provider} from '../../cloud-providers';--export type ImageModalContainerProps = {- cloudProviders?: Provider[];- currentProvider?: string;- onUpdateImageSetting: (newSetting: SetExportImageSettingUpdaterAction['payload']) => void;- cleanupExportImage: () => void;-};--export const ImageModalContainer: React.FunctionComponent<ImageModalContainerProps>;-export default ImageModalContainer;diff --git a/src/components/modals/image-modal-container.js b/src/components/modals/image-modal-container.tsxsimilarity index 87%rename from src/components/modals/image-modal-container.jsrename to src/components/modals/image-modal-container.tsxindex 4a2f555ba..1115e15e8 100644--- a/src/components/modals/image-modal-container.js+++ b/src/components/modals/image-modal-container.tsx@@ -22,15 +22,24 @@ import React, {useEffect} from 'react';import get from 'lodash.get';import {MAP_THUMBNAIL_DIMENSION, EXPORT_IMG_RATIOS} from 'constants/default-settings';+import {SetExportImageSettingUpdaterAction} from 'actions';+import {Provider} from 'cloud-providers';/** @typedef {import('./image-modal-container').ImageModalContainerProps} ImageModalContainerProps */+export type ImageModalContainerProps = {+ cloudProviders?: Provider[];+ currentProvider?: string | null;+ onUpdateImageSetting: (newSetting: SetExportImageSettingUpdaterAction['payload']) => void;+ cleanupExportImage: () => void;+};+/*** A wrapper component in modals contain a image preview of the map with cloud providers* It sets export image size based on provider thumbnail size* @type {React.FunctionComponent<ImageModalContainerProps>}*/-const ImageModalContainer = ({+const ImageModalContainer: React.FC<ImageModalContainerProps> = ({onUpdateImageSetting,cleanupExportImage,cloudProviders,diff --git a/src/components/modals/load-data-modal.d.ts b/src/components/modals/load-data-modal.d.tsdeleted file mode 100644index ba3e1f3c5..000000000--- a/src/components/modals/load-data-modal.d.ts+++ /dev/null@@ -1,30 +0,0 @@-import React from 'react';-import {FileLoading} from '../../reducers/vis-state-updaters';--export type LoadDataModalProps = {- // call backs- onFileUpload: (files: File[]) => void;- onLoadCloudMap: (provider: any, vis: any) => void;- fileLoading: FileLoading | false,- loadingMethods: {- id: string;- label: string;- elementType: React.Component;- tabElementType?: React.Component;- }[];- /** A list of names of supported formats suitable to present to user */- fileFormatNames: string[];- /** A list of typically 3 letter extensions (without '.') for file matching */- fileExtensions: string[];- isCloudMapLoading: boolean;- /** Set to true if app wants to do its own file filtering */- disableExtensionFilter?: boolean;-};--export function LoadDataModalFactory(- ModalTabs: React.Component,- FileUpload: React.Component,- LoadStorageMap: React.Component-): React.ComponentType<LoadDataModalProps>;--export default LoadDataModalFactory;diff --git a/src/components/modals/load-data-modal.js b/src/components/modals/load-data-modal.tsxsimilarity index 73%rename from src/components/modals/load-data-modal.jsrename to src/components/modals/load-data-modal.tsxindex eb642d441..fcc438878 100644--- a/src/components/modals/load-data-modal.js+++ b/src/components/modals/load-data-modal.tsx@@ -21,7 +21,7 @@import React, {useState} from 'react';import styled from 'styled-components';import get from 'lodash.get';-import {useIntl} from 'react-intl';+import {IntlShape, useIntl} from 'react-intl';import FileUploadFactory from 'components/common/file-uploader/file-upload';import LoadStorageMapFactory from './load-storage-map';@@ -29,6 +29,7 @@ import ModalTabsFactory from './modal-tabs';import LoadingDialog from './loading-dialog';import {LOADING_METHODS} from 'constants/default-settings';+import {FileLoading} from 'reducers/vis-state-updaters';/** @typedef {import('./load-data-modal').LoadDataModalProps} LoadDataModalProps */@@ -43,12 +44,37 @@ const StyledLoadDataModal = styled.div.attrs({const noop = () => {};const getDefaultMethod = methods => (Array.isArray(methods) ? get(methods, [0]) : null);+export interface LoadingMethod {+ id: string;+ label: string;+ elementType: React.ComponentType<any>;+ tabElementType?: React.ComponentType<{onClick: React.MouseEventHandler; intl: IntlShape}>;+}++type LoadDataModalProps = {+ // call backs+ onFileUpload: (files: File[]) => void;+ onLoadCloudMap: (provider: any, vis: any) => void;+ fileLoading: FileLoading | false;+ loadingMethods: LoadingMethod[];+ /** A list of names of supported formats suitable to present to user */+ fileFormatNames: string[];+ /** A list of typically 3 letter extensions (without '.') for file matching */+ fileExtensions: string[];+ isCloudMapLoading: boolean;+ /** Set to true if app wants to do its own file filtering */+ disableExtensionFilter?: boolean;+};LoadDataModalFactory.deps = [ModalTabsFactory, FileUploadFactory, LoadStorageMapFactory];-export function LoadDataModalFactory(ModalTabs, FileUpload, LoadStorageMap) {+export function LoadDataModalFactory(+ ModalTabs: ReturnType<typeof ModalTabsFactory>,+ FileUpload: ReturnType<typeof FileUploadFactory>,+ LoadStorageMap: ReturnType<typeof LoadStorageMapFactory>+) {/** @type {React.FunctionComponent<LoadDataModalProps>} */- const LoadDataModal = props => {+ const LoadDataModal: React.FC<LoadDataModalProps> = props => {const intl = useIntl();const {loadingMethods, isCloudMapLoading} = props;const [currentMethod, toggleMethod] = useState(getDefaultMethod(loadingMethods));diff --git a/src/components/modals/load-storage-map.js b/src/components/modals/load-storage-map.tsxsimilarity index 88%rename from src/components/modals/load-storage-map.jsrename to src/components/modals/load-storage-map.tsxindex fc3084b97..8be4127d2 100644--- a/src/components/modals/load-storage-map.js+++ b/src/components/modals/load-storage-map.tsx@@ -28,6 +28,7 @@ import CloudTile from './cloud-tile';import {Base, ArrowLeft} from 'components/common/icons';import ProviderModalContainer from './provider-modal-container';import {FormattedMessage} from 'localization';+import {MapListItem, Provider} from 'cloud-providers';const StyledProviderSection = styled.div.attrs({className: 'provider-selection'@@ -179,7 +180,9 @@ const StyledVisualizationItem = styled.div`}`;-const MapIcon = props => {+type MapIconPorps = React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>;++const MapIcon: React.FC<MapIconPorps> = props => {return (<div {...props}>{props.children}@@ -193,11 +196,24 @@ const MapIcon = props => {);};-const PrivacyBadge = ({privateMap}) => (+interface PrivacyBadgeProps {+ privateMap?: boolean;+}++const PrivacyBadge: React.FC<PrivacyBadgeProps> = ({privateMap}) => (<span className="vis_item-privacy">{privateMap ? 'Private' : 'Public'}</span>);-const VisualizationItem = ({vis, onClick}) => {+interface Visualization extends MapListItem {+ thumbnail?: Blob;+}++interface VisualizationItemProps {+ onClick?: React.MouseEventHandler<HTMLDivElement>;+ vis: Visualization;+}++const VisualizationItem: React.FC<VisualizationItemProps> = ({vis, onClick}) => {return (<StyledVisualizationItem onClick={onClick}>{vis.thumbnail ? (@@ -220,7 +236,14 @@ const VisualizationItem = ({vis, onClick}) => {);};-export const ProviderSelect = ({+interface ProviderSelectProps {+ cloudProviders: Provider[];+ onSelect: (name: string) => void;+ onSetCloudProvider: () => void;+ currentProvider?: string;+}++export const ProviderSelect: React.FC<ProviderSelectProps> = ({cloudProviders = [],onSelect,onSetCloudProvider,@@ -243,8 +266,18 @@ export const ProviderSelect = ({<p>No storage provider available</p>);-function LoadStorageMapFactory() {- class LoadStorageMap extends Component {+interface LoadStorageMapProps {+ cloudProviders: Provider[];+ onSetCloudProvider;+ currentProvider?: string;+ getSavedMaps: (provider?: Provider) => void;+ onLoadCloudMap: ({loadParams: any, provider: Provider}) => void;+ visualizations: Visualization[];+ isProviderLoading?: boolean;+}++function LoadStorageMapFactory(): React.ComponentType<LoadStorageMapProps> {+ class LoadStorageMap extends Component<LoadStorageMapProps> {state = {showProviderSelect: true};@@ -272,7 +305,7 @@ function LoadStorageMapFactory() {}}- _onLoadCloudMap(provider, vis) {+ _onLoadCloudMap(provider: Provider | undefined, vis: Visualization) {this.props.onLoadCloudMap({loadParams: vis.loadParams,provider@@ -330,10 +363,10 @@ function LoadStorageMapFactory() {<FormattedMessage id={'modal.loadStorageMap.back'} /></Button></StyledBackBtn>- {provider.getManagementUrl && (+ {provider?.getManagementUrl && (<akey={1}- href={provider.getManagementUrl()}+ href={provider?.getManagementUrl()}target="_blank"rel="noopener noreferrer"style={{textDecoration: 'underline'}}diff --git a/src/components/modals/loading-dialog.js b/src/components/modals/loading-dialog.tsxsimilarity index 91%rename from src/components/modals/loading-dialog.jsrename to src/components/modals/loading-dialog.tsxindex da0ceb31a..18d8c3ba4 100644--- a/src/components/modals/loading-dialog.js+++ b/src/components/modals/loading-dialog.tsx@@ -53,7 +53,15 @@ const StyledLoadingDialog = styled.div.attrs({}`;-const LoadingDialog = ({size = 64, message = 'modal.loadingDialog.loading'}) => (+interface LoadingDialogProps {+ size?: number;+ message?: string;+}++const LoadingDialog: React.FC<LoadingDialogProps> = ({+ size = 64,+ message = 'modal.loadingDialog.loading'+}) => (<StyledLoadingDialog><div className="loading-content"><StyledSpinner>diff --git a/src/components/modals/modal-dialog.js b/src/components/modals/modal-dialog.tsxsimilarity index 100%rename from src/components/modals/modal-dialog.jsrename to src/components/modals/modal-dialog.tsxdiff --git a/src/components/modals/modal-tabs.js b/src/components/modals/modal-tabs.tsxsimilarity index 92%rename from src/components/modals/modal-tabs.jsrename to src/components/modals/modal-tabs.tsxindex 3203afc60..bafe3f4fe 100644--- a/src/components/modals/modal-tabs.js+++ b/src/components/modals/modal-tabs.tsx@@ -24,6 +24,7 @@ import styled from 'styled-components';import PropTypes from 'prop-types';import {media} from 'styles';import {FormattedMessage, useIntl} from 'react-intl';+import {LoadingMethod} from './load-data-modal';const ModalTab = styled.div`align-items: flex-end;@@ -74,7 +75,17 @@ const StyledLoadDataModalTabItem = styled.div`const noop = () => {};-export const ModalTabItem = ({currentMethod, method, toggleMethod}) => {+interface ModalTabItemProps {+ currentMethod?: string;+ method: LoadingMethod;+ toggleMethod: (method: LoadingMethod) => void;+}++export const ModalTabItem: React.FC<ModalTabItemProps> = ({+ currentMethod,+ method,+ toggleMethod+}) => {const onClick = useCallback(() => toggleMethod(method), [method, toggleMethod]);const intl = useIntl();diff --git a/src/components/modals/overwrite-map-modal.d.ts b/src/components/modals/overwrite-map-modal.d.tsdeleted file mode 100644index e7c139de0..000000000--- a/src/components/modals/overwrite-map-modal.d.ts+++ /dev/null@@ -1,18 +0,0 @@-import React from 'react';-import {Provider} from '../../cloud-providers';-import {ImageModalContainerProps} from './image-modal-container';--export type OverwriteMapModalProps = {- mapSaved: string;- title: string;- cloudProviders: Provider[];- isProviderLoading: boolean;- currentProvider: string;-- // callbacks- onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];- cleanupExportImage: onUpdateImageSetting['cleanupExportImage'];-};--function OverwriteMapModalFactory(): React.FunctionComponent<OverwriteMapModal>;-export default OverwriteMapModalFactory;diff --git a/src/components/modals/overwrite-map-modal.js b/src/components/modals/overwrite-map-modal.tsxsimilarity index 86%rename from src/components/modals/overwrite-map-modal.jsrename to src/components/modals/overwrite-map-modal.tsxindex 40fb151e2..7f20642d9 100644--- a/src/components/modals/overwrite-map-modal.js+++ b/src/components/modals/overwrite-map-modal.tsx@@ -24,6 +24,10 @@ import {CenterVerticalFlexbox} from 'components/common/styled-components';import {UploadAnimation} from './status-panel';import ImageModalContainer from './image-modal-container';import {FormattedMessage} from 'localization';+import {Provider} from 'cloud-providers';++import {ImageModalContainerProps} from './image-modal-container';+import {cleanupExportImage} from 'actions';/** @typedef {import('./overwrite-map-modal').OverwriteMapModalProps} OverwriteMapModalProps */@@ -46,11 +50,23 @@ const StyledOverwriteMapModal = styled(CenterVerticalFlexbox)`min-height: 220px;`;+type OverwriteMapModalProps = {+ mapSaved: string | null;+ title: string;+ cloudProviders: Provider[];+ isProviderLoading: boolean;+ currentProvider: string | null;++ // callbacks+ onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];+ cleanupExportImage: typeof cleanupExportImage;+};+const OverwriteMapModalFactory = () => {/*** @type {React.FunctionComponent<OverwriteMapModalProps>}*/- const OverwriteMapModal = ({+ const OverwriteMapModal: React.FC<OverwriteMapModalProps> = ({mapSaved,title,currentProvider,diff --git a/src/components/modals/provider-modal-container.d.ts b/src/components/modals/provider-modal-container.d.tsdeleted file mode 100644index 16aaac0c9..000000000--- a/src/components/modals/provider-modal-container.d.ts+++ /dev/null@@ -1,12 +0,0 @@-import React from 'react';-import {SetCloudProviderPayload} from '../../actions';-import {Provider} from '../../cloud-providers';--export type ProviderModalContainerProps = {- cloudProviders?: Provider[];- currentProvider?: string;- onSetCloudProvider: (provider: SetCloudProviderPayload) => void;-};--export const ProviderModalContainer: React.FunctionComponent<ProviderModalContainerProps>;-export default ProviderModalContainer;diff --git a/src/components/modals/provider-modal-container.js b/src/components/modals/provider-modal-container.tsxsimilarity index 80%rename from src/components/modals/provider-modal-container.jsrename to src/components/modals/provider-modal-container.tsxindex de58b59b1..bbfcbf016 100644--- a/src/components/modals/provider-modal-container.js+++ b/src/components/modals/provider-modal-container.tsx@@ -19,20 +19,21 @@// THE SOFTWARE.import React, {Component} from 'react';-import PropTypes from 'prop-types';+import {Provider} from 'cloud-providers';+import {SetCloudProviderPayload} from 'actions';++export type ProviderModalContainerProps = {+ cloudProviders?: Provider[];+ currentProvider?: string | null;+ onSetCloudProvider: (provider: SetCloudProviderPayload) => void;+};/*** A wrapper component in modals contain cloud providers.* It set default provider by checking which provider has logged in* @component*/-export default class ProviderModalContainer extends Component {- static propTypes = {- onSetCloudProvider: PropTypes.func.isRequired,- cloudProviders: PropTypes.arrayOf(PropTypes.object),- currentProvider: PropTypes.string- };-+export default class ProviderModalContainer extends Component<ProviderModalContainerProps> {static defaultProps = {cloudProviders: [],currentProvider: null@@ -43,8 +44,8 @@ export default class ProviderModalContainer extends Component {}_setDefaultProvider() {- if (!this.props.currentProvider && this.props.cloudProviders.length) {- const connected = this.props.cloudProviders.find(+ if (!this.props.currentProvider && this.props.cloudProviders?.length) {+ const connected = this.props.cloudProviders?.find(p => typeof p.getAccessToken === 'function' && p.getAccessToken());diff --git a/src/components/modals/save-map-modal.d.ts b/src/components/modals/save-map-modal.d.tsdeleted file mode 100644index f84c78406..000000000--- a/src/components/modals/save-map-modal.d.ts+++ /dev/null@@ -1,32 +0,0 @@-import React from 'react';-import {Provider} from '../../cloud-providers';-import {MapInfo, ExportImage} from 'reducers';-import {- setMapInfo-} from '../../actions';-import {ImageModalContainerProps} from './image-modal-container';-import {ProviderModalContainerProps} from './provider-modal-container';--type CharacterLimits = {- title: number;- description: number;-};--export type SaveMapModalProps = {- mapInfo: MapInfo;- exportImage: ExportImage;- cloudProviders: Provider[];- isProviderLoading: boolean;- currentProvider?: string;- providerError?: any;- characterLimits?: CharacterLimits;-- // callbacks- onSetCloudProvider: ProviderModalContainerProps['onSetCloudProvider'];- onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];- cleanupExportImage: onUpdateImageSetting['cleanupExportImage'];- onSetMapInfo: typeof setMapInfo;-};--function LoadDataModalFactory(): React.FunctionComponent<SaveMapModalProps>;-export default LoadDataModalFactory;diff --git a/src/components/modals/save-map-modal.js b/src/components/modals/save-map-modal.tsxsimilarity index 82%rename from src/components/modals/save-map-modal.jsrename to src/components/modals/save-map-modal.tsxindex 14b1bed7c..2a1bd195b 100644--- a/src/components/modals/save-map-modal.js+++ b/src/components/modals/save-map-modal.tsx@@ -21,8 +21,8 @@import React from 'react';import styled from 'styled-components';import CloudTile from './cloud-tile';-import ImageModalContainer from './image-modal-container';-import ProviderModalContainer from './provider-modal-container';+import ImageModalContainer, {ImageModalContainerProps} from './image-modal-container';+import ProviderModalContainer, {ProviderModalContainerProps} from './provider-modal-container';import StatusPanel, {UploadAnimation} from './status-panel';import {MAP_THUMBNAIL_DIMENSION, MAP_INFO_CHARACTER} from 'constants/default-settings';@@ -37,6 +37,9 @@ import {} from 'components/common/styled-components';import ImagePreview from 'components/common/image-preview';import {FormattedMessage} from 'localization';+import {ExportImage, MapInfo} from 'reducers';+import {Provider} from 'cloud-providers';+import {setMapInfo, cleanupExportImage} from 'actions';/** @typedef {import('./save-map-modal').SaveMapModalProps} SaveMapModalProps */@@ -73,7 +76,35 @@ const StyledSaveMapModal = styled.div.attrs({const nop = _ => {};-export const MapInfoPanel = ({+type CharacterLimits = {+ title?: number;+ description?: number;+};++type SaveMapModalProps = {+ mapInfo: MapInfo;+ exportImage: ExportImage;+ cloudProviders: Provider[];+ isProviderLoading: boolean;+ currentProvider?: string;+ providerError?: any;+ characterLimits?: CharacterLimits;++ // callbacks+ onSetCloudProvider: ProviderModalContainerProps['onSetCloudProvider'];+ onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];+ cleanupExportImage: typeof cleanupExportImage;+ onSetMapInfo: typeof setMapInfo;+};++type MapInfoPanelProps = Pick<SaveMapModalProps, 'mapInfo' | 'characterLimits'> & {+ onChangeInput: (+ type: string,+ event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>+ ) => void;+};++export const MapInfoPanel: React.FC<MapInfoPanelProps> = ({mapInfo = {description: '', title: ''},characterLimits,onChangeInput@@ -98,7 +129,7 @@ export const MapInfoPanel = ({</div><div><TextAreaLight- rows="3"+ rows={3}id="map-description"style={{resize: 'none'}}value={mapInfo.description}@@ -107,13 +138,12 @@ export const MapInfoPanel = ({/></div><StyledModalInputFootnote- className="save-map-modal-description__footnote"error={- characterLimits.description && mapInfo.description.length > characterLimits.description+ Boolean(characterLimits?.description) && mapInfo.description.length > Number(characterLimits?.description)}>- {mapInfo.description.length}/{characterLimits.description || MAP_INFO_CHARACTER.description}{' '}- characters+ {mapInfo.description.length}/+ {characterLimits?.description || MAP_INFO_CHARACTER.description} characters</StyledModalInputFootnote></StyledModalSection></div>@@ -123,7 +153,7 @@ function SaveMapModalFactory() {/*** @type {React.FunctionComponent<SaveMapModalProps>}*/- const SaveMapModal = ({+ const SaveMapModal: React.FC<SaveMapModalProps> = ({mapInfo,exportImage,characterLimits = {},@@ -136,7 +166,10 @@ function SaveMapModalFactory() {cleanupExportImage,onSetMapInfo}) => {- const onChangeInput = (key, {target: {value}}) => {+ const onChangeInput = (+ key: string,+ {target: {value}}: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>+ ) => {onSetMapInfo({[key]: value});};const provider = currentProvider ? cloudProviders.find(p => p.name === currentProvider) : null;diff --git a/src/components/modals/share-map-modal.js b/src/components/modals/share-map-modal.tsxsimilarity index 85%rename from src/components/modals/share-map-modal.jsrename to src/components/modals/share-map-modal.tsxindex 4b977ca3e..18442b2d3 100644--- a/src/components/modals/share-map-modal.js+++ b/src/components/modals/share-map-modal.tsx@@ -22,7 +22,7 @@ import React, {useState} from 'react';import styled, {ThemeProvider} from 'styled-components';import {CopyToClipboard} from 'react-copy-to-clipboard';import {themeLT} from 'styles/base';-import ImageModalContainer from './image-modal-container';+import ImageModalContainer, {ImageModalContainerProps} from './image-modal-container';import ProviderModalContainer from './provider-modal-container';import {@@ -34,6 +34,8 @@ import {import CloudTile from './cloud-tile';import StatusPanel from './status-panel';import {FormattedMessage} from 'localization';+import {Provider} from 'cloud-providers';+import {cleanupExportImage, SetCloudProviderPayload} from 'actions';export const StyledInputLabel = styled.label`font-size: 12px;@@ -59,13 +61,18 @@ export const StyleSharingUrl = styled.div.attrs({}`;-export const SharingUrl = ({url, message = ''}) => {+interface SharingUrlProps {+ url: string;+ message?: string;+}++export const SharingUrl: React.FC<SharingUrlProps> = ({url, message = ''}) => {const [copied, setCopy] = useState(false);return (<StyleSharingUrl><StyledInputLabel>{message}</StyledInputLabel><div style={{display: 'flex'}}>- <InputLight type="text" value={url} readOnly selected />+ <InputLight type="text" value={url} readOnly /><CopyToClipboard text={url} onCopy={() => setCopy(true)}><Button width="80px">{copied ? 'Copied!' : 'Copy'}</Button></CopyToClipboard>@@ -84,17 +91,30 @@ const StyledInnerDiv = styled.div`min-height: 500px;`;+interface ShareMapUrlModalFactoryProps {+ isProviderLoading?: boolean;+ isReady?: boolean;+ onExport?: (provider: Provider) => void;+ cloudProviders?: Provider[];+ currentProvider: string | null;+ providerError?: string;+ successInfo?: {shareUrl?: string; folderLink?: string};+ onSetCloudProvider?: (provider: SetCloudProviderPayload) => void;+ onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];+ cleanupExportImage: typeof cleanupExportImage;+}+export default function ShareMapUrlModalFactory() {- const ShareMapUrlModal = ({- isProviderLoading,+ const ShareMapUrlModal: React.FC<ShareMapUrlModalFactoryProps> = ({+ isProviderLoading = false,isReady,- onExport,- cloudProviders,- currentProvider,- providerError,- successInfo,- onSetCloudProvider,- onUpdateImageSetting,+ onExport = nop,+ cloudProviders = [],+ currentProvider = null,+ providerError = null,+ successInfo = {},+ onSetCloudProvider = nop,+ onUpdateImageSetting = nop,cleanupExportImage}) => {const {shareUrl, folderLink} = successInfo;@@ -193,16 +213,5 @@ export default function ShareMapUrlModalFactory() {);};- ShareMapUrlModal.defaultProps = {- isProviderLoading: false,- onExport: nop,- cloudProviders: [],- currentProvider: null,- providerError: null,- successInfo: {},- onSetCloudProvider: nop,- onUpdateImageSetting: nop- };-return ShareMapUrlModal;}diff --git a/src/components/modals/status-panel.js b/src/components/modals/status-panel.tsxsimilarity index 85%rename from src/components/modals/status-panel.jsrename to src/components/modals/status-panel.tsxindex fa101d4d5..7d500a4f4 100644--- a/src/components/modals/status-panel.js+++ b/src/components/modals/status-panel.tsx@@ -18,12 +18,13 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import React from 'react';+import React, {ComponentType} from 'react';import styled from 'styled-components';import {MapIcon} from 'components/common/icons';import {StyledExportSection} from 'components/common/styled-components';import ErrorDisplay from './error-display';import {FormattedMessage} from 'localization';+import {IconProps} from 'cloud-providers/provider';const StyledUploader = styled.div`display: flex;@@ -64,7 +65,11 @@ const Line = () => (</StyledSvg>);-export const UploadAnimation = props => (+interface UploadAnimationProps {+ icon?: ComponentType<IconProps> | null;+}++export const UploadAnimation: React.FC<UploadAnimationProps> = props => (<StyledUploader><StyledMapIcon><MapIcon height="48px" />@@ -74,7 +79,13 @@ export const UploadAnimation = props => (</StyledUploader>);-const StatusPanel = ({error, isLoading, providerIcon}) => (+interface StatusPanelProps {+ error?: string | null;+ isLoading?: boolean;+ providerIcon?: ComponentType<IconProps> | null;+}++const StatusPanel: React.FC<StatusPanelProps> = ({error, isLoading, providerIcon}) => (<StyledExportSection><div className="description"><div className="title">diff --git a/src/components/modals/storage-map-viewer.js b/src/components/modals/storage-map-viewer.tsxsimilarity index 86%rename from src/components/modals/storage-map-viewer.jsrename to src/components/modals/storage-map-viewer.tsxindex b0c927882..4a4f7d2f4 100644--- a/src/components/modals/storage-map-viewer.js+++ b/src/components/modals/storage-map-viewer.tsx@@ -19,7 +19,6 @@// THE SOFTWARE.import React from 'react';-import PropTypes from 'prop-types';import styled from 'styled-components';import moment from 'moment';import {LeftArrow} from 'components/common/icons';@@ -27,11 +26,6 @@ import {FormattedMessage} from 'localization';const imageH = 108;-const propTypes = {- onLoadAsset: PropTypes.func.isRequired,- back: PropTypes.func.isRequired-};-const StyledAssetGallery = styled.div.attrs({className: 'storage-asset-gallery'})`@@ -129,9 +123,23 @@ const StyledError = styled.div`margin-bottom: 16px;`;-const getDuration = last => moment.duration(new Date().valueOf() - last).humanize();+const getDuration = (last: number = 0) => moment.duration(new Date().valueOf() - last).humanize();++interface Asset {+ imageUrl?: string;+ label?: string;+ title?: string;+ description?: string;+ lastUpdated?: number;+ id?: string;+}++interface AssetItemProps {+ asset: Asset;+ onClick: React.MouseEventHandler<HTMLDivElement>;+}-const AssetItem = ({asset, onClick}) => (+const AssetItem: React.FC<AssetItemProps> = ({asset, onClick}) => (<StyledAssetItem><div className="asset__image" onClick={onClick}>{asset.imageUrl && <img src={asset.imageUrl} />}@@ -149,9 +157,14 @@ const AssetItem = ({asset, onClick}) => (</StyledAssetItem>);-class StorageAssetsViewer extends React.Component {- static propTypes = propTypes;+interface StorageAssetsViewerProps {+ assets: Asset[];+ onLoadAsset: (asset: Asset) => void;+ back?: React.MouseEventHandler<HTMLDivElement>;+ error?: {message?: string};+}+class StorageAssetsViewer extends React.Component<StorageAssetsViewerProps> {render() {const {assets, onLoadAsset, back, error} = this.props;diff --git a/src/localization/formatted-message.tsx b/src/localization/formatted-message.tsxindex 6fc1bee62..bb3ebe83a 100644--- a/src/localization/formatted-message.tsx+++ b/src/localization/formatted-message.tsx@@ -26,7 +26,7 @@ type EnhancedFormattedMessageProps = {defaultMessage?: string;defaultValue?: string;values?: {- [key: string]: string | number;+ [key: string]: string | number | null;};children?: () => React.ReactElement;};diff --git a/src/reducers/map-style-updaters.ts b/src/reducers/map-style-updaters.tsindex 7511d128c..154283c94 100644--- a/src/reducers/map-style-updaters.ts+++ b/src/reducers/map-style-updaters.ts@@ -77,7 +77,7 @@ export type InputStyle = {error: boolean;isValid: boolean;label: string | null;- style: Object | null;+ style: any | null;url: string | null;icon: string | null;custom: boolean;diff --git a/yarn.lock b/yarn.lockindex 51f376ad6..aa20fd520 100644--- a/yarn.lock+++ b/yarn.lock@@ -3372,9 +3372,9 @@integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="@types/mapbox-gl@*":- version "2.6.3"- resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.6.3.tgz#09e4992bb540fe5e024eebc5fbc315317cb13ffe"- integrity sha512-oF5eQmczkoPQfxfRSwpF9GcrWi3YleptJ67uiCQKps+7aKxwIbww0EHHqIrxvOg49l07+AZBtJU2FPKZm1jKAg==+ version "2.7.0"+ resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.0.tgz#1b33e9116fa185168c772448a4ce531ddb086bca"+ integrity sha512-kNT3iHMZILCb5Kg07TaUnZglCucO9KbVy1/0uPkFs3G9fWyFz22PGlHJtd25+A6KZ2Sjl+ByXq5850jyeZWQBA==dependencies:"@types/geojson" "*"@@ -3444,6 +3444,11 @@version "18.0.0"resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.0.tgz#b13f8d098e4b0c45df4f1ed123833143b0c71141"integrity sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg==++"@types/react-copy-to-clipboard@^5.0.2":+ version "5.0.2"+ resolved "https://registry.yarnpkg.com/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz#c29690b472a54edff35916f0d1c6c797ad0fd34b"+ integrity sha512-O29AThfxrkUFRsZXjfSWR2yaWo0ppB1yLEnHA+Oh24oNetjBAwTDu1PmolIqdJKzsZiO4J1jn6R6TmO96uBvGg==dependencies:"@types/react" "*"