Skip to content

Commit

Permalink
Merge pull request #1179 from StanZGenchev/repo-registry-fixes
Browse files Browse the repository at this point in the history 
Fixes #1178 #1177 #1176 #1175
  • Loading branch information
@ThuF
ThuF authored Sep 28, 2021
2 parents fd6d009 + 82acc64 commit 9cae256
Show file tree
Hide file tree
Showing 10 changed files with 1,190 additions and 1,192 deletions.
2 changes: 1 addition & 1 deletion ide/ui/ide-core/src/main/resources/META-INF/dirigible/ide-core/ui/ui-core-ng-modules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ angular.module('ideUiCore', ['ngResource'])
msg.data.file.path,
msg.data.file.label,
msg.data.file.contentType,
msg.data.editor,
msg.data.editor || "editor",
msg.data.extraArgs
);
});
Expand Down
2 changes: 1 addition & 1 deletion ide/ui/ide-core/src/main/resources/META-INF/dirigible/ide-core/ui/ui-layout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function LayoutController(viewRegistry, messageHub) {
}
};

this.openEditor = function (resourcePath, resourceLabel, contentType, editorId, extraArgs = null) {
this.openEditor = function (resourcePath, resourceLabel, contentType, editorId = "editor", extraArgs = null) {
let newItemConfig = {
id: resourcePath,
title: resourceLabel,
Expand Down
140 changes: 71 additions & 69 deletions ide/ui/ide-database/src/main/resources/META-INF/dirigible/ide-database/sql/result.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,95 +12,97 @@
<html lang="en">

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Eclipse Dirigible &trade; | Database </title>
<title>Eclipse Dirigible &trade; | Database </title>

<link rel="shortcut icon" type="image/png" href="/services/v4/web/resources/images/favicon.png" />
<link rel="shortcut icon" type="image/png" href="/services/v4/web/resources/images/favicon.png" />

<link href="/webjars/fontawesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
<link href="/webjars/fontawesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">

<!-- jQuery -->
<script type="text/javascript" src="/webjars/jquery/3.4.1/jquery.min.js"></script>
<!-- jQuery -->
<script type="text/javascript" src="/webjars/jquery/3.4.1/jquery.min.js"></script>

<!-- AngularJS -->
<script type="text/javascript" src="/webjars/angularjs/1.8.2/angular.min.js"></script>
<script type="text/javascript" src="/webjars/angularjs/1.8.2/angular-resource.min.js"></script>
<!-- AngularJS -->
<script type="text/javascript" src="/webjars/angularjs/1.8.2/angular.min.js"></script>
<script type="text/javascript" src="/webjars/angularjs/1.8.2/angular-resource.min.js"></script>

<!-- Twitter Bootstrap with Theme Support -->
<link rel="stylesheet" href="/services/v4/js/theme/resources.js/bootstrap.min.css">
<script type="text/javascript" src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<!-- Twitter Bootstrap with Theme Support -->
<link rel="stylesheet" href="/services/v4/js/theme/resources.js/bootstrap.min.css">
<script type="text/javascript" src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>

<!-- Custom IDE Styles -->
<link type="text/css" rel="stylesheet" href="/services/v4/js/theme/resources.js/ide.css" />
<!-- Custom IDE Styles -->
<link type="text/css" rel="stylesheet" href="/services/v4/js/theme/resources.js/ide.css" />

<script type="text/javascript" src="/services/v4/web/ide-core/ui/message-hub.js"></script>
<script type="text/javascript" src="/services/v4/web/ide-core/ui/message-hub.js"></script>

</head>

<body ng-app="database-table" ng-controller="DatabaseTableController">
<h4 ng-hide="hasMultipleProcedureResults" ng-show="result">{{result}}</h4>
<div class="tableFixHead">
<table class="table table-striped" ng-hide="hasMultipleProcedureResults" ng-show="columns">
<thead>
<tr>
<th ng-repeat="column in columns">{{column}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in rows">
<td ng-repeat="cell in row">
<div class="tdSingleLine">
{{cell}}
</div>
</td>
</tr>
</tbody>
</table>

<div ng-show="hasMultipleProcedureResults">
<ul class="nav nav-tabs">
<li ng-class="{active: $index === 0}" ng-repeat="next in procedureResults"><a data-toggle="pill"
href="#{{$index + 1}}">Result {{$index + 1}}</a></li>
</ul>

<div class="tab-content">
<div ng-repeat="next in procedureResults" id="{{$index + 1}}" class="tab-pane fade in"
ng-class="{active: $index === 0}">
<table class="table table-striped"">
<h4 ng-hide="hasMultipleProcedureResults" ng-show="result">{{result}}</h4>
<div class="tableFixHead">
<table class="table table-striped" ng-hide="hasMultipleProcedureResults" ng-show="columns">
<thead>
<tr>
<th ng-repeat="column in columns">{{column}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in rows">
<td ng-repeat="cell in row">
<div class="tdSingleLine">
{{cell}}
</div>
</td>
</tr>
</tbody>
</table>

<div ng-show="hasMultipleProcedureResults">
<ul class="nav nav-tabs">
<li ng-class="{active: $index === 0}" ng-repeat="next in procedureResults"><a data-toggle="pill"
href="#{{$index + 1}}">Result {{$index + 1}}</a></li>
</ul>

<div class="tab-content">
<div ng-repeat="next in procedureResults" id="{{$index + 1}}" class="tab-pane fade in"
ng-class="{active: $index === 0}">
<table class="table table-striped"">
<thead>
<tr>
<th ng-repeat=" column in procedureResults[$index].columns">{{column}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in procedureResults[$index].rows">
<td ng-repeat="cell in row">
<div class="tdSingleLine">
{{cell}}
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>

</div>

<script>
angular.module('database-table', [])
</tr>
</thead>
<tbody>
<tr ng-repeat="row in procedureResults[$index].rows">
<td ng-repeat="cell in row">
<div class="tdSingleLine">
{{cell}}
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>

</div>

<script>
angular.module('database-table', [])
.controller('DatabaseTableController', function ($scope, $http) {

let messageHub = new FramesMessageHub();

let csrfToken = null;

$http.get("", { headers: { "X-CSRF-Token": "Fetch" } }).then(function (data, statusCode, headers) {
csrfToken = headers()["x-csrf-token"];
$http.get("", { headers: { "X-CSRF-Token": "Fetch" } }).then(function (response) {
csrfToken = response.headers()["x-csrf-token"];
}, function (response) {
console.error("Error getting token.");
});

$scope.database = "local";
Expand Down Expand Up @@ -219,5 +221,5 @@ <h4 ng-hide="hasMultipleProcedureResults" ng-show="result">{{result}}</h4>
$scope.procedureResults = null;
}
});
</script>
</script>
</body>
Loading

0 comments on commit 9cae256

Please sign in to comment.