Fixes #13695,11612 - Shows ostree branches for a repo #5858

parthaa · 2016-03-08T23:49:36Z

This commit updates the base model for ostree and its repositories.
It also includes UI changes to display the branches available for an
ostree repo

ehelms · 2016-03-09T00:27:17Z

...tello/app/assets/javascripts/bastion_katello/repositories/details/views/repository-info.html

+        <span translate>Manage Branches</span>
+      </button>
+
+


Extra empty line here

parthaa · 2016-03-09T20:56:51Z

@ehelms I have screenshots for the UI this PR adds https://partha.fedorapeople.org/ostree-prs/PR-5858/

jlsherrill · 2016-03-09T21:20:58Z

To hide the '0 selected' just add:

<div data-block="selection-summary"></div>

parthaa · 2016-03-09T21:31:29Z

To hide the '0 selected' just add:

Thanks!. added

ehelms · 2016-03-10T13:25:13Z

engines/bastion_katello/test/ostree-branches/ostree-branches.controller.test.js

@@ -0,0 +1,86 @@
+describe('Controller: PackagesController', function() {


This is all about packages? I also don't see an OstreeController?

bbuckingham · 2016-03-10T15:27:03Z

@parthaa, in the screen shots, we have "OSTree Units". We discussed it in irc a little bit, but would we want to call it "OSTree Branch Versions", since that is what it equates to. (Note: it may be more verbose, but might resonate with users when correlating it to the 'Manage Branches'.

Thoughts or other opinions?

bbuckingham · 2016-03-10T15:30:32Z

@parthaa, On the "Click on the Manage Branches" screenshot, should the user be able to select and remove branches? If not, should "Manage Branches" be changed to "View Branches" or something different. Or, is the intent to add the ability to manage them via a separate PR?

bbuckingham · 2016-03-10T15:32:58Z

app/controllers/katello/concerns/api/v2/repository_content_controller.rb

@@ -198,6 +198,8 @@ def resource_name(_i18n = true)
          _("Docker Manifest")
        when "Katello::DockerTag"
          _("Docker Tag")
+        when "Katello::OstreeBranch"
+          _("Ostree Branch")


s/Ostree Branch/OSTree Branch/ ?

Yeh its view only.

parthaa · 2016-03-10T15:36:42Z

@parthaa, in the screen shots, we have "OSTree Units". We discussed it in irc a little bit, but would we want to call it "OSTree Branch Versions", since that is what it equates to. (Note: it may be more verbose, but might resonate with users when correlating it to the 'Manage Branches'.

Thoughts or other opinions?

That's a good question. A branch can have multiple versions. So the number before the units implies number of versions or branch versions as you pointed out.
@mccun934 @daviddavis @jlsherrill @ehelms - Which of the following do you vote for

Keep em as Units repo list page and Manage Branches
Keep em as Units repo list page but Manage Units and refer to them as units every where
Branch Versions on repo list and Manage Branch Versions
Just Versions everywhere
Just Branches every where

They all sound acceptable . I prefer 1/2/5 ...

bbuckingham · 2016-03-10T15:36:47Z

app/models/katello/ostree_branch.rb

+      update_attributes(:name => json[:branch],
+                        :version => json[:metadata][:version],
+                        :commit => json[:commit],
+                        :version_date => json["_created"].to_datetime


I assume uuid is not needed here, correct?

ehelms · 2016-03-10T16:00:30Z

I guess i would equate this to how we speak of "packages" even though we deal with multiple versions of the same packages. We could assume the user will imply the same sort of relationship and settle on "Branches" everywhere would would via analogy equate to "Packages" and expect users to know Branches have versions (similar to other content).

bbuckingham · 2016-03-10T16:07:53Z

...avascripts/bastion_katello/repositories/details/views/repository-manage-ostree-branches.html

@@ -0,0 +1,60 @@
+<span page-title ng-model="repository">{{ 'Manage Ostree Branchesfor Repository:' | translate }} {{ repository.name }}</span>


s/Branchesfor/Branches for/

s/Ostree/OSTree/ ?

bbuckingham · 2016-03-10T16:40:12Z

@parthaa, I agree with @ehelms and lean towards:

Just Branches every where

jlsherrill · 2016-03-10T16:41:16Z

+1 to just 'branches' for me

bbuckingham · 2016-03-10T17:21:56Z

@parthaa, I have reviewed and added some minor comments. ACK from me once updated and jenkins is happy.

This commit updates the base model for ostree and its repositories. It also includes UI changes to display the branches available for an ostree repo

parthaa · 2016-03-11T01:01:58Z

@parthaa, On the "Click on the Manage Branches" screenshot, should the user be able to select and remove branches? If not, should "Manage Branches" be changed to "View Branches" or something different. Or, is the intent to add the ability to manage them via a separate PR?

@bbuckingham Renamed to View Branches

bbuckingham · 2016-03-11T01:03:16Z

@parthaa, Thanks!

Fixes #13695,11612 - Shows ostree branches for a repo

theforeman-bot added Waiting on contributor Needs testing Not yet reviewed labels Mar 8, 2016

parthaa force-pushed the branches-model branch from 60b8144 to 6ec2e9b Compare March 8, 2016 23:50

theforeman-bot added Needs testing and removed Waiting on contributor labels Mar 8, 2016

ehelms reviewed Mar 9, 2016
View reviewed changes

parthaa force-pushed the branches-model branch 2 times, most recently from d465c12 to 5ff7d31 Compare March 9, 2016 20:56

parthaa force-pushed the branches-model branch from 5ff7d31 to 299556e Compare March 9, 2016 21:31

ehelms reviewed Mar 10, 2016
View reviewed changes

bbuckingham reviewed Mar 10, 2016
View reviewed changes

parthaa force-pushed the branches-model branch from 299556e to 0a9a5f2 Compare March 10, 2016 22:09

Fixes #11612 - Shows ostree branches for a repo

d128515

This commit updates the base model for ostree and its repositories. It also includes UI changes to display the branches available for an ostree repo

parthaa force-pushed the branches-model branch from 0a9a5f2 to d128515 Compare March 11, 2016 01:00

parthaa added a commit that referenced this pull request Mar 11, 2016

Merge pull request #5858 from parthaa/branches-model

a0a214d

Fixes #13695,11612 - Shows ostree branches for a repo

parthaa merged commit a0a214d into Katello:master Mar 11, 2016

parthaa deleted the branches-model branch March 11, 2016 04:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #13695,11612 - Shows ostree branches for a repo #5858

Fixes #13695,11612 - Shows ostree branches for a repo #5858

parthaa commented Mar 8, 2016

ehelms Mar 9, 2016

parthaa commented Mar 9, 2016

jlsherrill commented Mar 9, 2016

parthaa commented Mar 9, 2016

ehelms Mar 10, 2016

parthaa Mar 10, 2016

bbuckingham commented Mar 10, 2016

bbuckingham commented Mar 10, 2016

bbuckingham Mar 10, 2016

parthaa Mar 10, 2016

parthaa commented Mar 10, 2016

bbuckingham Mar 10, 2016

ehelms commented Mar 10, 2016

bbuckingham Mar 10, 2016

bbuckingham commented Mar 10, 2016

jlsherrill commented Mar 10, 2016

bbuckingham commented Mar 10, 2016

parthaa commented Mar 11, 2016

bbuckingham commented Mar 11, 2016

		@@ -0,0 +1,86 @@
		describe('Controller: PackagesController', function() {

		@@ -0,0 +1,60 @@
		<span page-title ng-model="repository">{{ 'Manage Ostree Branchesfor Repository:' \| translate }} {{ repository.name }}</span>

Fixes #13695,11612 - Shows ostree branches for a repo #5858

Fixes #13695,11612 - Shows ostree branches for a repo #5858

Conversation

parthaa commented Mar 8, 2016

ehelms Mar 9, 2016

Choose a reason for hiding this comment

parthaa commented Mar 9, 2016

jlsherrill commented Mar 9, 2016

parthaa commented Mar 9, 2016

ehelms Mar 10, 2016

Choose a reason for hiding this comment

parthaa Mar 10, 2016

Choose a reason for hiding this comment

bbuckingham commented Mar 10, 2016

bbuckingham commented Mar 10, 2016

bbuckingham Mar 10, 2016

Choose a reason for hiding this comment

parthaa Mar 10, 2016

Choose a reason for hiding this comment

parthaa commented Mar 10, 2016

bbuckingham Mar 10, 2016

Choose a reason for hiding this comment

ehelms commented Mar 10, 2016

bbuckingham Mar 10, 2016

Choose a reason for hiding this comment

bbuckingham commented Mar 10, 2016

jlsherrill commented Mar 10, 2016

bbuckingham commented Mar 10, 2016

parthaa commented Mar 11, 2016

bbuckingham commented Mar 11, 2016