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

fix(consumption): Adding 'Invalid Parameter' message to Subgraph nodes #4314

Merged
merged 3 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion libs/designer-ui/src/lib/card/subgraphCard/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { ActionButtonV2 } from '../../actionbuttonv2';
import NodeCollapseToggle from '../../nodeCollapseToggle';
import { CardContextMenu } from '../cardcontextmenu';
import { ErrorBanner } from '../errorbanner';
import { useCardContextMenu, useCardKeyboardInteraction } from '../hooks';
import type { MessageBarType } from '@fluentui/react';
import { css } from '@fluentui/react';
import type { SubgraphType } from '@microsoft/logic-apps-shared';
import { SUBGRAPH_TYPES } from '@microsoft/logic-apps-shared';
Expand All @@ -20,6 +22,8 @@ interface SubgraphCardProps {
onDeleteClick?(): void;
showAddButton?: boolean;
contextMenuItems?: JSX.Element[];
errorLevel?: MessageBarType;
errorMessage?: string;
}

export const SubgraphCard: React.FC<SubgraphCardProps> = ({
Expand All @@ -34,6 +38,8 @@ export const SubgraphCard: React.FC<SubgraphCardProps> = ({
onClick,
onDeleteClick,
contextMenuItems = [],
errorLevel,
errorMessage,
}) => {
const intl = useIntl();

Expand Down Expand Up @@ -120,7 +126,8 @@ export const SubgraphCard: React.FC<SubgraphCardProps> = ({
onKeyDown={keyboardInteraction.keyUp}
onKeyUp={keyboardInteraction.keyDown}
>
{data.title}
<div className="msla-subgraph-title-text">{data.title}</div>
{errorMessage ? <ErrorBanner errorLevel={errorLevel} errorMessage={errorMessage} /> : null}
</button>
<NodeCollapseToggle collapsed={collapsed} handleCollapse={handleCollapse} />
{contextMenuItems?.length > 0 ? (
Expand Down
31 changes: 29 additions & 2 deletions libs/designer-ui/src/lib/card/subgraphCard/subgraphCard.less
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,38 @@
color: white;
flex-grow: 1;
align-self: center;
display: inline-block;
font: 14px/20px normal @semibold-font-family;
valentina-vallalta marked this conversation as resolved.
Show resolved Hide resolved
display: flex;
flex-direction: column;
align-items: flex-start;
text-align: left;
word-break: break-word;
padding: 4px 8px;
background-color: var(--brand-color, black);
}

.msla-subgraph-title-text {
font: 14px/20px normal @semibold-font-family;
}
.msla-panel-card-error-wrapper {
width: 100%;
margin-left: 0%;
}
.msla-panel-card-error {
margin: 8px 0px 0px;
text-align: left;
display: flex;
align-items: center;
gap: 4px;

.msla-panel-card-error-text {
margin: 0px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

&.severeWarning {
color: #ffffff;
}
}
}
17 changes: 16 additions & 1 deletion libs/designer/src/lib/ui/CustomNodes/SubgraphCardNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { initializeSwitchCaseFromManifest } from '../../core/actions/bjsworkflow
import { getOperationManifest } from '../../core/queries/operation';
import { useMonitoringView, useReadOnly } from '../../core/state/designerOptions/designerOptionsSelectors';
import { setShowDeleteModal } from '../../core/state/designerView/designerViewSlice';
import { useIconUri } from '../../core/state/operation/operationSelector';
import { useIconUri, useParameterValidationErrors } from '../../core/state/operation/operationSelector';
import { useIsNodeSelected } from '../../core/state/panel/panelSelectors';
import { changePanelNode, setSelectedNodeId } from '../../core/state/panel/panelSlice';
import {
Expand All @@ -21,6 +21,7 @@ import { addSwitchCase, setFocusNode, toggleCollapsedGraphId } from '../../core/
import { LoopsPager } from '../common/LoopsPager/LoopsPager';
import { DropZone } from '../connections/dropzone';
import { DeleteMenuItem } from '../menuItems/deleteMenuItem';
import { MessageBarType } from '@fluentui/react';
import { SubgraphCard } from '@microsoft/designer-ui';
import { SUBGRAPH_TYPES, removeIdTag } from '@microsoft/logic-apps-shared';
import { memo, useCallback, useMemo } from 'react';
Expand Down Expand Up @@ -104,6 +105,18 @@ const SubgraphCardNode = ({ data, targetPosition = Position.Top, sourcePosition
[deleteClick, metadata?.subgraphType]
);

const parameterValidationErrors = useParameterValidationErrors(subgraphId);
const parameterValidationErrorText = intl.formatMessage({
defaultMessage: 'Invalid parameters',
description: 'Text to explain that there are invalid parameters for this node',
});

const { errorMessage, errorLevel } = useMemo(() => {
if (parameterValidationErrors?.length > 0)
return { errorMessage: parameterValidationErrorText, errorLevel: MessageBarType.severeWarning };
return { errorMessage: undefined, errorLevel: undefined };
}, [parameterValidationErrors?.length, parameterValidationErrorText]);

return (
<div>
<div style={{ display: 'flex', alignItems: 'center' }}>
Expand All @@ -122,6 +135,8 @@ const SubgraphCardNode = ({ data, targetPosition = Position.Top, sourcePosition
collapsed={graphCollapsed}
handleCollapse={handleGraphCollapse}
contextMenuItems={contextMenuItems}
errorLevel={errorLevel}
errorMessage={errorMessage}
/>
{isMonitoringView && normalizedType === constants.NODE.TYPE.UNTIL ? (
<LoopsPager metadata={metadata} scopeId={subgraphId} collapsed={graphCollapsed} />
Expand Down
Loading