mirror of
https://github.com/ZwareBear/awx.git
synced 2026-05-15 03:48:37 -05:00
InstanceGroup#is_containerized -> InstanceGroup#is_container_group
This commit is contained in:
Shane McDonald
@@ -86,7 +86,7 @@ Instances of orgs list include:
|
||||
|
||||
**Instance Groups list**
|
||||
- Name - search is ?name=ig
|
||||
- ? is_containerized boolean choice (doesn't work right now in API but will soon) - search is ?is_containerized=true
|
||||
- ? is_container_group boolean choice (doesn't work right now in API but will soon) - search is ?is_container_group=true
|
||||
- ? credential name - search is ?credentials__name=kubey
|
||||
|
||||
Instance of instance groups list include:
|
||||
@@ -136,7 +136,7 @@ Instance of team lists include:
|
||||
|
||||
**Credentials list**
|
||||
- Name
|
||||
- ? Type (dropdown on right with different types)
|
||||
- ? Type (dropdown on right with different types)
|
||||
- ? Created by (username)
|
||||
- ? Modified by (username)
|
||||
|
||||
@@ -273,7 +273,7 @@ For the UI url params, we want to only encode those params that aren't defaults,
|
||||
|
||||
#### mergeParams vs. replaceParams
|
||||
|
||||
**mergeParams** is used to suppport putting values with the same key
|
||||
**mergeParams** is used to suppport putting values with the same key
|
||||
|
||||
From a UX perspective, we wanted to be able to support searching on the same key multiple times (i.e. searching for things like `?foo=bar&foo=baz`). We do this by creating an array of all values. i.e.:
|
||||
|
||||
@@ -361,7 +361,7 @@ Smart search will be able to craft the tag through various states. Note that th
|
||||
"instance_groups__search"
|
||||
],
|
||||
```
|
||||
|
||||
|
||||
PHASE 3: keys, give by object key names for data.actions.GET
|
||||
- type is given for each key which we could use to help craft the value
|
||||
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ const instanceGroup = {
|
||||
controller: null,
|
||||
is_controller: false,
|
||||
is_isolated: false,
|
||||
is_containerized: true,
|
||||
is_container_group: true,
|
||||
credential: 71,
|
||||
policy_instance_percentage: 0,
|
||||
policy_instance_minimum: 0,
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ const instanceGroup = {
|
||||
controller: null,
|
||||
is_controller: false,
|
||||
is_isolated: false,
|
||||
is_containerized: true,
|
||||
is_container_group: true,
|
||||
credential: 71,
|
||||
policy_instance_percentage: 0,
|
||||
policy_instance_minimum: 0,
|
||||
|
||||
@@ -29,7 +29,7 @@ const instanceGroupData = {
|
||||
controller: null,
|
||||
is_controller: false,
|
||||
is_isolated: false,
|
||||
is_containerized: false,
|
||||
is_container_group: false,
|
||||
credential: null,
|
||||
policy_instance_percentage: 46,
|
||||
policy_instance_minimum: 12,
|
||||
|
||||
@@ -78,7 +78,7 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
|
||||
<Detail
|
||||
label={i18n._(t`Type`)}
|
||||
value={
|
||||
instanceGroup.is_containerized
|
||||
instanceGroup.is_container_group
|
||||
? i18n._(t`Container group`)
|
||||
: i18n._(t`Instance group`)
|
||||
}
|
||||
|
||||
+2
-2
@@ -20,7 +20,7 @@ const instanceGroups = [
|
||||
policy_instance_minimum: 10,
|
||||
policy_instance_percentage: 50,
|
||||
percent_capacity_remaining: 60,
|
||||
is_containerized: false,
|
||||
is_container_group: false,
|
||||
is_isolated: false,
|
||||
created: '2020-07-21T18:41:02.818081Z',
|
||||
modified: '2020-07-24T20:32:03.121079Z',
|
||||
@@ -40,7 +40,7 @@ const instanceGroups = [
|
||||
policy_instance_minimum: 0,
|
||||
policy_instance_percentage: 0,
|
||||
percent_capacity_remaining: 0,
|
||||
is_containerized: true,
|
||||
is_container_group: true,
|
||||
is_isolated: false,
|
||||
created: '2020-07-21T18:41:02.818081Z',
|
||||
modified: '2020-07-24T20:32:03.121079Z',
|
||||
|
||||
@@ -30,7 +30,7 @@ const instanceGroupData = {
|
||||
controller: null,
|
||||
is_controller: false,
|
||||
is_isolated: false,
|
||||
is_containerized: false,
|
||||
is_container_group: false,
|
||||
credential: null,
|
||||
policy_instance_percentage: 46,
|
||||
policy_instance_minimum: 12,
|
||||
|
||||
@@ -182,7 +182,7 @@ function InstanceGroupList({ i18n }) {
|
||||
);
|
||||
|
||||
const getDetailUrl = item => {
|
||||
return item.is_containerized
|
||||
return item.is_container_group
|
||||
? `${match.url}/container_group/${item.id}/details`
|
||||
: `${match.url}/${item.id}/details`;
|
||||
};
|
||||
|
||||
@@ -32,7 +32,7 @@ function InstanceGroupListItem({
|
||||
const labelId = `check-action-${instanceGroup.id}`;
|
||||
|
||||
const isContainerGroup = item => {
|
||||
return item.is_containerized;
|
||||
return item.is_container_group;
|
||||
};
|
||||
|
||||
function usedCapacity(item) {
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@ describe('<InstanceGroupListItem/>', () => {
|
||||
policy_instance_minimum: 10,
|
||||
policy_instance_percentage: 50,
|
||||
percent_capacity_remaining: 60,
|
||||
is_containerized: false,
|
||||
is_container_group: false,
|
||||
summary_fields: {
|
||||
user_capabilities: {
|
||||
edit: true,
|
||||
@@ -34,7 +34,7 @@ describe('<InstanceGroupListItem/>', () => {
|
||||
policy_instance_minimum: 0,
|
||||
policy_instance_percentage: 0,
|
||||
percent_capacity_remaining: 0,
|
||||
is_containerized: true,
|
||||
is_container_group: true,
|
||||
summary_fields: {
|
||||
user_capabilities: {
|
||||
edit: false,
|
||||
|
||||
@@ -27,7 +27,7 @@ const instanceGroup = {
|
||||
controller: null,
|
||||
is_controller: false,
|
||||
is_isolated: false,
|
||||
is_containerized: false,
|
||||
is_container_group: false,
|
||||
credential: 3,
|
||||
policy_instance_percentage: 46,
|
||||
policy_instance_minimum: 12,
|
||||
|
||||
@@ -27,7 +27,7 @@ const instanceGroup = {
|
||||
controller: null,
|
||||
is_controller: false,
|
||||
is_isolated: false,
|
||||
is_containerized: false,
|
||||
is_container_group: false,
|
||||
credential: null,
|
||||
policy_instance_percentage: 46,
|
||||
policy_instance_minimum: 12,
|
||||
|
||||
Reference in New Issue
Block a user