Skip to content

Commit

Permalink
Move status enums to enum file
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronPlave committed Feb 5, 2024
1 parent 3d60876 commit 53e8144
Show file tree
Hide file tree
Showing 19 changed files with 31 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/components/app/NavButton.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte';
import { getColorForStatus, type Status } from '../../utilities/status';
import { getColorForStatus, type Status } from '../../enums/status';
export let selected: boolean = false;
export let status: Status | null = null;
Expand Down
2 changes: 1 addition & 1 deletion src/components/constraints/ConstraintListItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import VisibleShowIcon from '@nasa-jpl/stellar/icons/visible_show.svg?component';
import WarningIcon from '@nasa-jpl/stellar/icons/warning.svg?component';
import { createEventDispatcher } from 'svelte';
import { Status } from '../../enums/status';
import type { User } from '../../types/app';
import type { Constraint, ConstraintResponse } from '../../types/constraint';
import type { Plan } from '../../types/plan';
import effects from '../../utilities/effects';
import { permissionHandler } from '../../utilities/permissionHandler';
import { Status } from '../../utilities/status';
import { pluralize } from '../../utilities/text';
import { tooltip } from '../../utilities/tooltip';
import Collapse from '../Collapse.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/components/constraints/ConstraintsPanel.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import VisibleHideIcon from '@nasa-jpl/stellar/icons/visible_hide.svg?component';
import VisibleShowIcon from '@nasa-jpl/stellar/icons/visible_show.svg?component';
import { PlanStatusMessages } from '../../enums/planStatusMessages';
import { Status } from '../../enums/status';
import {
checkConstraintsStatus,
constraintResponseMap,
Expand All @@ -28,7 +29,6 @@
import effects from '../../utilities/effects';
import { permissionHandler } from '../../utilities/permissionHandler';
import { featurePermissions } from '../../utilities/permissions';
import { Status } from '../../utilities/status';
import { getDoyTime, getUnixEpochTime } from '../../utilities/time';
import { tooltip } from '../../utilities/tooltip';
import { required, timestamp } from '../../utilities/validators';
Expand Down
2 changes: 1 addition & 1 deletion src/components/menus/ActivityStatusMenu.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<script lang="ts">
import WaterfallIcon from '@nasa-jpl/stellar/icons/waterfall.svg?component';
import { createEventDispatcher } from 'svelte';
import { Status } from '../../enums/status';
import type { ActivityDirectiveValidationStatus } from '../../types/activity';
import type { ActivityErrorCounts } from '../../types/errors';
import { Status } from '../../utilities/status';
import PlanNavButton from '../plan/PlanNavButton.svelte';
import ActivityErrorsRollup from '../ui/ActivityErrorsRollup.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/components/menus/ViewMenu.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
import ViewGridRightPanelSplitEmpty from '@nasa-jpl/stellar/icons/view_grid_right_panel_split_empty.svg?component';
import ViewGridRightPanelSplitFilled from '@nasa-jpl/stellar/icons/view_grid_right_panel_split_filled.svg?component';
import { createEventDispatcher } from 'svelte';
import { Status } from '../../enums/status';
import { view, viewIsModified } from '../../stores/views';
import type { User } from '../../types/app';
import type { ViewToggleType } from '../../types/view';
import { showSavedViewsModal } from '../../utilities/modal';
import { permissionHandler } from '../../utilities/permissionHandler';
import { Status } from '../../utilities/status';
import { downloadView } from '../../utilities/view';
import PlanNavButton from '../plan/PlanNavButton.svelte';
import ToggleableIcon from '../ui/ToggleableIcon.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/components/plan/PlanNavButton.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import PlayIcon from '@nasa-jpl/stellar/icons/play.svg?component';
import type { Status } from '../../enums/status';
import { permissionHandler } from '../../utilities/permissionHandler';
import { getHumanReadableStatus } from '../../utilities/simulation';
import type { Status } from '../../utilities/status';
import { tooltip } from '../../utilities/tooltip';
import Menu from '../menus/Menu.svelte';
import MenuHeader from '../menus/MenuHeader.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/components/simulation/SimulationHistoryDataset.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<script lang="ts">
import CancelIcon from '@nasa-jpl/stellar/icons/prohibited.svg?component';
import { createEventDispatcher } from 'svelte';
import { Status } from '../../enums/status';
import { planReadOnly } from '../../stores/plan';
import type { SimulationDataset } from '../../types/simulation';
import { hexToRgba } from '../../utilities/color';
Expand All @@ -15,7 +16,6 @@
getSimulationStatus,
getSimulationTimestamp,
} from '../../utilities/simulation';
import { Status } from '../../utilities/status';
import { getDoyTime, getUnixEpochTimeFromInterval } from '../../utilities/time';
import { tooltip } from '../../utilities/tooltip';
import Card from '../ui/Card.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/components/simulation/SimulationPanel.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import PlanRightArrow from '@nasa-jpl/stellar/icons/plan_with_right_arrow.svg?component';
import { PlanStatusMessages } from '../../enums/planStatusMessages';
import { SearchParameters } from '../../enums/searchParameters';
import { Status } from '../../enums/status';
import { field } from '../../stores/form';
import { plan, planEndTimeMs, planReadOnly, planStartTimeMs } from '../../stores/plan';
import { planSnapshot } from '../../stores/planSnapshots';
Expand Down Expand Up @@ -33,7 +34,6 @@
import { permissionHandler } from '../../utilities/permissionHandler';
import { featurePermissions } from '../../utilities/permissions';
import { getSimulationQueuePosition } from '../../utilities/simulation';
import { Status } from '../../utilities/status';
import { getDoyTime } from '../../utilities/time';
import { required, timestamp, validateEndTime, validateStartTime } from '../../utilities/validators';
import Collapse from '../Collapse.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/PanelHeaderActions.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { Status } from '../../utilities/status';
import type { Status } from '../../enums/status';
import StatusBadge from './StatusBadge.svelte';
export let status: Status | null = null;
Expand Down
3 changes: 2 additions & 1 deletion src/components/ui/StatusBadge.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import ThreeDotsIcon from '@nasa-jpl/stellar/icons/three_dot_horizontal.svg?component';
import WarningIcon from '@nasa-jpl/stellar/icons/warning.svg?component';
import HourglassIcon from 'bootstrap-icons/icons/hourglass-top.svg?component';
import { getColorForStatus, Status, statusColors } from '../../utilities/status';
import { Status } from '../../enums/status';
import { getColorForStatus, statusColors } from '../../utilities/status';
import { tooltip } from '../../utilities/tooltip';
import ProgressRadial from './ProgressRadial.svelte';
Expand Down
10 changes: 10 additions & 0 deletions src/enums/status.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export enum Status {
Canceled = 'Canceled',
Complete = 'Complete',
Failed = 'Failed',
Incomplete = 'Incomplete',
Unchecked = 'Unchecked',
Modified = 'Modified',
Pending = 'Pending',
PartialSuccess = 'Partial Success',
}
3 changes: 2 additions & 1 deletion src/routes/plans/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import StatusBadge from '../../../components/ui/StatusBadge.svelte';
import { PlanStatusMessages } from '../../../enums/planStatusMessages';
import { SearchParameters } from '../../../enums/searchParameters';
import { Status } from '../../../enums/status';
import {
activityDirectiveValidationStatuses,
activityDirectives,
Expand Down Expand Up @@ -123,7 +124,7 @@
getSimulationStatus,
getSimulationTimestamp,
} from '../../../utilities/simulation';
import { Status, statusColors } from '../../../utilities/status';
import { statusColors } from '../../../utilities/status';
import { pluralize } from '../../../utilities/text';
import { getUnixEpochTime } from '../../../utilities/time';
import { tooltip } from '../../../utilities/tooltip';
Expand Down
2 changes: 1 addition & 1 deletion src/stores/constraints.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { keyBy } from 'lodash-es';
import { derived, get, writable, type Readable, type Writable } from 'svelte/store';
import { Status } from '../enums/status';
import type { Constraint, ConstraintResponse, ConstraintResultWithName } from '../types/constraint';
import gql from '../utilities/gql';
import { Status } from '../utilities/status';
import { modelId, planId, planStartTimeMs } from './plan';
import { gqlSubscribable } from './subscribable';

