Skip to content

Commit 9d16569

Browse files
author
OpenShift Bot
authored
Merge pull request #1308 from jeff-phillips-18/catalog-integration
Merged by openshift-bot
2 parents d5e1aba + bbedd2d commit 9d16569

20 files changed

+1327
-4416
lines changed

‎app/index.html

+2-11
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ <h1>JavaScript Required</h1>
154154
<script src="bower_components/angular-moment/angular-moment.js"></script>
155155
<script src="bower_components/angular-utf8-base64/angular-utf8-base64.js"></script>
156156
<script src="bower_components/file-saver/FileSaver.js"></script>
157+
<script src="bower_components/origin-web-common/dist/origin-web-common.js"></script>
157158
<!-- endbower -->
158159
<!-- endbuild -->
159160

@@ -164,25 +165,16 @@ <h1>JavaScript Required</h1>
164165

165166
<script src="scripts/constants.js"></script>
166167
<script src="scripts/app.js"></script>
167-
<script src="scripts/services/logger.js"></script>
168168
<script src="scripts/services/base64util.js"></script>
169-
<script src="scripts/services/ws.js"></script>
170-
<script src="scripts/services/userstore.js"></script>
171-
<script src="scripts/services/api.js"></script>
172-
<script src="scripts/services/auth.js"></script>
173-
<script src="scripts/services/authorization.js"></script>
174-
<script src="scripts/services/data.js"></script>
175169
<script src="scripts/services/discovery.js"></script>
176170
<script src="scripts/services/projects.js"></script>
177171
<script src="scripts/services/applicationGenerator.js"></script>
178172
<script src="scripts/services/alertMessage.js"></script>
179-
<script src="scripts/services/login.js"></script>
180-
<script src="scripts/services/logout.js"></script>
181173
<script src="scripts/services/navigate.js"></script>
182174
<script src="scripts/services/nameGenerator.js"></script>
183175
<script src="scripts/services/tasks.js"></script>
184-
<script src="scripts/services/notification.js"></script>
185176
<script src="scripts/services/imageStreamResolver.js"></script>
177+
<script src="scripts/services/containerWebSocket.js"></script>
186178
<script src="scripts/services/util.js"></script>
187179
<script src="scripts/services/builds.js"></script>
188180
<script src="scripts/services/deployments.js"></script>
@@ -193,7 +185,6 @@ <h1>JavaScript Required</h1>
193185
<script src="scripts/services/metrics.js"></script>
194186
<script src="scripts/services/metricsCharts.js"></script>
195187
<script src="scripts/services/storage.js"></script>
196-
<script src="scripts/services/constants.js"></script>
197188
<script src="scripts/services/limits.js"></script>
198189
<script src="scripts/services/routes.js"></script>
199190
<script src="scripts/services/charts.js"></script>

‎app/scripts/app.js

+3-132
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ angular
2929
'ui.select',
3030
'angular-inview',
3131
'angularMoment',
32-
'ab-base64'
32+
'ab-base64',
33+
'openshiftCommon'
3334
])
3435
.config(function ($routeProvider) {
3536
$routeProvider
@@ -417,9 +418,6 @@ angular
417418
redirectTo: '/'
418419
});
419420
})
420-
.constant("API_CFG", _.get(window.OPENSHIFT_CONFIG, "api", {}))
421-
.constant("APIS_CFG", _.get(window.OPENSHIFT_CONFIG, "apis", {}))
422-
.constant("AUTH_CFG", _.get(window.OPENSHIFT_CONFIG, "auth", {}))
423421
.constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL"))
424422
.constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL"))
425423
.constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides"))
@@ -462,18 +460,7 @@ angular
462460
// See http://momentjs.com/docs/#/displaying/format/
463461
titleFormat: 'LLL'
464462
})
465-
.config(function($httpProvider, AuthServiceProvider, RedirectLoginServiceProvider, AUTH_CFG, API_CFG, kubernetesContainerSocketProvider) {
466-
$httpProvider.interceptors.push('AuthInterceptor');
467-
468-
AuthServiceProvider.LoginService('RedirectLoginService');
469-
AuthServiceProvider.LogoutService('DeleteTokenLogoutService');
470-
// TODO: fall back to cookie store when localStorage is unavailable (see known issues at http://caniuse.com/#feat=namevalue-storage)
471-
AuthServiceProvider.UserStore('LocalStorageUserStore');
472-
473-
RedirectLoginServiceProvider.OAuthClientID(AUTH_CFG.oauth_client_id);
474-
RedirectLoginServiceProvider.OAuthAuthorizeURI(AUTH_CFG.oauth_authorize_uri);
475-
RedirectLoginServiceProvider.OAuthRedirectURI(URI(AUTH_CFG.oauth_redirect_base).segment("oauth").toString());
476-
463+
.config(function(kubernetesContainerSocketProvider) {
477464
// Configure the container terminal
478465
kubernetesContainerSocketProvider.WebSocketFactory = "ContainerWebSocket";
479466
})
@@ -515,119 +502,3 @@ angular
515502
});
516503

