Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
40 changes: 19 additions & 21 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/main/frontend/app/routes/datamapper/property-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,10 @@ function PropertyList({ config, configDispatch }: PropertyListProperties) {
setEditingMapping,
openMapping,
})
//UseMemo is used here to ensure nodetype is not changed throughout rerenders. If the variable is updated reactflow throws a warning in the console;
//Don't add flow as dependency here, it'll become an infinite loop flow changes every rerender --> updates the memo --> the memo updates the nodetypes --> updating the nodetypes causes react to trigger a rerender resulting in a infinite loop
/*
* UseMemo is used here to ensure nodetype is not changed throughout rerenders. If the variable is updated reactflow throws a warning in the console;
* Don't add flow as dependency here, it'll become an infinite loop flow changes every rerender --> updates the memo --> the memo updates the nodetypes --> updating the nodetypes causes react to trigger a rerender resulting in a infinite loop
*/
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [openMapping])

Expand Down
11 changes: 1 addition & 10 deletions src/main/frontend/app/routes/settings/settings-menu-items.ts
Comment thread
stijnpotters1 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import type { TreeItem } from 'react-complex-tree'
import React from 'react'
import WidgetIcon from '/icons/solar/Widget.svg?react'
import RulerCrossPenIcon from '/icons/solar/Ruler Cross Pen.svg?react'
import CodeIcon from '/icons/solar/Code.svg?react'
import GeneralSettings from '~/routes/settings/pages/general-settings'
import StudioSettings from '~/routes/settings/pages/studio-settings'
import ProjectSettings from './pages/project-settings'
Expand All @@ -19,7 +18,7 @@ export interface SettingsMenuItemData {
const SettingsMenuItems = {
root: {
index: 'root',
children: ['general', 'projects', 'studio', 'editor'],
children: ['general', 'projects', 'studio'],
data: {
title: '',
description: '',
Expand Down Expand Up @@ -51,14 +50,6 @@ const SettingsMenuItems = {
content: StudioSettings,
},
},
editor: {
index: 'editor',
data: {
title: 'Editor',
description: 'Editor settings',
icon: CodeIcon,
},
},
} as Record<string, SettingsMenuItem>

export default SettingsMenuItems
8 changes: 5 additions & 3 deletions src/main/frontend/app/utils/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ export async function apiFetch<T>(path: string, options?: RequestInit): Promise<
const response = await fetch(apiUrl(path), {
...options,
headers,
/* credentials is a requirement for csrf according to multiple sources, but seems to work fine without it ??
It also breaks because of our CORS configuration which will result in
"credential is not supported if the CORS header 'Access-Control-Allow-Origin' is '*'" */
/*
* credentials is a requirement for csrf according to multiple sources, but seems to work fine without it ??
* It also breaks because of our CORS configuration which will result in
* "credential is not supported if the CORS header 'Access-Control-Allow-Origin' is '*'"
*/
// credentials: 'include',
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,10 @@ export function sequentialReposition(nodes: Node[], startParentId: string, getNo

//Set height for parent
nodes = nodes.map((node) => (node.id === parentId ? { ...node, height: yOffset } : node))
//Add padding at the bottom of a group
//Move up one
/*
* Add padding at the bottom of a group
* Move up one
*/
parentId = getNodeFunc(parentId)?.parentId ?? null
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/frontend/app/utils/flow-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export function getEdgeLabelFromHandle(node: FlowNode | undefined, handleId: str
return matched?.type?.toLowerCase() ?? 'success'
}

/** Converts the tagname of a non capitalized element that has a classname attribute to the last part of said classname, e.g.:
/**
* Converts the tagname of a non capitalized element that has a classname attribute to the last part of said classname, e.g.:
* <pipe name="uploadFiles" className="org.frankframework.pipes.ForEachChildElementPipe" />
* Becomes <ForEachChildElementPipe name="uploadFiles" />
*/
Expand Down
78 changes: 41 additions & 37 deletions src/main/frontend/cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
/// <reference types="cypress" />
// ***********************************************
// This example commands.ts shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add('login', (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
//
// declare global {
// namespace Cypress {
// interface Chainable {
// login(email: string, password: string): Chainable<void>
// drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
// dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
// visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
// }
// }
// }
/* eslint-disable unicorn/no-empty-file */

/*
* / <reference types="cypress" />
***********************************************
*This example commands.ts shows you how to
*create various custom commands and overwrite
*existing commands.
*
*For more comprehensive examples of custom
*commands please read more here:
*https://on.cypress.io/custom-commands
***********************************************
*
*
*-- This is a parent command --
*Cypress.Commands.add('login', (email, password) => { ... })
*
*
*-- This is a child command --
*Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
*
*
*-- This is a dual command --
*Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
*
*
*-- This will overwrite an existing command --
*Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
*
*declare global {
* namespace Cypress {
* interface Chainable {
* login(email: string, password: string): Chainable<void>
* drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
* dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
* visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
* }
* }
*}
*/
30 changes: 16 additions & 14 deletions src/main/frontend/cypress/support/e2e.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
// ***********************************************************
// This example support/e2e.ts is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************
/*
***********************************************************
*This example support/e2e.ts is processed and
*loaded automatically before your test files.
*
*This is a great place to put global configuration and
*behavior that modifies Cypress.
*
*You can change the location of this file or turn off
*automatically serving support files with the
*'supportFile' configuration option.
*
*You can read more here:
*https://on.cypress.io/configuration
***********************************************************
*/

// Import commands.js using ES2015 syntax:
import './commands'
4 changes: 4 additions & 0 deletions src/main/frontend/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import reactHooksPlugin from 'eslint-plugin-react-hooks';
import prettierPlugin from 'eslint-plugin-prettier';
import unicorn from 'eslint-plugin-unicorn';
import sonarjs from 'eslint-plugin-sonarjs';
import stylistic from '@stylistic/eslint-plugin';
import js from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';

Expand Down Expand Up @@ -35,6 +36,7 @@ export default [
'react-hooks': reactHooksPlugin,
'prettier': prettierPlugin,
'sonarjs': sonarjs,
'@stylistic': stylistic,
},
settings: {
react: {
Expand Down Expand Up @@ -64,6 +66,8 @@ export default [

'prettier/prettier': 'warn',

'@stylistic/multiline-comment-style': ['error', 'starred-block'],

'sonarjs/cognitive-complexity': 'warn',
'sonarjs/no-duplicate-string': 'warn',
},
Expand Down
Loading
Loading