Skip to content
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

HCK-7052 - Fix sonar reports #136

Merged
merged 3 commits into from
Jul 12, 2024
Merged

HCK-7052 - Fix sonar reports #136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c932f6
Fix sonar reports
bigorn0 Jul 3, 2024
cbdf038
Update typeHelper.js
bigorn0 Jul 3, 2024
72f5ac5
Merge branch 'develop' into fix-sonar-reports
chulanovskyi-bs Jul 12, 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
4 changes: 2 additions & 2 deletions forward_engineering/helpers/alterScriptFromDeltaHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ const getPropertiesForUpdateTable = (properties = []) => {
}
const newField = value.compMod?.newField || {};
const oldField = value.compMod?.oldField || {};
Object.entries(newField).map(([keyNewField, valueNewField]) => {
Object.entries(newField).forEach(([keyNewField, valueNewField]) => {
if (oldField[keyNewField] !== valueNewField) {
value[keyNewField] = valueNewField;
}
if (keyNewField === 'name' && oldField[keyNewField] !== valueNewField) {
name = valueNewField;
}
}
});
return [name, value];
});
Expand Down
10 changes: 5 additions & 5 deletions forward_engineering/helpers/typeHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const ifType = type => {
const getModeType = (type, defaultType, udtTypeMap) => {
if (type) {
const mode = getFieldConfig(type, 'mode');
const definedType = mode && mode.options ? mode.options[0] : type;
const definedType = mode?.options ? mode.options[0] : type;

return getHandlerByType(
type,
Expand Down Expand Up @@ -91,7 +91,7 @@ const getStructuralTypeHandler = (type, isNeedToBeFrozen, udtTypeMap) => {
const typeConfig = getTypeConfig(arraySchema.type);
if (typeConfig.subtypes && arraySchema.subtype) {
const subTypeConfig = typeConfig.subtypes[arraySchema.subtype];
if (subTypeConfig && subTypeConfig.childValueType) {
if (subTypeConfig?.childValueType) {
return getModeType(subTypeConfig.childValueType, defaultType, udtTypeMap);
}
}
Expand All @@ -113,7 +113,7 @@ const getStructuralTypeHandler = (type, isNeedToBeFrozen, udtTypeMap) => {
const typeConfig = getTypeConfig(objectSchema.type);
if (typeConfig.subtypes && objectSchema.subtype) {
const subTypeConfig = typeConfig.subtypes[objectSchema.subtype];
if (subTypeConfig && subTypeConfig.childValueType) {
if (subTypeConfig?.childValueType) {
return getModeType(subTypeConfig.childValueType, defaultType, udtTypeMap);
}
}
Expand All @@ -134,7 +134,7 @@ const getStructuralTypeHandler = (type, isNeedToBeFrozen, udtTypeMap) => {
if (nestedType !== undefined) {
return nestedType;
} else {
('');
return '';
bigorn0 marked this conversation as resolved.
Show resolved Hide resolved
}
} else {
return 'text';
Expand All @@ -157,7 +157,7 @@ const getStructuralTypeHandler = (type, isNeedToBeFrozen, udtTypeMap) => {
const keyType = canTypeHaveSubtype(propertyData.keyType, propertyData.keySubtype)
? propertyData.keySubtype
: getModeType(propertyData.keyType, 'text', udtTypeMap);
const valueType = getValueTypeFromObject(propertyData, 'text', udtTypeMap, propertyName);
const valueType = getValueTypeFromObject(propertyData, 'text', udtTypeMap);

return `map<${keyType}, ${valueType}>`;
};
Expand Down
Loading