517504
hawtioPluginLoader.addModule('openshiftConsole');
518-
519-
// API Discovery, this runs before the angular app is bootstrapped
520-
// TODO we want this to be possible with a single request against the API instead of being dependent on the numbers of groups and versions
521-
hawtioPluginLoader.registerPreBootstrapTask(function(next) {
522-
// Skips api discovery, needed to run spec tests
523-
if ( _.get(window, "OPENSHIFT_CONFIG.api.k8s.resources") ) {
524-
next();
525-
return;
526-
}
527-
528-
var api = {
529-
k8s: {},
530-
openshift: {}
531-
};
532-
var apis = {};
533-
var API_DISCOVERY_ERRORS = [];
534-
var protocol = window.location.protocol + "//";
535-
536-
// Fetch /api/v1 for legacy k8s resources, we will never bump the version of these legacy apis so fetch version immediately
537-
var k8sBaseURL = protocol + window.OPENSHIFT_CONFIG.api.k8s.hostPort + window.OPENSHIFT_CONFIG.api.k8s.prefix;
538-
var k8sDeferred = $.get(k8sBaseURL + "/v1")
539-
.done(function(data) {
540-
api.k8s.v1 = _.indexBy(data.resources, 'name');
541-
})
542-
.fail(function(data, textStatus, jqXHR) {
543-
API_DISCOVERY_ERRORS.push({
544-
data: data,
545-
textStatus: textStatus,
546-
xhr: jqXHR
547-
});
548-
});
549-
550-
// Fetch /oapi/v1 for legacy openshift resources, we will never bump the version of these legacy apis so fetch version immediately
551-
var osBaseURL = protocol + window.OPENSHIFT_CONFIG.api.openshift.hostPort + window.OPENSHIFT_CONFIG.api.openshift.prefix;
552-
var osDeferred = $.get(osBaseURL + "/v1")
553-
.done(function(data) {
554-
api.openshift.v1 = _.indexBy(data.resources, 'name');
555-
})
556-
.fail(function(data, textStatus, jqXHR) {
557-
API_DISCOVERY_ERRORS.push({
558-
data: data,
559-
textStatus: textStatus,
560-
xhr: jqXHR
561-
});
562-
});
563-
564-
// Fetch /apis to get the list of groups and versions, then fetch each group/
565-
// Because the api discovery doc returns arrays and we want maps, this creates a structure like:
566-
// {
567-
// extensions: {
568-
// name: "extensions",
569-
// preferredVersion: "v1beta1",
570-
// versions: {
571-
// v1beta1: {
572-
// version: "v1beta1",
573-
// groupVersion: "extensions/v1beta1"
574-
// resources: {
575-
// daemonsets: {
576-
// /* resource returned from discovery API */
577-
// }
578-
// }
579-
// }
580-
// }
581-
// }
582-
// }
583-
var apisBaseURL = protocol + window.OPENSHIFT_CONFIG.apis.hostPort + window.OPENSHIFT_CONFIG.apis.prefix;
584-
var apisDeferred = $.get(apisBaseURL)
585-
.then(function(data) {
586-
var apisDeferredVersions = [];
587-
_.each(data.groups, function(apiGroup) {
588-
var group = {
589-
name: apiGroup.name,
590-
preferredVersion: apiGroup.preferredVersion.version,
591-
versions: {}
592-
};
593-
apis[group.name] = group;
594-
_.each(apiGroup.versions, function(apiVersion) {
595-
var versionStr = apiVersion.version;
596-
group.versions[versionStr] = {
597-
version: versionStr,
598-
groupVersion: apiVersion.groupVersion
599-
};
600-
apisDeferredVersions.push($.get(apisBaseURL + "/" + apiVersion.groupVersion)
601-
.done(function(data) {
602-
group.versions[versionStr].resources = _.indexBy(data.resources, 'name');
603-
})
604-
.fail(function(data, textStatus, jqXHR) {
605-
API_DISCOVERY_ERRORS.push({
606-
data: data,
607-
textStatus: textStatus,
608-
xhr: jqXHR
609-
});
610-
}));
611-
});
612-
});
613-
return $.when.apply(this, apisDeferredVersions);
614-
}, function(data, textStatus, jqXHR) {
615-
API_DISCOVERY_ERRORS.push({
616-
data: data,
617-
textStatus: textStatus,
618-
xhr: jqXHR
619-
});
620-
});
621-
622-
// Will be called on success or failure
623-
var discoveryFinished = function() {
624-
window.OPENSHIFT_CONFIG.api.k8s.resources = api.k8s;
625-
window.OPENSHIFT_CONFIG.api.openshift.resources = api.openshift;
626-
window.OPENSHIFT_CONFIG.apis.groups = apis;
627-
if (API_DISCOVERY_ERRORS.length) {
628-
window.OPENSHIFT_CONFIG.apis.API_DISCOVERY_ERRORS = API_DISCOVERY_ERRORS;
629-
}
630-
next();
631-
};
632-
$.when(k8sDeferred,osDeferred,apisDeferred).always(discoveryFinished);
633-
});

0 commit comments

Comments
 (0)