Skip to content

Bugfixes #1771

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.

Sign up for GitHub

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

Merged
kresimir-coko merged 3 commits into from
Nov 22, 2024
Merged

Bugfixes #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd07744
198 - apply alphabetical ordering of classNames
kresimir-coko Nov 22, 2024
98c77d2
1766 - dont show tab skeletons for Manual Trigger
kresimir-coko Nov 22, 2024
8db91c5
198 - add tailwindcss prettier plugin
kresimir-coko Nov 22, 2024
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
3 changes: 2 additions & 1 deletion client/.prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"trailingComma": "es5",
"tabWidth": 4,
"semi": true,
"singleQuote": true
"singleQuote": true,
"plugins": ["prettier-plugin-tailwindcss"]
}
2 changes: 1 addition & 1 deletion client/src/ee/pages/automation/api-platform/api-clients/components/ApiClientTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ const ApiClientTable = ({apiClients}: ApiClientTableProps) => {
className={twMerge(
'whitespace-nowrap',
cell.id.endsWith('actions') && 'flex justify-end',
cell.id.endsWith('enabled') && 'flex ml-6'
cell.id.endsWith('enabled') && 'ml-6 flex'
)}
key={cell.id}
onClick={(event) => {
Expand Down
2 changes: 1 addition & 1 deletion ...ages/automation/api-platform/api-collections/components/ApiCollectionEndpointListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const ApiCollectionEndpointListItem = ({
<div className="flex flex-1 items-center">
<Badge
className={twMerge(
'w-20 mr-4 border-transparent',
'mr-4 w-20 border-transparent',
apiCollectionEndpoint.httpMethod === 'DELETE' && 'bg-red-400',
apiCollectionEndpoint.httpMethod === 'GET' && 'bg-blue-400',
apiCollectionEndpoint.httpMethod === 'POST' && 'bg-green-400',
Expand Down
2 changes: 1 addition & 1 deletion ...src/ee/pages/settings/platform/api-connectors/components/ApiConnectorEndpointListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const ApiConnectorEndpointListItem = ({apiConnectorEndpoint}: {apiConnectorEndpo
<div className="flex flex-1 items-center">
<Badge
className={twMerge(
'w-20 mr-4 border-transparent',
'mr-4 w-20 border-transparent',
apiConnectorEndpoint.httpMethod === 'DELETE' && 'bg-red-400',
apiConnectorEndpoint.httpMethod === 'GET' && 'bg-blue-400',
apiConnectorEndpoint.httpMethod === 'POST' && 'bg-green-400',
Expand Down
2 changes: 1 addition & 1 deletion client/src/ee/pages/settings/platform/api-connectors/components/ApiConnectorListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const ApiConnectorListItem = ({apiConnector}: ApiConnectorItemProps) => {
<TooltipContent>{apiConnector.description}</TooltipContent>
</Tooltip>
) : (
<div className="space-x-1 ">
<div className="space-x-1">
<span className="font-semibold">{apiConnector.title}</span>

<span>-</span>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/account/public/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const Login = () => {
control={form.control}
name="rememberMe"
render={({field}) => (
<FormItem className="flex items-center space-x-3 space-y-0 ">
<FormItem className="flex items-center space-x-3 space-y-0">
<FormControl>
<Checkbox checked={field.value} onCheckedChange={field.onChange} />
</FormControl>
Expand Down
2 changes: 1 addition & 1 deletion ...automation/project-instances/components/project-instance-dialog/ProjectInstanceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ const ProjectInstanceDialog = ({
'group flex flex-col border-l-4 py-2 pl-4 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4',
index <= activeStepIndex
? 'border-gray-900 hover:border-gray-800'
: 'border-gray-200 hover:border-gray-30'
: 'hover:border-gray-30 border-gray-200'
)}
></div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion ...ces/components/project-instance-dialog/ProjectInstanceDialogBasicStepProjectsComboBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {FocusEventHandler} from 'react';

const ProjectLabel = ({project}: {project: Project}) => (
<div className="flex items-center">
<span className="mr-1 ">{project.name}</span>
<span className="mr-1">{project.name}</span>

<span className="text-xs text-gray-500">{project?.tags?.map((tag) => tag.name).join(', ')}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/automation/project/components/projects-sidebar/ProjectsSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const ProjectsSidebar = ({projectId}: {projectId: number}) => {
projects.map((curProject) => (
<div
className={twMerge(
'py-3 px-2 flex cursor-pointer items-center justify-between hover:bg-background/50 rounded-lg text-sm',
'flex cursor-pointer items-center justify-between rounded-lg px-2 py-3 text-sm hover:bg-background/50',
curProject.id === projectId && 'bg-background/50'
)}
key={curProject.id}
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/automation/workflow-executions/WorkflowExecutions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const jobStatusOptions = [

const ProjectLabel = ({project}: {project: Project}) => (
<div className="flex items-center">
<span className="mr-1 ">{project.name}</span>
<span className="mr-1">{project.name}</span>

<span className="text-xs text-gray-500">{project?.tags?.map((tag) => tag.name).join(', ')}</span>
</div>
Expand Down Expand Up @@ -391,7 +391,7 @@ export const WorkflowExecutions = () => {
? projectInstances?.map((projectInstance) => ({
label: (
<span className="flex items-center">
<span className="mr-1 ">
<span className="mr-1">
{projectInstance.name} V{projectInstance.projectVersion}
</span>

Expand Down
2 changes: 1 addition & 1 deletion ...rkflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const WorkflowExecutionSheetAccordion = ({job, triggerExecution}: {job: Job; tri
<span
className={twMerge(
(!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
'font-semibold uppercase text-base'
'text-base font-semibold uppercase'
)}
>
{taskExecutionsCompleted && triggerExecutionCompleted ? 'Workflow executed' : 'Workflow failed'}
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/embedded/connected-users/ConnectedUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function DatePickerWithRange({

const IntegrationLabel = ({integration}: {integration: Integration}) => (
<div className="flex items-center">
<span className="mr-1 ">{integration.componentName}</span>
<span className="mr-1">{integration.componentName}</span>

<span className="text-xs text-gray-500">{integration?.tags?.map((tag) => tag.name).join(', ')}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/embedded/connected-users/components/ConnectedUserTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ const ConnectedUserTable = ({connectedUsers}: ConnectedUserTableProps) => {
!connectedUsers[row.index].enabled && 'text-muted-foreground',
cell.id.endsWith('actions') && 'flex justify-end',
cell.id.endsWith('enabled') && 'flex justify-center',
cell.id.endsWith('status') && 'pl-8 '
cell.id.endsWith('status') && 'pl-8'
)}
key={cell.id}
onClick={(event) => {
Expand Down
4 changes: 2 additions & 2 deletions ...cted-users/components/connected-user-sheet/ConnectedUserSheetPanelIntegrationListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const ConnectedUserSheetPanelIntegrationListItem = ({

<div
className={twMerge(
'text-base font-semibold flex items-center space-x-1',
'flex items-center space-x-1 text-base font-semibold',
!connectedUserIntegrationInstance.enabled && 'text-muted-foreground'
)}
>
Expand All @@ -81,7 +81,7 @@ const ConnectedUserSheetPanelIntegrationListItem = ({
</div>

<div className="flex gap-4">
<div className="flex items-center space-x-1 text-xs text-muted-foreground">
<div className="flex items-center space-x-1 text-xs text-muted-foreground">
<CredentialsStatus
enabled={connectedUserIntegrationInstance.credentialStatus === 'VALID'}
/>
Expand Down
2 changes: 1 addition & 1 deletion ...ents/integration-instance-configuration-dialog/IntegrationInstanceConfigurationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ const IntegrationInstanceConfigurationDialog = ({
'group flex flex-col border-l-4 py-2 pl-4 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4',
index <= activeStepIndex
? 'border-gray-900 hover:border-gray-800'
: 'border-gray-200 hover:border-gray-30'
: 'hover:border-gray-30 border-gray-200'
)}
></div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion ...figuration-dialog/IntegrationInstanceConfigurationDialogBasicStepIntegrationsComboBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const IntegrationLabel = ({
<div className="flex items-center gap-2">
{componentDefinition?.icon && <InlineSVG className="size-6 flex-none" src={componentDefinition.icon} />}

<span className="mr-1 ">{integration.name}</span>
<span className="mr-1">{integration.name}</span>

<span className="text-xs text-gray-500">{integration?.tags?.map((tag) => tag.name).join(', ')}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...nt/src/pages/embedded/integration/components/integrations-sidebar/IntegrationsSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const IntegrationsSidebar = ({integrationId}: {integrationId: number}) => {
.map((curIntegration) => (
<div
className={twMerge(
'py-3 px-2 flex cursor-pointer items-center justify-between hover:bg-background/50 rounded-lg text-sm',
'flex cursor-pointer items-center justify-between rounded-lg px-2 py-3 text-sm hover:bg-background/50',
curIntegration.id === integrationId && 'bg-background/50'
)}
key={curIntegration.id}
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/embedded/workflow-executions/WorkflowExecutions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const jobStatusOptions = [

const IntegrationLabel = ({integration}: {integration: Integration}) => (
<div className="flex items-center">
<span className="mr-1 ">{integration.componentName}</span>
<span className="mr-1">{integration.componentName}</span>

<span className="text-xs text-gray-500">{integration?.tags?.map((tag) => tag.name).join(', ')}</span>
</div>
Expand Down Expand Up @@ -394,7 +394,7 @@ export const WorkflowExecutions = () => {
? integrationInstanceConfigurations?.map((integrationInstanceConfiguration) => ({
label: (
<span className="flex items-center">
<span className="mr-1 ">
<span className="mr-1">
{
(integrationInstanceConfiguration.integration as Integration)
?.componentName
Expand Down
2 changes: 1 addition & 1 deletion ...rkflow-executions/components/workflow-execution-sheet/WorkflowExecutionSheetAccordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const WorkflowExecutionSheetAccordion = ({job, triggerExecution}: {job: Job; tri
<span
className={twMerge(
(!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
'font-semibold uppercase text-base'
'text-base font-semibold uppercase'
)}
>
{taskExecutionsCompleted && triggerExecutionCompleted ? 'Workflow executed' : 'Workflow failed'}
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Home = () => {
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-50 bg-black/80" />

<Dialog.Content className="fixed left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2 bg-background p-4 shadow-lg sm:rounded-lg">
<Dialog.Content className="fixed left-1/2 top-1/2 z-50 -translate-x-1/2 -translate-y-1/2 bg-background p-4 shadow-lg sm:rounded-lg">
<div className="mx-auto flex h-full items-center">
<div className="grid grid-cols-2 gap-4">
<div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/platform/connection/components/ComponentSelectionInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const ComponentSelectionInput = ({
<>
{selectedComponentDefinition?.icon ? (
<div className="relative">
<span className="pointer-events-none absolute inset-y-0 left-0 flex items-center rounded-l-md px-3">
<span className="pointer-events-none absolute inset-y-0 left-0 flex items-center rounded-l-md px-3">
<InlineSVG className="size-4" src={selectedComponentDefinition.icon} />
</span>

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/platform/connection/components/ConnectionParameters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const ConnectionParameters = ({
existingAuthorizations.map((authorization) => (
<Fragment key={authorization.name}>
<li className="flex">
<span className="w-1/3 font-medium text-muted-foreground">Authorization:</span>
<span className="w-1/3 font-medium text-muted-foreground">Authorization:</span>

<span>{authorization.title}</span>
</li>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/platform/settings/api-keys/components/ApiKeyTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ const ApiKeyTable = ({apiKeys}: ApiKeyTableProps) => {
className={twMerge(
'whitespace-nowrap',
cell.id.endsWith('actions') && 'flex justify-end',
cell.id.endsWith('enabled') && 'flex ml-6'
cell.id.endsWith('enabled') && 'ml-6 flex'
)}
key={cell.id}
onClick={(event) => {
Expand Down
2 changes: 1 addition & 1 deletion ...orkflow-editor/components/Properties/components/PropertyCodeEditor/PropertyCodeEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const PropertyCodeEditor = forwardRef<HTMLButtonElement, PropertyCodeEditorProps
)}

<div className={twMerge([label && 'mt-1', leadingIcon && 'relative'])}>
<div className={twMerge(leadingIcon && 'relative rounded-md flex w-full')}>
<div className={twMerge(leadingIcon && 'relative flex w-full rounded-md')}>
{leadingIcon && (
<div className="pointer-events-none absolute inset-y-0 left-0 flex items-center rounded-l-md border border-input bg-gray-100 px-3">
{leadingIcon}
Expand Down
2 changes: 1 addition & 1 deletion ...ents/Properties/components/PropertyCodeEditor/PropertyCodeEditorSheetConnectionsSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ const ConnectionSelect = ({
connections.map((connection) => (
<SelectItem key={connection.id} value={connection.id!.toString()}>
<div className="flex items-center">
<span className="mr-1 ">{connection.name}</span>
<span className="mr-1">{connection.name}</span>

<span className="text-xs text-gray-500">
{connection?.tags?.map((tag) => tag.name).join(', ')}
Expand Down
2 changes: 1 addition & 1 deletion ...w-editor/components/Properties/components/PropertyMentionsInput/PropertyMentionsInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ const PropertyMentionsInput = forwardRef(

<ReactQuill
className={twMerge(
'h-full w-full bg-white rounded-md',
'h-full w-full rounded-md bg-white',
leadingIcon && 'border-0 pl-10',
controlType === 'TEXT_AREA' && 'min-h-32',
className
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/platform/workflow-editor/components/WorkflowExecutionsTestOutput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const WorkflowExecutionsTestOutputHeader = ({
<span
className={twMerge(
(!taskExecutionsCompleted || !triggerExecutionCompleted) && 'text-destructive',
'font-semibold uppercase text-sm'
'text-sm font-semibold uppercase'
)}
>
{taskExecutionsCompleted && triggerExecutionCompleted ? 'Workflow executed' : 'Workflow failed'}
Expand Down
19 changes: 13 additions & 6 deletions client/src/pages/platform/workflow-editor/components/WorkflowNodeDetailsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,14 @@ const WorkflowNodeDetailsPanel = ({
const operationDataMissing =
currentComponent?.operationName && (!matchingOperation?.name || !currentOperationFetched);

const tabDataExists =
(!currentNode?.trigger && !currentNode?.taskDispatcher && currentActionFetched) ||
currentNode?.taskDispatcher ||
(currentNode?.trigger &&
currentTriggerFetched &&
nodeTabs.length > 1 &&
currentNode.componentName !== 'manual');

if (!workflowNodeDetailsPanelOpen || !currentNode?.name || !currentTaskData) {
return <></>;
}
Expand Down Expand Up @@ -587,15 +595,12 @@ const WorkflowNodeDetailsPanel = ({
/>
)}

{((!currentNode?.trigger && !currentNode?.taskDispatcher && currentActionFetched) ||
currentNode?.taskDispatcher ||
(currentNode?.trigger && currentTriggerFetched)) &&
nodeTabs.length > 1 ? (
{tabDataExists && (
<div className="flex justify-center">
{nodeTabs.map((tab) => (
<Button
className={twMerge(
'grow justify-center whitespace-nowrap rounded-none border-0 border-b border-gray-200 bg-white text-sm font-medium py-5 text-gray-500 hover:border-blue-500 hover:text-blue-500 focus:border-blue-500 focus:text-blue-500 focus:outline-none',
'grow justify-center whitespace-nowrap rounded-none border-0 border-b border-gray-200 bg-white py-5 text-sm font-medium text-gray-500 hover:border-blue-500 hover:text-blue-500 focus:border-blue-500 focus:text-blue-500 focus:outline-none',
activeTab === tab?.name && 'border-blue-500 text-blue-500 hover:text-blue-500'
)}
key={tab.name}
Expand All @@ -607,7 +612,9 @@ const WorkflowNodeDetailsPanel = ({
</Button>
))}
</div>
) : (
)}

{currentNode.componentName !== 'manual' && !tabDataExists && (
<div className="flex justify-center space-x-2 border-b border-gray-200 p-2">
<Skeleton className="h-6 w-1/4" />

Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/platform/workflow-editor/components/WorkflowNodesPopoverMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const WorkflowNodesPopoverMenu = ({
<PopoverContent
align="start"
className={twMerge(
'flex p-0 will-change-auto rounded-lg',
'flex rounded-lg p-0 will-change-auto',
actionPanelOpen
? 'w-workflow-nodes-popover-menu-width'
: 'w-workflow-nodes-popover-component-menu-width'
Expand Down
Loading
Loading