CB-4067 Migrate Connection form to form template #3288
Conversation
This file contains 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
Wroud
requested changes
Mar 25, 2025
webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
Outdated
Show resolved
Hide resolved
webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
Outdated
Show resolved
Hide resolved
webapp/packages/plugin-connection-search/src/Search/ConnectionSearchService.ts
Outdated
Show resolved
Hide resolved
.../plugin-connections-administration/src/Administration/Connections/CreateConnectionService.ts
Outdated
Show resolved
Hide resolved
.../plugin-connections-administration/src/Administration/Connections/CreateConnectionService.ts
Outdated
Show resolved
Hide resolved
Wroud
requested changes
Mar 25, 2025
|
|
||
| const { selected } = useTab(tabId); | ||
| const accessPart = getConnectionFormAccessPart(formState); | ||
| const [initialFormMode] = useState<FormMode>(formState.mode); |
There was a problem hiding this comment.
I think that you can use formState.mode directly, it will reflect actual state of form
There was a problem hiding this comment.
no. cause after saving OptionsPart we set mode to edit and this will show lead to incorrect behavior
webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
Outdated
Show resolved
Hide resolved
webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOptionsPart.ts
Outdated
Show resolved
Hide resolved
Comment on lines
121
to
127
| const isProjectOutdated = this.projectInfoResource.isOutdated(this.formState.state.projectId); | ||
|
|
||
| if (!this.connectionKey) { | ||
| return isProjectOutdated; | ||
| } | ||
|
|
||
| return this.connectionInfoResource.isOutdated(this.connectionKey) || isProjectOutdated; |
There was a problem hiding this comment.
Suggested change
| const isProjectOutdated = this.projectInfoResource.isOutdated(this.formState.state.projectId); | |
| if (!this.connectionKey) { | |
| return isProjectOutdated; | |
| } | |
| return this.connectionInfoResource.isOutdated(this.connectionKey) || isProjectOutdated; | |
| if (this.projectInfoResource.isOutdated(this.formState.state.projectId)) { | |
| return true; | |
| } | |
| return this.connectionKey && this.connectionInfoResource.isOutdated(this.connectionKey); |
Comment on lines
134
to
137
| this.setInitialState({ | ||
| ...defaults, | ||
| ...this.state, | ||
| }); |
There was a problem hiding this comment.
setInitialState should set the initial state of the form. In case we create new entity we should always return the initial state object, we should not mix it with state this will lead to the form being detected as not changed because after calling the loader initial state and state will be equal
Comment on lines
216
to
224
| if (model.id === info?.authModel) { | ||
| if (info.authProperties) { | ||
| for (const property of info.authProperties) { | ||
| if (!property.features.includes('password')) { | ||
| this.state.credentials[property.id!] = property.value; | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
i think that we need to:
- compare
model.idwiththis.initialState.authModelId - when different reset
state.credentialsto{}(empty object) - when equal, spread the initial state to the current state:
this.state.credentials = { ...this.initialState.credentials }
There was a problem hiding this comment.
seems fine after few tests, thanks
Comment on lines
240
to
241
| config.host = this.state.host || driver?.defaultServer || 'localhost'; | ||
| config.port = this.state.port || driver?.defaultPort; |
There was a problem hiding this comment.
using state is unsafe here because it may affect initial state
Comment on lines
264
to
267
| if (this.formState.mode === 'edit') { | ||
| this.state.connectionId = this.state.connectionId; | ||
| } | ||
|
|
webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOptionsPart.ts
Outdated
Show resolved
Hide resolved
Comment on lines
309
to
322
| const info = | ||
| this.state.connectionId && this.formState.state.projectId | ||
| ? this.connectionInfoResource.get(createConnectionParam(this.formState.state.projectId, this.state.connectionId)) | ||
| : undefined; | ||
|
|
||
| const properties = await this.getConnectionAuthModelProperties(this.state.authModelId, info); | ||
| const passwordProperty = properties.find(property => property.features.includes('password')); | ||
| const isPasswordEmpty = | ||
| passwordProperty && | ||
| (this.state.credentials?.[passwordProperty.id!] === passwordProperty.defaultValue || !this.state.credentials?.[passwordProperty.id!]); | ||
|
|
||
| if (isCredentialsChanged(properties, this.state.credentials!)) { | ||
| this.state.credentials = prepareDynamicProperties(properties, toJS(this.state.credentials!)); | ||
| } |
There was a problem hiding this comment.
probably you can use this.initialState.credentials instead (to compare for changes)
There was a problem hiding this comment.
lets not. it has the logic with file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.