Skip to content
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

Replace common services with imports from origin-web-common #1308

Merged
merged 1 commit into from
Mar 1, 2017
Merged

Replace common services with imports from origin-web-common #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 2 additions & 11 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ <h1>JavaScript Required</h1>
<script src="bower_components/angular-moment/angular-moment.js"></script>
<script src="bower_components/angular-utf8-base64/angular-utf8-base64.js"></script>
<script src="bower_components/file-saver/FileSaver.js"></script>
<script src="bower_components/origin-web-common/dist/origin-web-common.js"></script>
<!-- endbower -->
<!-- endbuild -->

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

<script src="scripts/constants.js"></script>
<script src="scripts/app.js"></script>
<script src="scripts/services/logger.js"></script>
<script src="scripts/services/base64util.js"></script>
<script src="scripts/services/ws.js"></script>
<script src="scripts/services/userstore.js"></script>
<script src="scripts/services/api.js"></script>
<script src="scripts/services/auth.js"></script>
<script src="scripts/services/authorization.js"></script>
<script src="scripts/services/data.js"></script>
<script src="scripts/services/discovery.js"></script>
<script src="scripts/services/projects.js"></script>
<script src="scripts/services/applicationGenerator.js"></script>
<script src="scripts/services/alertMessage.js"></script>
<script src="scripts/services/login.js"></script>
<script src="scripts/services/logout.js"></script>
<script src="scripts/services/navigate.js"></script>
<script src="scripts/services/nameGenerator.js"></script>
<script src="scripts/services/tasks.js"></script>
<script src="scripts/services/notification.js"></script>
<script src="scripts/services/imageStreamResolver.js"></script>
<script src="scripts/services/containerWebSocket.js"></script>
<script src="scripts/services/util.js"></script>
<script src="scripts/services/builds.js"></script>
<script src="scripts/services/deployments.js"></script>
Expand All @@ -193,7 +185,6 @@ <h1>JavaScript Required</h1>
<script src="scripts/services/metrics.js"></script>
<script src="scripts/services/metricsCharts.js"></script>
<script src="scripts/services/storage.js"></script>
<script src="scripts/services/constants.js"></script>
<script src="scripts/services/limits.js"></script>
<script src="scripts/services/routes.js"></script>
<script src="scripts/services/charts.js"></script>
Expand Down
135 changes: 3 additions & 132 deletions app/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ angular
'ui.select',
'angular-inview',
'angularMoment',
'ab-base64'
'ab-base64',
'openshiftCommon'
])
.config(function ($routeProvider) {
$routeProvider
Expand Down Expand Up @@ -417,9 +418,6 @@ angular
redirectTo: '/'
});
})
.constant("API_CFG", _.get(window.OPENSHIFT_CONFIG, "api", {}))
.constant("APIS_CFG", _.get(window.OPENSHIFT_CONFIG, "apis", {}))
.constant("AUTH_CFG", _.get(window.OPENSHIFT_CONFIG, "auth", {}))
.constant("LOGGING_URL", _.get(window.OPENSHIFT_CONFIG, "loggingURL"))
.constant("METRICS_URL", _.get(window.OPENSHIFT_CONFIG, "metricsURL"))
.constant("LIMIT_REQUEST_OVERRIDES", _.get(window.OPENSHIFT_CONFIG, "limitRequestOverrides"))
Expand Down Expand Up @@ -462,18 +460,7 @@ angular
// See http://momentjs.com/docs/#/displaying/format/
titleFormat: 'LLL'
})
.config(function($httpProvider, AuthServiceProvider, RedirectLoginServiceProvider, AUTH_CFG, API_CFG, kubernetesContainerSocketProvider) {
$httpProvider.interceptors.push('AuthInterceptor');

AuthServiceProvider.LoginService('RedirectLoginService');
AuthServiceProvider.LogoutService('DeleteTokenLogoutService');
// TODO: fall back to cookie store when localStorage is unavailable (see known issues at http://caniuse.com/#feat=namevalue-storage)
AuthServiceProvider.UserStore('LocalStorageUserStore');

RedirectLoginServiceProvider.OAuthClientID(AUTH_CFG.oauth_client_id);
RedirectLoginServiceProvider.OAuthAuthorizeURI(AUTH_CFG.oauth_authorize_uri);
RedirectLoginServiceProvider.OAuthRedirectURI(URI(AUTH_CFG.oauth_redirect_base).segment("oauth").toString());

.config(function(kubernetesContainerSocketProvider) {
// Configure the container terminal
kubernetesContainerSocketProvider.WebSocketFactory = "ContainerWebSocket";
})
Expand Down Expand Up @@ -515,119 +502,3 @@ angular
});

hawtioPluginLoader.addModule('openshiftConsole');

// API Discovery, this runs before the angular app is bootstrapped
// 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
hawtioPluginLoader.registerPreBootstrapTask(function(next) {
// Skips api discovery, needed to run spec tests
if ( _.get(window, "OPENSHIFT_CONFIG.api.k8s.resources") ) {
next();
return;
}

var api = {
k8s: {},
openshift: {}
};
var apis = {};
var API_DISCOVERY_ERRORS = [];
var protocol = window.location.protocol + "//";

// Fetch /api/v1 for legacy k8s resources, we will never bump the version of these legacy apis so fetch version immediately
var k8sBaseURL = protocol + window.OPENSHIFT_CONFIG.api.k8s.hostPort + window.OPENSHIFT_CONFIG.api.k8s.prefix;
var k8sDeferred = $.get(k8sBaseURL + "/v1")
.done(function(data) {
api.k8s.v1 = _.indexBy(data.resources, 'name');
})
.fail(function(data, textStatus, jqXHR) {
API_DISCOVERY_ERRORS.push({
data: data,
textStatus: textStatus,
xhr: jqXHR
});
});

// Fetch /oapi/v1 for legacy openshift resources, we will never bump the version of these legacy apis so fetch version immediately
var osBaseURL = protocol + window.OPENSHIFT_CONFIG.api.openshift.hostPort + window.OPENSHIFT_CONFIG.api.openshift.prefix;
var osDeferred = $.get(osBaseURL + "/v1")
.done(function(data) {
api.openshift.v1 = _.indexBy(data.resources, 'name');
})
.fail(function(data, textStatus, jqXHR) {
API_DISCOVERY_ERRORS.push({
data: data,
textStatus: textStatus,
xhr: jqXHR
});
});

// Fetch /apis to get the list of groups and versions, then fetch each group/
// Because the api discovery doc returns arrays and we want maps, this creates a structure like:
// {
// extensions: {
// name: "extensions",
// preferredVersion: "v1beta1",
// versions: {
// v1beta1: {
// version: "v1beta1",
// groupVersion: "extensions/v1beta1"
// resources: {
// daemonsets: {
// /* resource returned from discovery API */
// }
// }
// }
// }
// }
// }
var apisBaseURL = protocol + window.OPENSHIFT_CONFIG.apis.hostPort + window.OPENSHIFT_CONFIG.apis.prefix;
var apisDeferred = $.get(apisBaseURL)
.then(function(data) {
var apisDeferredVersions = [];
_.each(data.groups, function(apiGroup) {
var group = {
name: apiGroup.name,
preferredVersion: apiGroup.preferredVersion.version,
versions: {}
};
apis[group.name] = group;
_.each(apiGroup.versions, function(apiVersion) {
var versionStr = apiVersion.version;
group.versions[versionStr] = {
version: versionStr,
groupVersion: apiVersion.groupVersion
};
apisDeferredVersions.push($.get(apisBaseURL + "/" + apiVersion.groupVersion)
.done(function(data) {
group.versions[versionStr].resources = _.indexBy(data.resources, 'name');
})
.fail(function(data, textStatus, jqXHR) {
API_DISCOVERY_ERRORS.push({
data: data,
textStatus: textStatus,
xhr: jqXHR
});
}));
});
});
return $.when.apply(this, apisDeferredVersions);
}, function(data, textStatus, jqXHR) {
API_DISCOVERY_ERRORS.push({
data: data,
textStatus: textStatus,
xhr: jqXHR
});
});

// Will be called on success or failure
var discoveryFinished = function() {
window.OPENSHIFT_CONFIG.api.k8s.resources = api.k8s;
window.OPENSHIFT_CONFIG.api.openshift.resources = api.openshift;
window.OPENSHIFT_CONFIG.apis.groups = apis;
if (API_DISCOVERY_ERRORS.length) {
window.OPENSHIFT_CONFIG.apis.API_DISCOVERY_ERRORS = API_DISCOVERY_ERRORS;
}
next();
};
$.when(k8sDeferred,osDeferred,apisDeferred).always(discoveryFinished);
});
Loading