This repository has been archived by the owner on Aug 1, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1367 from SAP/feature/migrations-diff-view
feat: migrations diff view
- Loading branch information
Showing
19 changed files
with
501 additions
and
112 deletions.
There are no files selected for viewing
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
192 changes: 192 additions & 0 deletions
192
modules/ide/ide-migration/src/main/resources/META-INF/dirigible/ide-migration/js/changes.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,192 @@ | ||
| /* | ||
| * Copyright (c) 2022 SAP SE or an SAP affiliate company and XSK contributors | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Apache License, v2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and XSK contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| require.config({ paths: { vs: "/services/v4/web/ide-monaco/monaco-editor/min/vs" } }); | ||
| let editors = []; | ||
| migrationLaunchView.controller("ChangesViewController", [ | ||
| "$scope", | ||
| "$http", | ||
| "$messageHub", | ||
| "$timeout", | ||
| "migrationDataState", | ||
| function ($scope, $http, $messageHub, $timeout, migrationDataState) { | ||
| $scope.migrationDataState = migrationDataState; | ||
| $scope.isVisible = false; | ||
| $scope.dataLoaded = false; | ||
| let viewWidth = document.querySelectorAll(".changes-body")[0].clientWidth | 100; | ||
| $scope.isDiffViewSplit = viewWidth > 1100 ? true : false; | ||
| $scope.data = []; | ||
|
|
||
| function startMigration() { | ||
| body = { | ||
| neo: { | ||
| hostName: migrationDataState.neoHostName, | ||
| subaccount: migrationDataState.neoSubaccount, | ||
| }, | ||
| hana: { | ||
| databaseSchema: migrationDataState.schemaName, | ||
| username: migrationDataState.dbUsername, | ||
| password: migrationDataState.dbPassword, | ||
| }, | ||
| connectionId: migrationDataState.connectionId, | ||
| workspace: migrationDataState.selectedWorkspace, | ||
| du: migrationDataState.selectedDeliveryUnits, | ||
| processInstanceId: migrationDataState.processInstanceId, | ||
| }; | ||
|
|
||
| $http | ||
| .post("/services/v4/js/ide-migration/server/migration/api/migration-rest-api.mjs/continue-process", JSON.stringify(body), { | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then((response) => { | ||
| const timer = setInterval(function () { | ||
| $http | ||
| .post( | ||
| "/services/v4/js/ide-migration/server/migration/api/migration-rest-api.mjs/get-process", | ||
| JSON.stringify(body), | ||
| { | ||
| headers: { "Content-Type": "application/json" }, | ||
| } | ||
| ) | ||
| .then( | ||
| function (response) { | ||
| clearInterval(timer); | ||
| let diffViewData = response.data.diffViewData; | ||
| // Add additional keys needed by AngularJS | ||
| for (let i = 0; i < diffViewData.length; i++) { | ||
| diffViewData[i]["id"] = `m-${i}`; | ||
| diffViewData[i]["collapsed"] = false; | ||
| diffViewData[i]["excluded"] = false; | ||
| } | ||
| // Set data variable | ||
| $scope.data = diffViewData; | ||
| // Set full width for better experience | ||
| $scope.$parent.setFullWidthEnabled(true); | ||
| // Show data | ||
| $scope.dataLoaded = true; | ||
| $scope.$apply(); | ||
| }, | ||
| function (response) { | ||
| clearInterval(timer); | ||
| if (response.data) { | ||
| if ("error" in response.data) { | ||
| if ("message" in response.data.error) { | ||
| $messageHub.announceAlertError(defaultErrorTitle, response.data.error.message); | ||
| } else { | ||
| $messageHub.announceAlertError(defaultErrorTitle, defaultErrorDesc); | ||
| } | ||
| console.error(`HTTP $response.status`, response.data.error); | ||
| } else { | ||
| $messageHub.announceAlertError(defaultErrorTitle, defaultErrorDesc); | ||
| } | ||
| } else { | ||
| $messageHub.announceAlertError(defaultErrorTitle, defaultErrorDesc); | ||
| } | ||
| errorOccurred(); | ||
| } | ||
| ); | ||
| }, 1000); | ||
| }); | ||
| } | ||
|
|
||
| $scope.createDiffEditor = function (index) { | ||
| $timeout(function () { | ||
| createDiffView( | ||
| $scope.data[index].id, | ||
| $scope.data[index].type, | ||
| $scope.data[index].original, | ||
| $scope.data[index].modified, | ||
| $scope.isDiffViewSplit | ||
| ); | ||
| }); | ||
| }; | ||
|
|
||
| $scope.startMigration = function () { | ||
| // TODO | ||
| for (let i = 0; i < $scope.data.length; i++) { | ||
| if (!$scope.data[i].excluded) { | ||
| console.log("Migrating file:", $scope.data[i].file); | ||
| } | ||
| } | ||
| $scope.$parent.migrateClicked(); | ||
| }; | ||
|
|
||
| $scope.splitDiffView = function () { | ||
| $scope.isDiffViewSplit = true; | ||
| for (let i = 0; i < editors.length; i++) { | ||
| editors[i].updateOptions({ renderSideBySide: true }); | ||
| } | ||
| }; | ||
|
|
||
| $scope.inlineDiffView = function () { | ||
| $scope.isDiffViewSplit = false; | ||
| for (let i = 0; i < editors.length; i++) { | ||
| editors[i].updateOptions({ renderSideBySide: false }); | ||
| } | ||
| }; | ||
|
|
||
| $scope.previousClicked = function () { | ||
| $scope.$parent.previousClicked(); | ||
| }; | ||
|
|
||
| $messageHub.on( | ||
| "migration.changes", | ||
| function (msg) { | ||
| if ("isVisible" in msg.data) { | ||
| $scope.$apply(function () { | ||
| $scope.dataLoaded = false; | ||
| $scope.isVisible = msg.data.isVisible; | ||
| if (msg.data.isVisible) { | ||
| $scope.$parent.setBottomNavEnabled(false); | ||
| } else { | ||
| $scope.data = []; | ||
| editors = []; | ||
| } | ||
| }); | ||
| if (msg.data.isVisible) { | ||
| startMigration(); | ||
| } | ||
| } | ||
| }.bind(this) | ||
| ); | ||
| }, | ||
| ]); | ||
|
|
||
| function createDiffView(containerId, filetype, originalTxt, modifiedTxt, renderSideBySide = true) { | ||
| require(["vs/editor/editor.main"], function () { | ||
| let container = document.getElementById(containerId); | ||
| let containerLoading = document.querySelector(`#${containerId} > p:first-of-type`); | ||
| monaco.editor.setTheme(monacoTheme); | ||
| let diffEditor = monaco.editor.createDiffEditor(container, { | ||
| automaticLayout: true, | ||
| readOnly: true, | ||
| scrollBeyondLastLine: false, | ||
| enableSplitViewResizing: false, | ||
| renderSideBySide: renderSideBySide, | ||
| }); | ||
|
|
||
| const updateHeight = () => { | ||
| const topBorder = parseInt(getComputedStyle(container).getPropertyValue("border-top-width"), 10); | ||
| const bottomBorder = parseInt(getComputedStyle(container).getPropertyValue("border-bottom-width"), 10); | ||
| const contentHeight = diffEditor.getModifiedEditor().getContentHeight() + topBorder + bottomBorder; | ||
| container.style.height = `${contentHeight}px`; | ||
| }; | ||
|
|
||
| diffEditor.getModifiedEditor().onDidContentSizeChange(updateHeight); | ||
| diffEditor.setModel({ | ||
| original: monaco.editor.createModel(originalTxt, filetype), | ||
| modified: monaco.editor.createModel(modifiedTxt, filetype), | ||
| }); | ||
|
|
||
| editors.push(diffEditor); | ||
| containerLoading.remove(); | ||
| }); | ||
| } |
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
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
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
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
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
Oops, something went wrong.