-
Notifications
You must be signed in to change notification settings - Fork 397
Resolve steps in flow builder for dynamically registered executors from /dropins #10607
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
Open
VIHANGAGIT
wants to merge
4
commits into
wso2:master
Choose a base branch
from
VIHANGAGIT:dynamic-executor-registration
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e1b659f
Resolve dynamic flow steps from connectors/dropins
VIHANGAGIT 8a4aa82
Merge branch 'master' into dynamic-executor-registration
VIHANGAGIT b0a1298
Add recovery factor behavior flag and enhance validation logic
VIHANGAGIT af825b6
Refactor
VIHANGAGIT File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
features/admin.flow-builder-core.v1/api/use-get-extension-executor-steps.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /** | ||
| * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { FlowTypes } from "@wso2is/admin.flows.v1/models/flows"; | ||
| import { useMemo } from "react"; | ||
| import useGetMetadata from "./use-metadata"; | ||
| import { MetadataInterface } from "../models/metadata"; | ||
| import { Step } from "../models/steps"; | ||
| import buildExtensionExecutorSteps from "../utils/build-extension-executor-steps"; | ||
|
|
||
| /** | ||
| * Hook that returns the palette steps for executors contributed by extensions deployed on the server. | ||
| */ | ||
| const useGetExtensionExecutorSteps = (flowType: FlowTypes): Step[] => { | ||
| const { data: metadata } = useGetMetadata<MetadataInterface>(flowType, !!flowType); | ||
|
|
||
| return useMemo( | ||
| () => buildExtensionExecutorSteps(metadata?.extensionExecutors), | ||
| [ metadata?.extensionExecutors ] | ||
| ); | ||
| }; | ||
|
|
||
| export default useGetExtensionExecutorSteps; |
82 changes: 82 additions & 0 deletions
82
...er-core.v1/components/resources/steps/execution/execution-factory/extension-execution.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /** | ||
| * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import Box from "@oxygen-ui/react/Box"; | ||
| import Typography from "@oxygen-ui/react/Typography"; | ||
| import loadStaticResource from "@wso2is/admin.core.v1/utils/load-static-resource"; | ||
| import { IdentifiableComponentInterface } from "@wso2is/core/models"; | ||
| import React, { ReactElement, useMemo, useState } from "react"; | ||
| import useAuthenticationFlowBuilderCore from "../../../../../hooks/use-authentication-flow-builder-core-context"; | ||
| import { ExtensionExecutorInterface } from "../../../../../models/metadata"; | ||
| import { DEFAULT_EXTENSION_EXECUTOR_ICON } from "../../../../../utils/build-extension-executor-steps"; | ||
| import { ExecutionMinimalPropsInterface } from "../execution-minimal"; | ||
|
|
||
| /** | ||
| * Props interface of ExtensionExecution. | ||
| */ | ||
| type ExtensionExecutionPropsInterface = ExecutionMinimalPropsInterface & IdentifiableComponentInterface; | ||
|
|
||
| /** | ||
| * Canvas node for an executor contributed by an extension deployed on the server. | ||
| */ | ||
| const ExtensionExecution = ({ | ||
| resource, | ||
| "data-componentid": componentId = "extension-execution" | ||
| }: ExtensionExecutionPropsInterface): ReactElement => { | ||
| const { metadata } = useAuthenticationFlowBuilderCore(); | ||
| const [ hasIconFailed, setHasIconFailed ] = useState<boolean>(false); | ||
|
|
||
| const executorName: string = resource?.data?.action?.executor?.name; | ||
|
|
||
| const executor: ExtensionExecutorInterface | null = useMemo(() => { | ||
| if (!executorName || !metadata?.extensionExecutors?.length) { | ||
| return null; | ||
| } | ||
|
|
||
| return metadata.extensionExecutors.find( | ||
| (candidate: ExtensionExecutorInterface) => candidate.name === executorName | ||
| ) || null; | ||
| }, [ executorName, metadata?.extensionExecutors ]); | ||
|
|
||
| const isDefaultIcon: boolean = hasIconFailed || !executor?.icon; | ||
| const iconSrc: string = isDefaultIcon | ||
| ? loadStaticResource(DEFAULT_EXTENSION_EXECUTOR_ICON) | ||
| : loadStaticResource(executor.icon); | ||
|
|
||
| const displayName: string = executor?.displayName || resource?.display?.label || executorName; | ||
|
|
||
| return ( | ||
| <Box | ||
| display="flex" | ||
| gap={ 1 } | ||
| data-componentid={ componentId } | ||
| className="flow-builder-execution extension-execution" | ||
| > | ||
| <img | ||
| src={ iconSrc } | ||
| alt={ displayName } | ||
| height="20" | ||
| style={ { filter: isDefaultIcon ? "invert(1)" : "none", objectFit: "contain" } } | ||
| onError={ () => setHasIconFailed(true) } | ||
| /> | ||
| <Typography variant="body1">{ displayName }</Typography> | ||
| </Box> | ||
| ); | ||
| }; | ||
|
|
||
| export default ExtensionExecution; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
features/admin.flow-builder-core.v1/hooks/use-extension-executor.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { useMemo } from "react"; | ||
| import useAuthenticationFlowBuilderCore from "./use-authentication-flow-builder-core-context"; | ||
| import { ExtensionExecutorInterface } from "../models/metadata"; | ||
|
|
||
| /** | ||
| * Hook that resolves the metadata of an executor contributed by an extension deployed on the server. | ||
| */ | ||
| const useExtensionExecutor = (executorName: string): ExtensionExecutorInterface | null => { | ||
| const { metadata } = useAuthenticationFlowBuilderCore(); | ||
|
|
||
| return useMemo(() => { | ||
| if (!executorName || !metadata?.extensionExecutors?.length) { | ||
| return null; | ||
| } | ||
|
|
||
| return metadata.extensionExecutors.find( | ||
| (executor: ExtensionExecutorInterface) => executor.name === executorName | ||
| ) || null; | ||
| }, [ executorName, metadata?.extensionExecutors ]); | ||
| }; | ||
|
|
||
| /** | ||
| * Hook that decides whether the connection picker applies to an dynamically registered executor. | ||
| */ | ||
| export const useIsConnectionlessExtensionExecutor = (executorName: string): boolean => { | ||
| const executor: ExtensionExecutorInterface | null = useExtensionExecutor(executorName); | ||
|
|
||
| return !!executor && executor.requiresConnection === false; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.