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

[4.0.x] Fix application creation when DCR is activated #5676

Merged
merged 3 commits into from
Oct 26, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 25, 2023

This is an automatic copy of pull request #5670 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-3045
gravitee-io/issues#9334

https://gravitee.atlassian.net/browse/APIM-2437
gravitee-io/issues#9157

https://gravitee.atlassian.net/browse/APIM-2438
gravitee-io/issues#9158

Description

UI

  • Restore the stylesheet lost (deleted) from APIM 3.10
    image

  • Slightly rework the Application screen to remove unneeded read-more library
    image

  • Handle case when there is no Provider defined
    image

Management API

  • Properly check if an application type is defined when creating or updating an application. For an OAuth2 based application we should check the OAuth2 settings and not the app type itself.

📚  View the storybook of this branch here


Cherry-pick of bc5ec6e has failed:

On branch mergify/bp/4.0.x/pr-5670
Your branch is up to date with 'origin/4.0.x'.

You are currently cherry-picking commit bc5ec6ef1b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   gravitee-apim-console-webui/src/management/application/creation/_applications.scss
	modified:   gravitee-apim-console-webui/src/management/application/creation/steps/application-creation-step2.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-console-webui/src/index.scss

Cherry-pick of 9fed953 has failed:

On branch mergify/bp/4.0.x/pr-5670
Your branch is ahead of 'origin/4.0.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9fed953879.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-console-webui/src/management/api/_api.scss
	modified:   gravitee-apim-console-webui/src/management/application/details/header/application-header.html
	modified:   gravitee-apim-console-webui/src/management/management.module.ajs.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-console-webui/package-lock.json
	both modified:   gravitee-apim-console-webui/package.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


📚  View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner October 25, 2023 15:41
@mergify mergify bot added the conflicts label Oct 25, 2023
@gaetanmaisse gaetanmaisse enabled auto-merge (rebase) October 26, 2023 08:14
@gaetanmaisse gaetanmaisse merged commit 5ece37d into 4.0.x Oct 26, 2023
29 of 32 checks passed
@gaetanmaisse gaetanmaisse deleted the mergify/bp/4.0.x/pr-5670 branch October 26, 2023 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant