Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIE-120 Replace colors with useThemeFromContext in ErrorView and dependants. #4611

Merged
merged 11 commits into from
Mar 15, 2024
9 changes: 6 additions & 3 deletions src/components/ErrorView.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useThemeFromContext } from '@terra-ui-packages/components';
import { cond, maybeParseJSON } from '@terra-ui-packages/core-utils';
import _ from 'lodash/fp';
import { Fragment } from 'react';
import { div, h, iframe } from 'react-hyperscript-helpers';
import colors from 'src/libs/colors';
import * as Style from 'src/libs/style';

export const styles = {
export const getStyles = (colors) => ({
htmlFrame: {
width: '100%',
border: Style.standardLine,
Expand All @@ -22,9 +22,12 @@ export const styles = {
fontFamily: 'Menlo, monospace',
maxHeight: 400,
},
};
});

const ErrorView = ({ error }) => {
const { colors } = useThemeFromContext();
const styles = getStyles(colors);

return div({ style: { marginTop: '1rem' } }, [
cond(
[_.isError(error), () => error.message],
Expand Down
15 changes: 10 additions & 5 deletions src/workflows-app/components/ImportWorkflowModal.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useThemeFromContext } from '@terra-ui-packages/components';
import { Modal } from '@terra-ui-packages/components';
import { CSSProperties } from 'react';
import { div, h } from 'react-hyperscript-helpers';
import { ButtonPrimary, ButtonSecondary, Link } from 'src/components/common';
import { styles as errorStyles } from 'src/components/ErrorView';
import { getStyles as getErrorStyles } from 'src/components/ErrorView';
import { centeredSpinner, icon } from 'src/components/icons';
import colors from 'src/libs/colors';
import * as Nav from 'src/libs/nav';
import * as Utils from 'src/libs/utils';
import { WorkspaceWrapper } from 'src/workspaces/utils';
Expand Down Expand Up @@ -32,6 +32,8 @@ export const ImportWorkflowModal = ({
successfulImport,
errorMessage,
}: ImportWorkflowModalProps) => {
const { colors } = useThemeFromContext();
const errorStyles = getErrorStyles(colors);
const successBody = () => {
return div({}, [
div({ style: { paddingBottom: '1.5rem', display: 'flex', flex: 'none' } }, [
Expand Down Expand Up @@ -101,9 +103,12 @@ export const ImportWorkflowModal = ({
),
]),
]),
div({ style: { ...(errorStyles.jsonFrame as CSSProperties), overflowY: 'scroll', maxHeight: 150 } }, [
errorMessage,
]),
div(
{
style: { ...(errorStyles.jsonFrame as CSSProperties), overflowY: 'scroll', maxHeight: 150 },
},
[errorMessage]
),
]);
};

Expand Down
7 changes: 4 additions & 3 deletions src/workflows-app/components/SubmitWorkflowModal.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import { Modal, Spinner } from '@terra-ui-packages/components';
import { Modal, Spinner, useThemeFromContext } from '@terra-ui-packages/components';
import _ from 'lodash/fp';
import { CSSProperties, Fragment, useState } from 'react';
import { div, h, span } from 'react-hyperscript-helpers';
import { generateAppName, getCurrentApp } from 'src/analysis/utils/app-utils';
import { appAccessScopes, appToolLabels } from 'src/analysis/utils/tool-utils';
import { ButtonPrimary } from 'src/components/common';
import { styles as errorStyles } from 'src/components/ErrorView';
import { getStyles as getErrorStyles } from 'src/components/ErrorView';
import { icon } from 'src/components/icons';
import { TextArea, TextInput } from 'src/components/input';
import { TextCell } from 'src/components/table';
import { Ajax } from 'src/libs/ajax';
import { RecordResponse } from 'src/libs/ajax/data-table-providers/WdsDataTableProvider';
import { useMetricsEvent } from 'src/libs/ajax/metrics/useMetrics';
import colors from 'src/libs/colors';
import Events, { extractWorkspaceDetails } from 'src/libs/events';
import * as Nav from 'src/libs/nav';
import { notify } from 'src/libs/notifications';
Expand Down Expand Up @@ -65,6 +64,8 @@ export const SubmitWorkflowModal = ({
const { captureEvent } = useMetricsEvent();
const canSubmit = canCompute;

const { colors } = useThemeFromContext();
const errorStyles = getErrorStyles(colors);
const submitRun = async () => {
const runSetsPayload = {
run_set_name: runSetName,
Expand Down
Loading