Expand Down
2 changes: 1 addition & 1 deletion src/stores/expansion.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { derived, writable, type Readable, type Writable } from 'svelte/store';
import type { Status } from '../enums/status';
import type { ExpansionRuleSlim, ExpansionSequence, ExpansionSet } from '../types/expansion';
import gql from '../utilities/gql';
import type { Status } from '../utilities/status';
import { simulationDatasetId } from './simulation';
import { gqlSubscribable } from './subscribable';

Expand Down
2 changes: 1 addition & 1 deletion src/stores/scheduling.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { derived, writable, type Readable, type Writable } from 'svelte/store';
import type { Status } from '../enums/status';
import { plan } from '../stores/plan';
import type {
SchedulingCondition,
Expand All @@ -8,7 +9,6 @@ import type {
SchedulingSpecGoal,
} from '../types/scheduling';
import gql from '../utilities/gql';
import type { Status } from '../utilities/status';
import { gqlSubscribable } from './subscribable';

/* Writeable. */
Expand Down
2 changes: 1 addition & 1 deletion src/stores/simulation.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { keyBy } from 'lodash-es';
import { derived, writable, type Readable, type Writable } from 'svelte/store';
import { Status } from '../enums/status';
import type {
Resource,
ResourceType,
Expand All @@ -15,7 +16,6 @@ import type {
import { createSpanUtilityMaps } from '../utilities/activities';
import gql from '../utilities/gql';
import { getSimulationProgress } from '../utilities/simulation';
import { Status } from '../utilities/status';
import { modelId, planId, planRevision } from './plan';
import { gqlSubscribable } from './subscribable';
import { view } from './views';
Expand Down
2 changes: 1 addition & 1 deletion src/utilities/effects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { env } from '$env/dynamic/public';
import type { CommandDictionary as AmpcsCommandDictionary } from '@nasa-jpl/aerie-ampcs';
import { get } from 'svelte/store';
import { SearchParameters } from '../enums/searchParameters';
import { Status } from '../enums/status';
import { activityDirectives, activityDirectivesMap, selectedActivityDirectiveId } from '../stores/activities';
import { checkConstraintsStatus, constraintsViolationStatus, rawConstraintResponses } from '../stores/constraints';
import { catchError, catchSchedulingError } from '../stores/errors';
Expand Down Expand Up @@ -153,7 +154,6 @@ import {
import { queryPermissions } from './permissions';
import { reqExtension, reqGateway, reqHasura } from './requests';
import { sampleProfiles } from './resources';
import { Status } from './status';
import { pluralize } from './text';
import { getDoyTime, getDoyTimeFromInterval, getIntervalFromDoyRange } from './time';
import { createRow, duplicateRow } from './timeline';
Expand Down
3 changes: 2 additions & 1 deletion src/utilities/simulation.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Status } from '../enums/status';
import type { SimulationDataset, SimulationDatasetSlim } from '../types/simulation';
import { compare, getNumberWithOrdinal } from './generic';
import { Status, statusColors } from './status';
import { statusColors } from './status';
import { getDoyTime, getUnixEpochTimeFromInterval } from './time';

/**
Expand Down
11 changes: 1 addition & 10 deletions src/utilities/status.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
export enum Status {
Canceled = 'Canceled',
Complete = 'Complete',
Failed = 'Failed',
Incomplete = 'Incomplete',
Unchecked = 'Unchecked',
Modified = 'Modified',
Pending = 'Pending',
PartialSuccess = 'Partial Success',
}
import { Status } from '../enums/status';

export const statusColors: Record<string, string> = {
blue: '#2f80ed',
Expand Down

0 comments on commit 53e8144

Please sign in to comment.