-
Notifications
You must be signed in to change notification settings - Fork 230
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 to project options using the ordering overlay component #1382
Conversation
Crikey - that scroll is going to make me stab someone. The moment I hit "want more details" I'm going to want to use the rest of the real estate. How do we turn "in-context" into "usable with rich options" for end users? We should vet for each of these flows the expected depth of interaction (successive choices made). For a lot of templates / builders 1-3 choices is def reasonable. But the moment I want to go deep, I'm going to get angry if I can't use my screen real estate. Seems like we need a way to turn the restricted in-context into unrestricted nav in a compelling way. Is that on the design radar? |
ea99185
to
1a87e96
Compare
Updated to use the full height version of the overlay, stuff still to do:
|
1a87e96
to
702389a
Compare
96e5ba6
to
ffafaf1
Compare
eba799a
to
3df41d7
Compare
We are triggering a number of things about template processing from the isDialog flag, the interesting thing is in the context of the Import YAML dialog we have significantly more height in order to account for the ACE editor on the previous step. So with our default templates you end up in a situation like this one: For reference this is the previous step: I can:
|
realized its missing the description for the template and other info that we show in the left column in the catalog, that should help fill out that page. |
f216ec0
to
5531d7a
Compare
@spadgett and I were talking about removing the "manage your app" and "command line tools" stuff from the results step of the wizard. Given the space constraints of the wizard, I think it makes sense to focus more on the things directly related to what you have just created. The command line tools stuff isn't specifically about what you've just created, but is more general to the project and I worry that having it in the results step could distract from other more pertinent information. Sam's thought, which I agree with, is that the landing page is probably the place to advertise the command line tools, in that right panel. Within the project, the command line info is already in that info menu, which makes sense to me. @openshift/team-ux-review |
failure: "Failed to deploy image " + $scope.app.name + " to project " + $scope.project + "." | ||
started: "Deploying image " + $scope.app.name + " to project " + $scope.project.metadata.name + ".", | ||
success: "Deployed image " + $scope.app.name + " to project " + $scope.project.metadata.name + ".", | ||
failure: "Failed to deploy image " + $scope.app.name + " to project " + $scope.project.metadata.name + "." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is new, but in template processing we use the display name of the project. Probably should be consistent.
templateUrl: 'views/directives/deploy-image-dialog.html' | ||
}); | ||
|
||
function DeployImageDialog($scope, DataService) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
} | ||
}); | ||
|
||
ctrl.currentStep = "Image"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be in $onInit
?
app/scripts/directives/fromFile.js
Outdated
failure: "Failed to create some resources in project " + $scope.projectName | ||
started: "Creating resources in project " + $scope.project.metadata.name, | ||
success: "Creating resources in project " + $scope.project.metadata.name, | ||
failure: "Failed to create some resources in project " + $scope.project.metadata.name |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a new problem, but same comment here on display name (here and just below)
}; | ||
|
||
function getIconClass() { | ||
var icon = _.get(ctrl, 'template.metadata.annotations.iconClass', 'fa fa-cubes'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wondering if we should use the iconClass
filter, which handles template icons. But it defaults to fa-clone
for templates. This makes me wonder if we shouldn't use fa-clone
as our default in the catalog.
I'm OK with this as-is, but we might open an issue to decide what to do since we can show different default icons for the new experience vs. old.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah this is consistent with the catalog and this dialog, for now, doesn't show up in the old experience. I'll open an issue.
@@ -0,0 +1,95 @@ | |||
<overlay-panel show-panel="$ctrl.visible" show-close="true" handle-close="$ctrl.close" ng-if="$ctrl.project"> | |||
<!-- TODO what to do with alerts? --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TODO still needed?
<li><a ng-href="project/{{projectName}}/create?tab=deployImage">Deploy Image</a></li> | ||
<li ng-if-end><a ng-href="project/{{projectName}}/create?tab=fromFile">Import YAML / JSON</a></li> | ||
|
||
<li ng-if-start="catalogLandingPageEnabled"><a href="/">Browse Catalog</a></li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, I thought it should be href="./"
but it must be working?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm.. weird yeah its working fine as is
</a> | ||
<ul class="uib-dropdown-menu dropdown-menu dropdown-menu-right"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably should use <ul role="menu">
and each <li role="menuitem">
@@ -38,3 +47,6 @@ | |||
</div> <!-- /navbar-project-menu --> | |||
<navbar-utility class="hidden-xs"></navbar-utility> | |||
</nav> | |||
<!-- clean up ordering.* --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not clear on what this means. Is it a TODO?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
at one point it was a todo but i think i changed my mind, will remove comment
if (_.isFunction(ctrl.onContinue)) { | ||
ctrl.onContinue(); | ||
} | ||
Navigate.toProjectOverview(ctrl.projectName); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the onContinue
handler since we're always navigating away here?
0ca1791
to
7bba9d9
Compare
updated for the review feedback but i'm seeing a CSS issue at mobile now with my header, probably something related to all the flex changes and merge conflicts i had during rebase |
fixed the bad visual issues at mobile, there is one thing I want to have @sg00dwin look at with me tmrw afternoon |
b67f9f5
to
5636c08
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just a couple small questions on the on-continue callback
NextSteps | ||
], | ||
bindings: { | ||
project: '<', | ||
projectName: '<', | ||
loginBaseUrl: '<', | ||
fromSampleRepo: '<', | ||
createdBuildConfig: '<' | ||
createdBuildConfig: '<', | ||
onContinue: '<' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle the callback like onDialogClosed
below?
<next-steps project="$ctrl.selectedProject" | ||
project-name="$ctrl.selectedProject.metadata.name" | ||
login-base-url="$ctrl.loginBaseUrl" | ||
on-continue="$ctrl.close"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess I'm still unclear why this is necessary since on-continue always navigates to the overview anyway?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you are already on the overview then navigating to the overview does nothing. Angular treats it like a no-op, so the overlay never closes.
…nd dropdown menu at mobile.
685f6eb
to
f473707
Compare
@spadgett it looked like you hadn't yet implemented toast notifications for deployImage, i'd rather do that separate from this PR I think otherwise I think this PR is ready |
[merge] |
updated tests [test] |
f473707
to
d1abdf5
Compare
Evaluated for origin web console test up to d1abdf5 |
Evaluated for origin web console merge up to d1abdf5 |
integration tests passed [merge] |
Origin Web Console Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1516/) (Base Commit: 54262a2) |
Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1526/) (Base Commit: 96fab4d) |
Prototype of what it looks like embedding our existing deploy image form into the overlay ordering panel.
This is a bit clunky to interact with until we can actually split these forms into wizards.
cc @serenamarie125 @spadgett