feat(CodeEditor): Changing schemas based on the content #172
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
lordrip
reviewed
Oct 2, 2023
mmelko
force-pushed
the
schema-config
branch
2 times, most recently
from
666a5ae to
22d68a7
Compare
|
I updated the PR, incorporated your suggestion and:
If the names are off .. I can change them :) |
lordrip
reviewed
Oct 3, 2023
| @@ -14,25 +16,30 @@ interface SourceCodeProps { | |||
|
|
|||
| export const SourceCode: FunctionComponent<SourceCodeProps> = (props) => { | |||
| const editorRef = useRef<Parameters<EditorDidMount>[0] | null>(null); | |||
| const camelYamlDslSchema = useSchemasStore((state) => state.schemas.camelYamlDsl); | |||
| //const schemas = useSchemasStore((state) => state.schemas); | |||
There was a problem hiding this comment.
Suggested change
| //const schemas = useSchemasStore((state) => state.schemas); |
packages/ui/src/hooks/entities.ts
Outdated
Comment on lines
9
to
10
| import { isKamelet } from '../camel-utils/is-kamelet'; | ||
| import { isIntegration } from '../camel-utils/is-integration'; |
There was a problem hiding this comment.
[minor] could we add these tokens to the camel-utils/index.ts barrel file so we could have a single line bringing all the isXXX functions?
packages/ui/src/hooks/entities.ts
Outdated
| import { BaseCamelEntity } from '../models/camel-entities'; | ||
| import { BaseVisualCamelEntity } from '../models/visualization/base-visual-entity'; | ||
| import { CamelRoute, KameletBinding, Pipe } from '../models/visualization/flows'; | ||
| import { Beans } from '../models/visualization/metadata'; | ||
| import { EventNotifier, isDefined } from '../utils'; | ||
| import { isKamelet } from '../camel-utils/is-kamelet'; | ||
| import { isIntegration } from '../camel-utils/is-integration'; | ||
| import { SourceSchemaType } from '../models/camel-entities/SourceSchemaType'; |
There was a problem hiding this comment.
Probably this could come from camel-entities directly as well
packages/ui/src/hooks/entities.ts
Outdated
Comment on lines
29
to
27
| const [currentSchemaType, setCurrentSchemaType] = useState<SourceSchemaType>(SourceSchemaType.Route); | ||
| /** Set the Source Code and updates the Entities */ | ||
|
|
There was a problem hiding this comment.
Suggested change
| const [currentSchemaType, setCurrentSchemaType] = useState<SourceSchemaType>(SourceSchemaType.Route); | |
| /** Set the Source Code and updates the Entities */ | |
| const [currentSchemaType, setCurrentSchemaType] = useState<SourceSchemaType>(SourceSchemaType.Route); | |
| /** Set the Source Code and updates the Entities */ |
packages/ui/src/hooks/entities.ts
Outdated
| const entitiesHolder = rawEntities.reduce( | ||
| (acc, rawEntity) => { | ||
| const entity = getEntity(rawEntity); | ||
| setCurrentSchemaType(getEntityType(rawEntity)); |
There was a problem hiding this comment.
[important] I think we don't need to set the schema inside of this iteration, as it leads to setting many times the same value, potentially firing subsequent updates.
I guess that it will be enough to inspect only the first element of the rawEntities array to determine which schema to apply just once.
lordrip
reviewed
Oct 3, 2023
Comment on lines
41
to
50
| setSchema(name: string, schema: Schema) { | ||
| const type: SourceSchemaType = SourceSchemaType[name]; | ||
| if (name === 'camelYamlDsl') { | ||
| this.config[SourceSchemaType.Route].schema = schema; | ||
| } | ||
| if (type) { | ||
| this.config[type].schema = schema; | ||
| } | ||
| } |
There was a problem hiding this comment.
I saw the TS issue that you mentioned and I made a few changes to the method:
setSchema(name: string | SourceSchemaType, schema: Schema) {
if (name === 'camelYamlDsl') {
this.config[SourceSchemaType.Route].schema = schema;
return;
}
if (isEnumType(name, SourceSchemaType)) {
const type: SourceSchemaType = SourceSchemaType[name];
this.config[type].schema = schema;
}
}The isEnumType function is a special type of function, a Typeguard function, now called Type predicate
It's defined like the following:
function isEnumType<T extends object>(type: unknown, enumObject: T): type is keyof T {
return typeof type === 'string' && (type as keyof typeof enumObject) in enumObject;
}You could use that function and place it in a utils folder, maybe alongside of packages/ui/src/utils/is-enum-type.ts
Define CurrentEntity in the EntitiesContextResult
introduce the SourceSchemaType enum
…w the naming conventions
mmelko
changed the title
mmelko
changed the title
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.
This PR introduces EntitySchemaConfig which is meant to be to replace SchemasStore. Schemas should be possible to configure within the entities-context. Also this PR introduces
currentEntityfield which is used for holding the currentEntityType. After change of thecurrentEntityproper schema should be also reloaded in the CodeEditor.related to #136 #135