-
Notifications
You must be signed in to change notification settings - Fork 290
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
Fixes #37861 - Update web UI for multi-CV activation key display #11161
Changes from all commits
e9f2f6e
b45d583
8dc5099
d40c273
cd8b470
c5e5c23
2ffae60
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
|
||
<div bst-alert="warning" ng-if="activationKey.multi_content_view_environment"> | ||
<span translate> | ||
This activation key has multiple content view environments, which are not yet displayed in the web UI. Changing the content view or lifecycle environment here will overwrite the activation key's multiple environments. To avoid this, update the activation key via Hammer. | ||
This activation key has multiple content view environments, which cannot yet be edited in the web UI. To change this key's content view environments, update the activation key via Hammer. | ||
</span> | ||
</div> | ||
|
||
|
@@ -57,7 +57,6 @@ <h4 translate>Basic Information</h4> | |
</div> | ||
</dd> | ||
|
||
|
||
<div class="divider"></div> | ||
<h4 translate>System Purpose</h4> | ||
|
||
|
@@ -123,17 +122,18 @@ <h4 translate>Activation Key Content</h4> | |
on-delete="clearReleaseVersion()" | ||
on-save="save(activationKey)"> | ||
</dd> | ||
|
||
</dl> | ||
<dl class="dl-horizontal dl-horizontal-left" ng-if="!activationKey.multi_content_view_environment"> | ||
<dt bst-feature-flag="lifecycle_environments"> | ||
<span translate>Environment</span> | ||
</dt> | ||
<dd bst-feature-flag="lifecycle_environments"> | ||
<div path-selector="environments" | ||
ng-model="activationKey.environment" | ||
mode="singleSelect" | ||
selection-required="selectionRequired" | ||
disabled="denied('edit_activation_keys', activationKey)" | ||
disable-trigger="disableEnvironmentSelection"> | ||
ng-model="activationKey.environment" | ||
mode="singleSelect" | ||
selection-required="selectionRequired" | ||
disabled="denied('edit_activation_keys', activationKey)" | ||
disable-trigger="disableEnvironmentSelection"> | ||
</div> | ||
</dd> | ||
|
||
|
@@ -142,14 +142,14 @@ <h4 translate>Activation Key Content</h4> | |
</dt> | ||
<dd bst-feature-flag="lifecycle_environments"> | ||
<div bst-edit-select="activationKey.content_view.name" | ||
readonly="denied('edit_activation_keys', activationKey) || activationKey.environment === undefined || activationKey.environment === null" | ||
selector="activationKey.content_view.id" | ||
options="contentViews()" | ||
on-cancel="cancelContentViewUpdate()" | ||
on-save="saveContentView(activationKey)" | ||
deletable="activationKey.content_view" | ||
on-delete="resetEnvironment(activationKey)" | ||
edit-trigger="editContentView"> | ||
readonly="denied('edit_activation_keys', activationKey) || activationKey.environment === undefined || activationKey.environment === null" | ||
selector="activationKey.content_view.id" | ||
options="contentViews()" | ||
on-cancel="cancelContentViewUpdate()" | ||
on-save="saveContentView(activationKey)" | ||
deletable="activationKey.content_view" | ||
on-delete="resetEnvironment(activationKey)" | ||
edit-trigger="editContentView"> | ||
</div> | ||
|
||
<div bst-alert="info" ng-show="editEnvironment"> | ||
|
@@ -160,6 +160,14 @@ <h4 translate>Activation Key Content</h4> | |
</div> | ||
</dd> | ||
</dl> | ||
<dl class="dl-horizontal dl-horizontal-left"> | ||
<span id="ak-cve-details" data-ak-details="{{ activationKey }}" class="hidden"></span> | ||
<foreman-react-component | ||
name="CVEDetailsCard" | ||
data-props="" | ||
Comment on lines
+164
to
+167
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Had to solve a few problems here. First, Now, it works on initial page load. But when I clicked around or used the breadcrumb switcher, the AK card wasn't updating. I found that the After some research I landed on using a |
||
ng-if="activationKey.multi_content_view_environment" | ||
></foreman-react-component> | ||
</dl> | ||
</div> | ||
</div> | ||
|
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.
Is there a better name we can provide in the JSON for this?
cve_label
maybe? candlepin_name seems a little off if we are using the name for things we are doing in katello and hammer..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.
It's also called just
label
..I've always been fond of "candlepin_name" 😢 but I guess I can change it.
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.
Time to make
candlepin_name
katello_name
since we are using it everywhere including asking users to use it in hammer..I'll leave it to your better judgement..I know we have a story to make these candlepin_names more easily available to users..