chore: Moves date utils to utils folder

superset-frontend/src/SqlLab/actions/sqlLab.js

@@ -23,7 +23,7 @@ import invert from 'lodash/invert';
 import mapKeys from 'lodash/mapKeys';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 
-import { now } from 'src/modules/dates';
+import { now } from 'src/utils/dates';
 import {
   addDangerToast as addDangerToastAction,
   addInfoToast as addInfoToastAction,

superset-frontend/src/SqlLab/components/QuerySearch/index.tsx

@@ -27,7 +27,7 @@ import {
   epochTimeXHoursAgo,
   epochTimeXDaysAgo,
   epochTimeXYearsAgo,
-} from 'src/modules/dates';
+} from 'src/utils/dates';
 import AsyncSelect from 'src/components/AsyncSelect';
 import { Query } from 'src/SqlLab/types';
 import { STATUS_OPTIONS, TIME_OPTIONS } from 'src/SqlLab/constants';

superset-frontend/src/SqlLab/components/QueryTable/index.tsx

@@ -25,7 +25,7 @@ import { t, useTheme } from '@superset-ui/core';
 import { useSelector } from 'react-redux';
 import TableView from 'src/components/TableView';
 import Button from 'src/components/Button';
-import { fDuration } from 'src/modules/dates';
+import { fDuration } from 'src/utils/dates';
 import Icons from 'src/components/Icons';
 import { Tooltip } from 'src/components/Tooltip';
 import { Query, RootState } from 'src/SqlLab/types';

superset-frontend/src/SqlLab/reducers/sqlLab.js

@@ -20,7 +20,7 @@ import { t } from '@superset-ui/core';
 
 import getInitialState from './getInitialState';
 import * as actions from '../actions/sqlLab';
-import { now } from '../../modules/dates';
+import { now } from '../../utils/dates';
 import {
   addToObject,
   alterInObject,

superset-frontend/src/SqlLab/reducers/sqlLab.test.js

@@ -18,7 +18,7 @@
  */
 import sqlLabReducer from 'src/SqlLab/reducers/sqlLab';
 import * as actions from 'src/SqlLab/actions/sqlLab';
-import { now } from 'src/modules/dates';
+import { now } from 'src/utils/dates';
 import { table, initialState as mockState } from '../fixtures';
 
 const initialState = mockState.sqlLab;

superset-frontend/src/components/Chart/chartReducer.ts

@@ -22,7 +22,7 @@ import { HYDRATE_DASHBOARD } from 'src/dashboard/actions/hydrate';
 import { DatasourcesAction } from 'src/dashboard/actions/datasources';
 import { ChartState } from 'src/explore/types';
 import { getFormDataFromControls } from 'src/explore/controlUtils';
-import { now } from 'src/modules/dates';
+import { now } from 'src/utils/dates';
 import * as actions from './chartAction';
 
 export const chart: ChartState = {

superset-frontend/src/components/Timer/Timer.test.tsx

@@ -22,7 +22,7 @@
 import React from 'react';
 import { render, sleep, waitFor } from 'spec/helpers/testing-library';
 import Timer, { TimerProps } from 'src/components/Timer';
-import { now } from 'src/modules/dates';
+import { now } from 'src/utils/dates';
 
 function parseTime(text?: string | null) {
   return !!text && Number(text.replace(/:/g, ''));

superset-frontend/src/components/Timer/index.tsx

@@ -20,7 +20,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { styled } from '@superset-ui/core';
 import Label, { Type } from 'src/components/Label';
 
-import { now, fDuration } from 'src/modules/dates';
+import { now, fDuration } from 'src/utils/dates';
 
 export interface TimerProps {
   endTime?: number;

superset-frontend/src/dashboard/actions/sliceEntities.js

@@ -21,7 +21,6 @@ import { t, SupersetClient } from '@superset-ui/core';
 import rison from 'rison';
 
 import { addDangerToast } from 'src/components/MessageToasts/actions';
-import { getDatasourceParameter } from 'src/modules/utils';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 
 export const SET_ALL_SLICES = 'SET_ALL_SLICES';
@@ -39,6 +38,10 @@ export function fetchAllSlicesFailed(error) {
   return { type: FETCH_ALL_SLICES_FAILED, payload: { error } };
 }
 
+export function getDatasourceParameter(datasourceId, datasourceType) {
+  return `${datasourceId}__${datasourceType}`;
+}
+
 const FETCH_SLICES_PAGE_SIZE = 200;
 export function fetchAllSlices(userId, excludeFilterBox = false) {
   return (dispatch, getState) => {

superset-frontend/src/explore/controlPanels/Separator.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 import { t, validateNonEmpty } from '@superset-ui/core';
-import { formatSelectOptions } from 'src/modules/utils';
+import { formatSelectOptions } from 'src/explore/exploreUtils';
 
 export default {
   controlPanelSections: [

superset-frontend/src/explore/controlPanels/sections.tsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import { t } from '@superset-ui/core';
 import { ControlPanelSectionConfig } from '@superset-ui/chart-controls';
-import { formatSelectOptions } from 'src/modules/utils';
+import { formatSelectOptions } from 'src/explore/exploreUtils';
 
 export const druidTimeSeries: ControlPanelSectionConfig = {
   label: t('Time'),

superset-frontend/src/explore/controls.jsx

@@ -64,7 +64,7 @@ import {
   legacyValidateInteger,
   validateNonEmpty,
 } from '@superset-ui/core';
-import { formatSelectOptions } from 'src/modules/utils';
+import { formatSelectOptions } from 'src/explore/exploreUtils';
 import { TIME_FILTER_LABELS } from './constants';
 import { StyledColumnOption } from './components/optionRenderers';
 

superset-frontend/src/explore/exploreUtils/index.js

@@ -348,3 +348,7 @@ export const getSimpleSQLExpression = (subject, operator, comparator) => {
   }
   return expression;
 };
+
+export function formatSelectOptions(options) {
+  return options.map(opt => [opt, opt.toString()]);
+}

superset-frontend/src/modules/dates.test.js → superset-frontend/src/utils/dates.test.js

@@ -22,7 +22,7 @@ import {
   epochTimeXHoursAgo,
   epochTimeXDaysAgo,
   epochTimeXYearsAgo,
-} from 'src/modules/dates';
+} from 'src/utils/dates';
 
 describe('fDuration', () => {
   it('is a function', () => {

superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx

@@ -25,7 +25,7 @@ import ListView from 'src/components/ListView';
 import { Tooltip } from 'src/components/Tooltip';
 import SubMenu from 'src/views/components/SubMenu';
 import withToasts from 'src/components/MessageToasts/withToasts';
-import { fDuration } from 'src/modules/dates';
+import { fDuration } from 'src/utils/dates';
 import AlertStatusIcon from 'src/views/CRUD/alert/components/AlertStatusIcon';
 import {
   useListViewResource,