TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-09 11:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(console): app integration without context (#7541)

Browse Source 
* fix: app integration without context

* cleanup

---------

Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
Max Peintner
2024-03-13 11:27:53 +01:00
committed by GitHub
parent 266abcb23b
commit 1db10a4286
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
console/src/app/components/framework-change/framework-change-dialog.component.html
View File

@@ -3,7 +3,7 @@
{{ 'QUICKSTART.DIALOG.CHANGE.DESCRIPTION' | translate }} {{ 'QUICKSTART.DIALOG.CHANGE.DESCRIPTION' | translate }}
<div class="framework-change-block"> <div class="framework-change-block">
<cnsl-framework-autocomplete <cnsl-framework-autocomplete
[frameworkId]="data.framework.id" [frameworkId]="data.framework?.id"
[frameworks]="data.frameworks" [frameworks]="data.frameworks"
(selectionChanged)="findFramework($event)" (selectionChanged)="findFramework($event)"
></cnsl-framework-autocomplete> ></cnsl-framework-autocomplete>

11
console/src/app/components/framework-change/framework-change.component.html
View File

@@ -1,12 +1,19 @@
<div class="framework-change-wrapper"> <div class="framework-change-wrapper">
<div class="framework-card-wrapper"> <div class="framework-card-wrapper">
<div class="framework-card card" *ngIf="framework | async as framework"> <div class="framework-card card" *ngIf="framework | async as framework; else frameworkFallback">
<div [routerLink]="['/app-create']" [queryParams]="{ id: framework.docsLink }" class=""> <div>
<img class="dark-only" *ngIf="framework.imgSrcDark" [src]="framework.imgSrcDark" /> <img class="dark-only" *ngIf="framework.imgSrcDark" [src]="framework.imgSrcDark" />
<img class="light-only" *ngIf="framework.imgSrcLight" [src]="framework.imgSrcLight" /> <img class="light-only" *ngIf="framework.imgSrcLight" [src]="framework.imgSrcLight" />
</div> </div>
<span>{{ framework.title }}</span> <span>{{ framework.title }}</span>
</div> </div>
<ng-template #frameworkFallback>
<div class="framework-card card">
<span>{{ 'QUICKSTART.SELECT_FRAMEWORK' | translate }}</span>
</div>
</ng-template>
<button (click)="openDialog()" mat-stroked-button> <button (click)="openDialog()" mat-stroked-button>
{{ 'ACTIONS.CHANGE' | translate }} {{ 'ACTIONS.CHANGE' | translate }}
</button> </button>

10
console/src/app/pages/app-create/app-create.component.ts
View File

@@ -132,9 +132,13 @@ export class AppCreateComponent implements OnDestroy {
.addProject(project.toObject()) .addProject(project.toObject())
.then((resp: AddProjectResponse.AsObject) => { .then((resp: AddProjectResponse.AsObject) => {
this.error.set(''); this.error.set('');
this.router.navigate(['/projects', resp.id, 'apps', 'integrate'], { if (this.customFramework()) {
queryParams: { framework: this.framework()?.id }, this.router.navigate(['/projects', resp.id, 'apps', 'create']);
}); } else if (this.framework()) {
this.router.navigate(['/projects', resp.id, 'apps', 'integrate'], {
queryParams: { framework: this.framework()?.id },
});
}
}) })
.catch((error) => { .catch((error) => {
const { message } = error; const { message } = error;

2
console/src/app/pages/projects/apps/integrate/integrate.component.html
View File

@@ -124,7 +124,7 @@
<div class="app-integrate-actions"> <div class="app-integrate-actions">
<button <button
mat-raised-button mat-raised-button
[disabled]="loading" [disabled]="loading || !framework()"
class="create-button" class="create-button"
color="primary" color="primary"
(click)="createApp()" (click)="createApp()"