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 EE to the settings page #9653

Merged
merged 1 commit into from
Mar 26, 2021

Conversation

nixocio
Copy link
Contributor

@nixocio nixocio commented Mar 22, 2021

Allow a system admin to set the global default execution environment.

See: #9088

This PR is also addressing the issue: #9669

Edit:

image

image

Details

image

return data;
}, [executionEnvironmentId])
);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since the settings API does not have summary_fields. It was necessary an extra request for Details/Edit screens in order to fetch the EE and display the proper name.

Copy link
Contributor Author

@nixocio nixocio Mar 22, 2021

Choose a reason for hiding this comment

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

Also, I did not add a Revert for the EE lookup. Since the lookup is different from the other components rendered on that screen.

@nixocio
Copy link
Contributor Author

nixocio commented Mar 22, 2021

running e2e tests.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@unlikelyzero unlikelyzero added the type:feature prioritized on a feature board label Mar 23, 2021
@nixocio nixocio force-pushed the ui_issue_9088 branch 4 times, most recently from a5051de to 530e158 Compare March 23, 2021 20:42
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@tiagodread
Copy link
Contributor

tiagodread commented Mar 23, 2021

Hey @nixocio some feedback, check if this make sense:

  • We are not displaying the helper popover for Execution Environment field on edit
  • The help popover on details is empty
    image
    image
  • We are calling Execution Environment field on edit form and the same field as Global default execution environment on details. I'm ok with Global default execution environment for both to avoid misunderstanding.

@nixocio nixocio force-pushed the ui_issue_9088 branch 3 times, most recently from d4841bb to e6ea567 Compare March 24, 2021 14:47
@nixocio
Copy link
Contributor Author

nixocio commented Mar 24, 2021

@tiagodread, please, take another look.

Details page.

image

Edit page.

image

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

Comment on lines 90 to +92
case 'choice':
case 'field':
case 'string':
Copy link
Member

Choose a reason for hiding this comment

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

Great idea!

"type": "field",
"required": false,
"label": "Global default execution environment",
"help_text": ".",
Copy link
Member

Choose a reason for hiding this comment

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

"help_text" should match the changes added in /main/conf.py

@@ -76,6 +77,32 @@ const SettingGroup = withI18n()(
)
);

const ExecutionEnvironmentLookupField = withI18n()(({ i18n }) => {
Copy link
Member

Choose a reason for hiding this comment

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

Since this lookup is used in only one place (MiscSystemEdit) within Settings, it probably doesn't need to be in SharedFields and instead we could import the lookup directly from /components in MiscSystemEdit.

@nixocio
Copy link
Contributor Author

nixocio commented Mar 24, 2021

@marshmalien, updated as per your comments.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

});
await waitForElement(newWrapper, 'ContentLoading', el => el.length === 0);

assertDetail(newWrapper, 'Access Token Expiration', '1 seconds');
Copy link
Member

Choose a reason for hiding this comment

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

We could probably remove some of these detail label and value assertions since we check them in the previous test.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

Copy link
Member

@marshmalien marshmalien left a comment

Choose a reason for hiding this comment

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

LGTM! Tests are great and I like how you cleaned up the shared setting details.

@softwarefactory-project-zuul
Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

@softwarefactory-project-zuul
Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

Allow a system admin to set the global default execution environment.

See: ansible#9088

This PR is also addressing the issue: ansible#9669
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:ui type:feature prioritized on a feature board
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants