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.

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

Add catalog to web console #1389

Merged
merged 1 commit into from
Apr 7, 2017
Merged

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Mar 31, 2017

screen shot 2017-04-07 at 5 37 27 pm

@jwforres @jeff-phillips-18 FYI, not ready to merge, but it's working

@spadgett
Copy link
Member Author

Requires openshift/origin-web-catalog#73

@@ -70,6 +70,10 @@ angular.module("openshiftConsole")
return "project/" + encodeURIComponent(projectName) + "/overview";
},

toProjectList: function(){
$location.path('projects');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should always work whether catalog is turned on or not, maybe we should add a redirect from projects to / when the landing page isn't enabled

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

};
if (_.get(window, 'OPENSHIFT_CONSTANTS.ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page')) {
landingPageRoute = {
templateUrl: 'views/landing-page.html',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to use home.html rather than landing-page.html just for the look of the URL to users.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The url should just be /console. Although maybe I shouldn't name the controller the same as the component

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, read it wrong.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

users should never see this URL, our templates are embedded into $templateCache at build time

@spadgett spadgett force-pushed the mall-test branch 4 times, most recently from dad8b42 to aa128ce Compare April 7, 2017 21:40
@spadgett spadgett changed the title [WIP - DO NOT MERGE] Add catalog to web console Add catalog to web console Apr 7, 2017
@jwforres
Copy link
Member

jwforres commented Apr 7, 2017

[merge]

@openshift-bot
Copy link

Evaluated for origin web console merge up to f43fbbe

@openshift-bot
Copy link

openshift-bot commented Apr 7, 2017

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1208/) (Base Commit: 3483dc3)

@openshift-bot openshift-bot merged commit 5456efa into openshift:master Apr 7, 2017
@spadgett spadgett deleted the mall-test branch April 7, 2017 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants