Skip to content

Commit

Permalink
updated common types imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Doniaab committed Feb 17, 2025
1 parent 0db9707 commit c9c435c
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 31 deletions.
2 changes: 1 addition & 1 deletion alerting/src/aa-storm-alert/alert.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
getLatestAvailableReports,
} from './alert';
import { buildDetailedReport, buildLandfallInfo } from './test-utils';
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import { WindState } from 'prism-common';
import moment from 'moment';
import { LastStates } from '../types/aa-storm-email';

Expand Down
3 changes: 1 addition & 2 deletions alerting/src/aa-storm-alert/alert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import {
ShortReportsResponseBody,
} from '../types/aa-storm-email';
import nodeFetch from 'node-fetch';
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import { StormDataResponseBody } from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import { StormDataResponseBody, WindState } from 'prism-common';
import { StormAlertData } from '../types/email';
import moment from 'moment';
import { captureScreenshotFromUrl } from '../utils/capture-utils';
Expand Down
3 changes: 1 addition & 2 deletions alerting/src/aa-storm-alert/test-utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { LandfallInfo } from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import { LandfallInfo, WindState } from 'prism-common';

export function buildLandfallInfo({
landfall_time = ['2025-01-13 06:00:00', '2025-01-13 18:00:00'],
Expand Down
2 changes: 1 addition & 1 deletion alerting/src/types/aa-storm-email.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import { WindState } from 'prism-common';

export type LastStates = {
[stormName: string]: {
Expand Down
2 changes: 1 addition & 1 deletion alerting/src/types/email.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import { WindState } from 'prism-common';

export interface StormAlertData {
email: string | string[];
Expand Down
2 changes: 1 addition & 1 deletion alerting/src/utils/email.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { formatDateToUTC } from './date';
import {
displayWindState,
WindState,
} from 'prism-common/dist/types/anticipatory-action-storm/windState';
} from 'prism-common';

/**
*
Expand Down
2 changes: 1 addition & 1 deletion common/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export { WFS } from "./wfs";
export { WMS, createGetLegendGraphicUrl, createGetMapUrl } from "./wms";
export { WCS, createGetCoverageUrl } from "./wcs";

export { formatUrl } from "./utils";
export { formatUrl } from "./utils";
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createStyles, makeStyles } from '@material-ui/core';

import 'react-datepicker/dist/react-datepicker.css';
import { DateRangeType } from 'config/types';
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import { WindState } from 'prism-common';
import { TIMELINE_ITEM_WIDTH } from '../../utils';
import { useWindStatesByTime } from '../hooks';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ import { MapLayerMouseEvent, Popup } from 'react-map-gl/maplibre';
import _React, { useCallback, useState } from 'react';
import { createStyles, makeStyles, Typography } from '@material-ui/core';
import { useMapCallback } from 'utils/map-utils';
import {
AAStormTimeSeriesFeature,
FeaturePropertyDataType,
TimeSeries,
} from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import type { AAStormTimeSeriesFeature, TimeSeries } from 'prism-common/types';
import { FeaturePropertyDataType } from 'prism-common';
import { formatWindPointDate } from '../utils';

interface AAStormDatePopupProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ParsedStormData } from 'context/anticipatoryAction/AAStormStateSlice/parsedStormDataTypes';
import { AAStormTimeSeriesFeature } from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import type { AAStormTimeSeriesFeature } from 'prism-common/types';
import { getDateInUTC } from '../utils';

function getLandfallEstimatedTime(stormData: ParsedStormData) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ import { useWindStatesByTime } from 'components/MapView/DateSelector/TimelineIte
import { getAAColor } from 'components/MapView/LeftPanel/AnticipatoryActionPanel/AnticipatoryActionStormPanel/utils';
import { AACategory } from 'context/anticipatoryAction/AAStormStateSlice/parsedStormDataTypes';
import anticipatoryActionIcons from 'components/Common/AnticipatoryAction/icons';
import {
AAStormTimeSeriesFeature,
TimeSeries,
} from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import type { AAStormTimeSeriesFeature, TimeSeries } from 'prism-common/types';
import maplibregl from 'maplibre-gl';
import AAStormDatePopup from './AAStormDatePopup';
import AAStormLandfallPopup from './AAStormLandfallPopup';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
import type {
AAStormTimeSeriesFeature,
TimeSerieFeatureProperty,
} from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
} from 'prism-common/types';

import { isSameDay, parseJSON, format, differenceInHours } from 'date-fns';
import { MapGeoJSONFeature } from 'maplibre-gl';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import anticipatoryActionIcons from 'components/Common/AnticipatoryAction/icons';

import { AADataSelector } from 'context/anticipatoryAction/AAStormStateSlice';
import { TimeSeries } from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import type { TimeSeries } from 'prism-common/types';
import { useSafeTranslation } from 'i18n';
import { useSelector } from 'react-redux';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
import { DateItem } from 'config/types';
import { StormDataResponseBody } from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import type { StormDataResponseBody } from 'prism-common/types';
import type { CreateAsyncThunkTypes, RootState } from '../../store';
import { AAStormWindStateReports, AnticipatoryActionState } from './types';
import { parseAndTransformAA } from './utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { Feature, Geometry, GeoJsonProperties } from 'geojson';
import {
ForecastDetails,
TimeSeries,
} from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import type { ForecastDetails, TimeSeries } from 'prism-common/types';

export enum AACategory {
Severe = 'Severe',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// // na/ny are not actually found in CSV, but defined not to cause confusion when calling the functions
import { DateItem } from 'config/types';
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import type { WindState } from 'prism-common/types';
import { ParsedStormData } from './parsedStormDataTypes';

export type ShortDate = string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StormDataResponseBody } from 'prism-common/dist/types/anticipatory-action-storm/reportResponse';
import { WindState } from 'prism-common/dist/types/anticipatory-action-storm/windState';
import type { StormDataResponseBody } from 'prism-common/types';
import { WindState } from 'prism-common';
import {
AACategory,
AACategoryDataToLandfallMap,
Expand Down

0 comments on commit c9c435c

Please sign in to comment.