Skip to content

HCK-15041: add user warning modal #242

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
Vitalii4as merged 2 commits into from
Mar 3, 2026
Merged

HCK-15041: add user warning modal #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceeb3f9
HCK-15041: add user warning modal
ivan-m-dev Mar 2, 2026
49eff96
HCK-15041: refactor getAnnotationsString to remove dbVersion parameter
ivan-m-dev Mar 3, 2026
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: 1 addition & 2 deletions ...d_engineering/ddlProvider/ddlHelpers/dualityViewFeHelper/abstractDualityViewDdlCreator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,13 @@ class AbstractDualityViewFeDdlCreator {
getCreateJsonRelationalDualityViewHeadingDdl(createViewDto, prepareName) {
const { jsonSchema, view } = createViewDto;
const template = this._ddlTemplates?.dualityView?.createJsonRelationalDualityViewHeading || '';
const dbVersion = view?.modelInfo?.dbVersion || '';

const orReplaceStatement = this._getOrReplaceStatement(view);
const forceStatement = this._getForceStatement(jsonSchema);
const editionableStatement = this._getEditionableStatement(jsonSchema);
const viewName = getViewName(view);
const ddlViewName = this._getNamePrefixedWithSchemaName(viewName, view.schemaName);
const annotations = getAnnotationsString(prepareName, dbVersion)(view.viewAnnotations);
const annotations = getAnnotationsString(prepareName)(view.viewAnnotations);

const params = {
orReplaceStatement,
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/ddlProvider/ddlHelpers/tableHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = ({ getColumnsList, checkAllKeysDeactivated, commentIfDeactivate
{ key: 'partitioning', getValue: getPartitioning },
{ key: 'selectStatement', getValue: getBasicValue('AS') },
{ key: 'tableProperties', getValue: value => _.trim(value) },
{ key: 'tableAnnotations', getValue: getAnnotationsString(prepareName, tableData?.dbVersion) },
{ key: 'tableAnnotations', getValue: getAnnotationsString(prepareName) },
]
.map(config => (tableData[config.key] ? wrap(config.getValue(tableData[config.key], tableData)) : ''))
.filter(Boolean)
Expand Down
9 changes: 4 additions & 5 deletions forward_engineering/ddlProvider/ddlProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ module.exports = (baseProvider, options, app) => {
const emptyLineSeparator = '\n\n';
const statementTerminator = ';';

const annotations = getAnnotationsString(prepareName, dbVersion)(schemaAnnotations);
const annotations = getAnnotationsString(prepareName)(schemaAnnotations);
const finalAnnotationsClause = annotations ? ' ' + annotations : '';
const preparedSchemaName = prepareName(schemaName);
const usingTryCatchWrapper = shouldUseTryCatchIfNotExistsWrapper(dbVersion);
Expand Down Expand Up @@ -228,7 +228,7 @@ module.exports = (baseProvider, options, app) => {
convertColumnDefinition(columnDefinition, template = templates.columnDefinition) {
const dbVersion = columnDefinition?.dbVersion;
const type = replaceTypeByVersion(columnDefinition.type, dbVersion);
const annotations = getAnnotationsString(prepareName, dbVersion)(columnDefinition.columnAnnotations);
const annotations = getAnnotationsString(prepareName)(columnDefinition.columnAnnotations);
const finalAnnotationsClause = annotations ? ' ' + annotations : '';

return commentIfDeactivated(
Expand Down Expand Up @@ -485,7 +485,6 @@ module.exports = (baseProvider, options, app) => {
selectStatement,
tableProperties,
tableAnnotations,
dbVersion,
}),
});
if (usingTryCatchWrapper) {
Expand Down Expand Up @@ -516,7 +515,7 @@ module.exports = (baseProvider, options, app) => {
const dbVersion = options.dbVersion || '';
const usingTryCatchWrapper = shouldUseTryCatchIfNotExistsWrapper(dbVersion);

const annotations = getAnnotationsString(prepareName, dbVersion)(index.indexAnnotations);
const annotations = getAnnotationsString(prepareName)(index.indexAnnotations);
const finalAnnotationsClause = annotations ? ' ' + annotations : '';

const shouldInsertIfNotExistsStatement = index.ifNotExist && !usingTryCatchWrapper;
Expand Down Expand Up @@ -670,7 +669,7 @@ module.exports = (baseProvider, options, app) => {
const dbVersion = _.get(viewData, 'modelInfo.dbVersion', '');
const usingTryCatchWrapper = shouldUseTryCatchIfNotExistsWrapper(dbVersion);

const annotations = getAnnotationsString(prepareName, dbVersion)(viewData.viewAnnotations);
const annotations = getAnnotationsString(prepareName)(viewData.viewAnnotations);

let createViewDdl = assignTemplates(templates.createView, {
name: viewName,
Expand Down
9 changes: 1 addition & 8 deletions forward_engineering/utils/getAnnotationsString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,12 @@ const { wrapComment } = require('./general');
* }} Annotation
*/

const UNSUPPORTED_DB_VERSIONS = new Set(['12c', '18c']);

/**
* Generates annotations string.
* @param {function} prepareName - Function to format/escape identifiers
* @param {string} [dbVersion] - Database version
* @returns {(annotations: Annotation[]) => string} - returns Annotations string (e.g: "\nANNOTATIONS (...)") or ''.
*/
const getAnnotationsString = (prepareName, dbVersion) => annotations => {
if (!dbVersion || UNSUPPORTED_DB_VERSIONS.has(dbVersion)) {
return '';
}

const getAnnotationsString = prepareName => annotations => {
if (!Array.isArray(annotations) || annotations.length === 0) {
return '';
}
Expand Down
17 changes: 16 additions & 1 deletion properties_pane/model_level/modelLevelConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ making sure that you maintain a proper JSON format.
}

*/

[
{
"lowerTab": "Details",
Expand Down Expand Up @@ -171,6 +170,22 @@ making sure that you maintain a proper JSON format.
]
},
"adapter": "adaptUnavailableTypes"
},
{
"dependency": {
"type": "or",
"values": [
{
"key": "dbVersion",
"value": "12c"
},
{
"key": "dbVersion",
"value": "18c"
}
]
},
"adapter": "adaptOracleAnnotationsForLegacy"
}
]
},
Expand Down