-
Notifications
You must be signed in to change notification settings - Fork 358
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
Adding embedded workflows to service catalog item #8815
Conversation
@agrare Please review. While the name appearing seems ok, I think we should be sending the ID number as part of the form. |
@jeffibm I'm not sure if you want to handle this in a separate PR, or if there is a way to handle it generically but there is also the entrypoint selection in the |
It isn't obvious to me what we are sending based on the code changes, @jeffibm do you have an example of a ResourceAction that was created based off of one of these selections? I'm not able to get the form to save locally. But yes in general we should be using the workflow ID since this is what will be set in the |
I have to save the new values in UI somewhere before the submit action. its in progress... |
adding the entry points here needs changes in |
@jeffibm Please be sure this is hidden behind the prototype flag. |
@agrare , I have a PR for |
bc6c62a
to
f4f4358
Compare
8b2287e
to
a0e1ab1
Compare
@jeffibm I think you made this PR to the wrong repository - this is pointing to @noopurAg 's fork |
a0e1ab1
to
6857d44
Compare
Screen.Recording.2023-06-22.at.5.20.57.PM.mov |
a0e0d27
to
bb48f97
Compare
Screen.Recording.2023-06-30.at.2.44.54.PM.mov |
Screen.Recording.2023-07-18.at.2.35.23.PM.mov |
98cc25e
to
8fc4670
Compare
This works for me locally manually updating package.json to 1.5.0 |
8fc4670
to
20dade4
Compare
20dade4
to
7b0ddac
Compare
Checked commit jeffbonson@7b0ddac with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint app/controllers/catalog_controller.rb
app/helpers/automate_tree_helper.rb
app/views/catalog/_embedded_workflows_modal.html.haml
app/views/catalog/_entry_point_selector.html.haml
app/views/catalog/_form_basic_info.html.haml
app/views/catalog/_provision_entry_point.html.haml
app/views/catalog/_reconfigure_entry_point.html.haml
app/views/catalog/_retire_entry_point.html.haml
|
@jeffibm A conflict occurred during the backport of this pull request to If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the Conflict details: diff --cc app/stylesheet/miq-data-table.scss
index 5f231a62be,0c6c4e3bd7..0000000000
--- a/app/stylesheet/miq-data-table.scss
+++ b/app/stylesheet/miq-data-table.scss
@@@ -283,3 -283,73 +283,76 @@@ table.miq_preview
width: 135px;
}
}
++<<<<<<< HEAD
++=======
+
+ .reconfigure-add-button {
+ margin-bottom: 10px;
+ }
+
+ .disk-table {
+ .bx--form-item{
+ margin-bottom: 0px !important;
+ }
+ }
+
+ .header-button {
+ width: 100px !important;
+ }
+
+ .reconfigure-form {
+ .disk-table-list {
+ .bx--table-header-label {
+ white-space: normal !important;
+ }
+ }
+ .bx--btn--ghost:hover, .bx--btn--ghost:active{
+ background-color: transparent !important;
+ }
+ .bx--btn--ghost:focus {
+ border-color: transparent !important;
+ box-shadow: none !important;
+ }
+ .bx--btn--ghost span {
+ min-width: 50px !important;
+ }
+ }
+ .catalogs_form {
+
+ input[type="text"] {
+ width: 220px;
+ }
+
+ .no-padding{
+ padding: 0;
+ }
+
+ .long_text {
+ width: 100% !important;
+ }
+
+ .entry_point_selector {
+ padding: 3px;
+
+ .entry_point_text, .entry_point_button {
+ border-right: 0;
+ }
+
+ span.input-group-addon{
+ visibility: hidden;
+ }
+ }
+ .workflow_modal_wrapper {
+ min-height: 26px;
+ display: flex;
+ align-items: center;
+ }
+
+ .workflows-entry-point-modal-body {
+ .miq-data-table {
+ margin-top: 0px;
+ }
+ }
+ }
+
++>>>>>>> 0e07a1d9ec (Merge pull request #8815 from jeffibm/add-workflows-to-catalogs) |
@Fryguy , the css changes are coming in from this PR - Angular to react conversion Reconfigure form #8710 |
I don't think we are going to backport that file, so you will need to create a direct-to-petrosian backport PR |
Backported to petrosian via #8873 |
Before
Provisioning Entry Point
is mandatory, has a default valueReconfigure Entry Point
is optional, and does not have a default valueRetirement Entry Point
is optional, has a default valueAfter
Service Catalog item
Go to Add a new Service Catalog item Form
Provision Entry Point, Reconfigure Entry Point, Retirement Entry Point's
input changed to Drop down listEmbedded Automate & Embedded Workflows