Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit c34bd5b

Browse files
ghillertghillert
committed
gh-165 Remove bulk-registration of apps from the UI
1 parent f92c009 commit c34bd5b

File tree

2 files changed

+2
-113
lines changed

2 files changed

+2
-113
lines changed

‎ui/app/scripts/app/controllers/bulk-import-apps.js

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
define(function () {
2323
'use strict';
2424

25-
var STREAM_APP_STARTERS_VERSION_SUFFIX = 'Avogadro-SR1-';
26-
var TASK_APP_STARTERS_VERSION_SUFFIX = 'Addison-GA-';
27-
2825
return ['$scope', 'AppService', 'DataflowUtils', '$modal', '$state',
2926
function ($scope, appService, utils, $modal, $state) {
3027

@@ -36,46 +33,6 @@ define(function () {
3633
};
3734
}
3835

39-
function newStreamAppStarters() {
40-
return [
41-
{
42-
name: 'Maven based Stream Applications with RabbitMQ Binder',
43-
uri: 'http://bit.ly/' + STREAM_APP_STARTERS_VERSION_SUFFIX + 'stream-applications-rabbit-maven',
44-
force: false
45-
},
46-
{
47-
name: 'Maven based Stream Applications with Kafka Binder',
48-
uri: 'http://bit.ly/' + STREAM_APP_STARTERS_VERSION_SUFFIX + 'stream-applications-kafka-10-maven',
49-
force: false
50-
},
51-
{
52-
name: 'Docker based Stream Applications with RabbitMQ Binder',
53-
uri: 'http://bit.ly/' + STREAM_APP_STARTERS_VERSION_SUFFIX + 'stream-applications-rabbit-docker',
54-
force: false
55-
},
56-
{
57-
name: 'Docker based Stream Applications with Kafka Binder',
58-
uri: 'http://bit.ly/' + STREAM_APP_STARTERS_VERSION_SUFFIX + 'stream-applications-kafka-10-docker',
59-
force: false
60-
}
61-
];
62-
}
63-
64-
function newTaskAppStarters() {
65-
return [
66-
{
67-
name: 'Maven based Task Applications',
68-
uri: 'http://bit.ly/' + TASK_APP_STARTERS_VERSION_SUFFIX + 'task-applications-maven',
69-
force: false
70-
},
71-
{
72-
name: 'Docker based Task Applications',
73-
uri: 'http://bit.ly/' + TASK_APP_STARTERS_VERSION_SUFFIX + 'task-applications-docker',
74-
force: false
75-
}
76-
];
77-
}
78-
7936
// Basic URI validation RegEx pattern
8037
$scope.uriPattern = '^([a-z0-9-]+:\/\/)([\\w\\.:-]+)(\/[\\w\\.:-]+)*$';
8138

@@ -109,8 +66,6 @@ define(function () {
10966
$scope.apps.uri = '';
11067
$scope.apps.force = false;
11168
});
112-
$scope.streamAppStarters = newStreamAppStarters();
113-
$scope.taskAppStarters = newTaskAppStarters();
11469
});
11570
promise.catch(function(error) {
11671
utils.growl.error(error.data[0].message);
@@ -132,8 +87,6 @@ define(function () {
13287
};
13388

13489
$scope.apps = newBulkAppImport();
135-
$scope.streamAppStarters = newStreamAppStarters();
136-
$scope.taskAppStarters = newTaskAppStarters();
13790

13891
$scope.$apply();
13992

‎ui/app/scripts/app/views/bulk-import-apps.html

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ <h2 class="text-center">OR</h2>
3535
<div class="col-sm-7">
3636
<textarea id="appsProperties" autofocus ng-model="apps.appsProperties" rows="5" ng-list="&#10;" ng-trim="false"
3737
class="form-control" placeholder="Example:
38-
task.timestamp=maven://org.springframework.cloud.task.app:timestamp-task:1.0.0.BUILD-SNAPSHOT
39-
task.spark-client=maven://org.springframework.cloud.task.app:spark-client-task:1.0.0.BUILD-SNAPSHOT"
38+
task.timestamp=maven://o.s.cloud.task.app:timestamp-task:1.2.3.RELEASE
39+
task.spark-client=maven://o.s.cloud.task.app:spark-client-task:1.2.3.RELEASE"
4040
></textarea>
4141
<span class="glyphicon glyphicon-warning-sign form-control-feedback" ng-show="bulkImportAppsForm.appsProperties.$invalid"></span>
4242
<p class="help-block">Please provide a valid properties where the keys are formatted as
@@ -68,70 +68,6 @@ <h2 class="text-center">OR</h2>
6868
</div>
6969
</form>
7070

71-
<h2>Out-of-the-box Stream app-starters</h2>
72-
73-
<table class="table form-table">
74-
<col width="80%">
75-
<col width="10%">
76-
<col width="10%">
77-
<thead>
78-
<tr>
79-
<th>Name</th>
80-
<th class="text-center">Force <a dataflow-popover=".force-help-content" title="Force"><span class="glyphicon glyphicon-question-sign"></span></a></th>
81-
<th class="text-center">Action</th>
82-
</tr>
83-
</thead>
84-
<tbody>
85-
<tr ng-repeat="item in streamAppStarters">
86-
<td>
87-
{{item.name}}
88-
</td>
89-
<td class="text-center">
90-
<input type="checkbox" name="{{$index + '_force'}}" ng-model="item.force">
91-
</td>
92-
<td class="action-column text-center">
93-
<button type="button" ng-click="bulkImportApps(item)"
94-
class="btn btn-sm btn-default"
95-
title="Bulk Import Apps"
96-
><span class="glyphicon glyphicon-import"></span>
97-
</button>
98-
</td>
99-
</tr>
100-
</tbody>
101-
</table>
102-
103-
<h2>Out-of-the-box Task app-starters</h2>
104-
105-
<table class="table form-table">
106-
<col width="80%">
107-
<col width="10%">
108-
<col width="10%">
109-
<thead>
110-
<tr>
111-
<th>Name</th>
112-
<th class="text-center">Force <a dataflow-popover=".force-help-content" title="Force"><span class="glyphicon glyphicon-question-sign"></span></a></th>
113-
<th class="text-center">Action</th>
114-
</tr>
115-
</thead>
116-
<tbody>
117-
<tr ng-repeat="item in taskAppStarters">
118-
<td>
119-
{{item.name}}
120-
</td>
121-
<td class="text-center">
122-
<input type="checkbox" name="{{$index + '_force'}}" ng-model="item.force">
123-
</td>
124-
<td class="action-column text-center">
125-
<button type="button" ng-click="bulkImportApps(item)"
126-
class="btn btn-sm btn-default"
127-
title="Bulk Import Apps"
128-
><span class="glyphicon glyphicon-import"></span>
129-
</button>
130-
</td>
131-
</tr>
132-
</tbody>
133-
</table>
134-
13571
<div class="force-help-content hide">
13672
<span class="force-help-content">By checking <strong>force</strong>, the applications will be imported and installed
13773
even if it already exists but only if not being used already.</span>

0 commit comments

Comments
 (0)