update

Author: chriskapp

projects/fusio-sdk/src/lib/component/app/form/app-form.component.html

@@ -11,7 +11,7 @@
         <label for="name" class="col-sm-2 col-form-label fw-bold">Name</label>
         <div class="col-sm-10">
           <div class="input-group">
-            <input type="text" id="name" name="name" [(ngModel)]="entity.name" class="form-control">
+            <input type="text" id="name" name="name" [(ngModel)]="entity.name" [disabled]="mode === 3" class="form-control">
             <button class="btn btn-outline-secondary" type="button" [ngbPopover]="nameHelp"><i class="bi bi-question"></i></button>
             <ng-template #nameHelp>Name of the app</ng-template>
           </div>
@@ -21,7 +21,7 @@
         <label for="url" class="col-sm-2 col-form-label fw-bold">Url</label>
         <div class="col-sm-10">
           <div class="input-group">
-            <input type="url" id="url" name="url" [(ngModel)]="entity.url" class="form-control">
+            <input type="url" id="url" name="url" [(ngModel)]="entity.url" [disabled]="mode === 3" class="form-control">
             <button class="btn btn-outline-secondary" type="button" [ngbPopover]="urlHelp"><i class="bi bi-question"></i></button>
             <ng-template #urlHelp>Url of the app</ng-template>
           </div>
@@ -30,7 +30,7 @@
       <div class="mb-3 row">
         <label class="col-sm-2 col-form-label fw-bold">Scopes</label>
         <div class="col-sm-10">
-          <fusio-checkbox-list name="scopes" [service]="scope" [data]="entity.scopes" (dataChange)="entity.scopes = $event"></fusio-checkbox-list>
+          <fusio-checkbox-list name="scopes" [service]="scope" [data]="entity.scopes" (dataChange)="entity.scopes = $event" [disabled]="mode === 3"></fusio-checkbox-list>
         </div>
       </div>
       <div class="btn-group" role="group">

projects/fusio-sdk/src/lib/component/form/select/form-select.component.html

@@ -1,11 +1,13 @@
 
-<ng-container *ngIf="useName">
-  <select [id]="name" [name]="name" [ngModel]="data" (ngModelChange)="changeValue($event)" class="form-select">
-    <option *ngFor="let entry of entries" [ngValue]="entry.name">{{entry.name}}</option>
-  </select>
-</ng-container>
-<ng-container *ngIf="!useName">
-  <select [id]="name" [name]="name" [ngModel]="data" (ngModelChange)="changeValue($event)" class="form-select">
-    <option *ngFor="let entry of entries" [ngValue]="entry.id">{{entry.name}}</option>
-  </select>
-</ng-container>
+<div class="input-group">
+  <ng-container *ngIf="useName">
+    <select [id]="name" [name]="name" [ngModel]="data" (ngModelChange)="changeValue($event)" class="form-select">
+      <option *ngFor="let entry of entries" [ngValue]="entry.name">{{entry.name}}</option>
+    </select>
+  </ng-container>
+  <ng-container *ngIf="!useName">
+    <select [id]="name" [name]="name" [ngModel]="data" (ngModelChange)="changeValue($event)" class="form-select">
+      <option *ngFor="let entry of entries" [ngValue]="entry.id">{{entry.name}}</option>
+    </select>
+  </ng-container>
+</div>

projects/fusio-sdk/src/lib/component/register/activate/activate.component.ts

@@ -14,7 +14,7 @@ export class ActivateComponent implements OnInit {
 
   response?: CommonMessage;
 
-  constructor(private fusio: FusioService, private event: EventService, private error: ErrorService, protected route: ActivatedRoute) {
+  constructor(private fusio: FusioService, private error: ErrorService, protected route: ActivatedRoute) {
   }
 
   async ngOnInit(): Promise<void> {
@@ -33,8 +33,6 @@ export class ActivateComponent implements OnInit {
 
     try {
       this.response = await this.fusio.getClientAnonymous().consumer().account().activate(activate);
-
-      this.event.dispatchRegisterActivate();
     } catch (error) {
       this.response = this.error.convert(error);
     }

projects/fusio-sdk/src/lib/component/register/register.component.ts

@@ -24,7 +24,7 @@ export class RegisterComponent implements OnInit {
   response?: CommonMessage;
   loading = false
 
-  constructor(private fusio: FusioService, private event: EventService, private error: ErrorService, private config: ConfigService) {
+  constructor(private fusio: FusioService, private error: ErrorService, private config: ConfigService) {
   }
 
   ngOnInit(): void {
@@ -54,8 +54,6 @@ export class RegisterComponent implements OnInit {
       this.response = await this.fusio.getClientAnonymous().consumer().account().register(this.credentials);
       this.loading = false;
 
-      this.event.dispatchRegister(this.credentials.name, this.credentials.email);
-
       this.resetForm();
     } catch (error) {
       this.loading = false;

projects/fusio-sdk/src/lib/component/subscription/callback/callback.component.ts

@@ -17,7 +17,7 @@ export class CallbackComponent implements OnInit {
   plan?: ConsumerPlan;
   response?: CommonMessage;
 
-  constructor(private fusio: FusioService, private event: EventService, private error: ErrorService, private config: ConfigService, private route: ActivatedRoute) { }
+  constructor(private fusio: FusioService, private error: ErrorService, private config: ConfigService, private route: ActivatedRoute) { }
 
   async ngOnInit(): Promise<void> {
     this.homePath = this.config.getHomePath();
@@ -33,8 +33,6 @@ export class CallbackComponent implements OnInit {
   async loadPlan(id: string) {
     try {
       this.plan = await this.fusio.getClient().consumer().plan().get(id);
-
-      this.event.dispatchPurchase(this.plan);
     } catch (error) {
       this.response = this.error.convert(error);
     }

projects/fusio-sdk/src/lib/component/subscription/subscription.component.ts

@@ -17,7 +17,7 @@ export class SubscriptionComponent implements OnInit {
   plans?: Array<ConsumerPlan>
   response?: CommonMessage;
 
-  constructor(private fusio: FusioService, private location: LocationStrategy, private event: EventService, private error: ErrorService, private config: ConfigService) { }
+  constructor(private fusio: FusioService, private location: LocationStrategy, private error: ErrorService, private config: ConfigService) { }
 
   async ngOnInit(): Promise<void> {
     const response = await this.fusio.getClient().consumer().plan().getAll(0, 1024);
@@ -55,8 +55,6 @@ export class SubscriptionComponent implements OnInit {
       });
 
       if (response.approvalUrl) {
-        this.event.dispatchCheckout(plan);
-
         location.href = response.approvalUrl;
       }
     } catch (error) {

projects/fusio-sdk/src/lib/component/token/detail/token-detail.component.html

@@ -6,9 +6,6 @@
       <a [routerLink]="getEditLink(selected.id)" class="btn btn-primary fusio-btn-update">Update</a>
       <a [routerLink]="getDeleteLink(selected.id)" class="btn btn-danger fusio-btn-delete">Delete</a>
     </div>
-    <div class="float-end">
-      <button type="button" [routerLink]="getListLink()" class="btn btn-outline-secondary fusio-btn-back">Back</button>
-    </div>
     <div class="fusio-detail">
       <div class="row">
         <div class="col-2 fw-bold">Name</div>

projects/fusio-sdk/src/lib/component/token/form/token-form.component.html

@@ -6,12 +6,19 @@
   </div>
   <div class="card-body">
     <fusio-message [response]="response"></fusio-message>
+    <div *ngIf="accessToken">
+      <p>Make sure to copy your personal access token now as you will not be able to see this again.</p>
+      <div class="input-group mb-3">
+        <input type="text" [ngModel]="accessToken.access_token" readonly class="form-control">
+        <button class="btn btn-primary" ngxClipboard [cbContent]="accessToken.access_token">Copy</button>
+      </div>
+    </div>
     <form>
       <div class="mb-3 row">
         <label for="name" class="col-sm-2 col-form-label fw-bold">Name</label>
         <div class="col-sm-10">
           <div class="input-group">
-            <input type="text" id="name" name="name" [(ngModel)]="entity.name" class="form-control">
+            <input type="text" id="name" name="name" [(ngModel)]="entity.name" [disabled]="mode === 3" class="form-control">
             <button class="btn btn-outline-secondary" type="button" [ngbPopover]="nameHelp"><i class="bi bi-question"></i></button>
             <ng-template #nameHelp>The name of the token</ng-template>
           </div>
@@ -21,7 +28,7 @@
         <label for="name" class="col-sm-2 col-form-label fw-bold">Expires</label>
         <div class="col-sm-10">
           <div class="input-group">
-            <input type="date" id="expire" name="expire" [(ngModel)]="entity.expire" class="form-control">
+            <input type="date" id="expire" name="expire" [(ngModel)]="entity.expire" [disabled]="mode === 3" class="form-control">
             <button class="btn btn-outline-secondary" type="button" [ngbPopover]="expireHelp"><i class="bi bi-question"></i></button>
             <ng-template #expireHelp>Date at which the token expires</ng-template>
           </div>
@@ -30,7 +37,7 @@
       <div class="mb-3 row">
         <label class="col-sm-2 col-form-label fw-bold">Scopes</label>
         <div class="col-sm-10">
-          <fusio-checkbox-list name="scopes" [service]="scope" [data]="entity.scopes" (dataChange)="entity.scopes = $event"></fusio-checkbox-list>
+          <fusio-checkbox-list name="scopes" [service]="scope" [data]="entity.scopes" (dataChange)="entity.scopes = $event" [disabled]="mode === 3"></fusio-checkbox-list>
         </div>
       </div>
       <div class="btn-group" role="group">

projects/fusio-sdk/src/lib/component/token/form/token-form.component.ts

@@ -1,10 +1,11 @@
 import {Component} from '@angular/core';
-import {ConsumerToken} from "fusio-sdk";
+import {ConsumerToken, ConsumerTokenAccessToken} from "fusio-sdk";
 import {ErrorService} from "../../../service/error.service";
 import {ActivatedRoute, Router} from "@angular/router";
 import {Form} from "../../../abstract/form";
 import {TokenService} from "../../../service/token.service";
 import {ScopeService} from "../../../service/scope.service";
+import {error} from "ng-packagr/lib/utils/log";
 
 @Component({
   selector: 'fusio-token-form',
@@ -13,6 +14,8 @@ import {ScopeService} from "../../../service/scope.service";
 })
 export class TokenFormComponent extends Form<ConsumerToken> {
 
+  accessToken?: ConsumerTokenAccessToken;
+
   constructor(private token: TokenService, public scope: ScopeService, route: ActivatedRoute, router: Router, error: ErrorService) {
     super(route, router, error);
   }
@@ -21,4 +24,8 @@ export class TokenFormComponent extends Form<ConsumerToken> {
     return this.token;
   }
 
+  protected override onSubmit() {
+    this.accessToken = this.token.getToken();
+  }
+
 }

projects/fusio-sdk/src/lib/component/token/list/token-list.component.html

@@ -10,19 +10,15 @@
     <table class="table table-striped">
       <thead>
       <tr>
-        <th style="">Name</th>
-        <th style="width:200px">Scopes</th>
-        <th style="width:200px">Expire-Date</th>
-        <th style="width:200px">Insert-Date</th>
+        <th style="width:50%">Name</th>
+        <th style="width:50%">Scopes</th>
         <th style="width:100px"></th>
       </tr>
       </thead>
       <tbody>
       <tr *ngFor="let entry of entries">
         <td>{{entry.name}}</td>
         <td><fusio-scopes [scopes]="entry.scopes"></fusio-scopes></td>
-        <td>{{entry.expire|date:'short'}}</td>
-        <td>{{entry.date|date:'short'}}</td>
         <td>
           <div class="btn-group" role="group">
             <a [routerLink]="getDetailLink(entry.id)" class="btn btn-primary"><i class="bi bi-search"></i></a>

projects/fusio-sdk/src/lib/component/token/show/token-show.component.html

@@ -4,12 +4,7 @@ <h4 class="modal-title">Token</h4>
   <button type="button" class="btn-close" aria-label="Close" (click)="modal.dismiss()"></button>
 </div>
 <div class="modal-body">
-  <p>Make sure to copy your personal access token now as you will not be able to see this again.</p>
-  <div class="input-group mb-3">
-    <input type="text" [ngModel]="token.access_token" readonly class="form-control">
-    <button class="btn btn-primary" ngxClipboard [cbContent]="token.access_token">Copy</button>
-  </div>
-  <p class="text-muted">Expires on: {{expires|date:'yyyy-MM-dd'}}</p>
+
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-light" (click)="modal.close()">Close</button>

projects/fusio-sdk/src/lib/component/webhook/detail/webhook-detail.component.html

@@ -6,9 +6,6 @@
       <a [routerLink]="getEditLink(selected.id)" class="btn btn-primary fusio-btn-update">Update</a>
       <a [routerLink]="getDeleteLink(selected.id)" class="btn btn-danger fusio-btn-delete">Delete</a>
     </div>
-    <div class="float-end">
-      <button type="button" [routerLink]="getListLink()" class="btn btn-outline-secondary fusio-btn-back">Back</button>
-    </div>
     <div class="fusio-detail">
       <div class="row">
         <div class="col-2 fw-bold">Event</div>

projects/fusio-sdk/src/lib/component/webhook/form/webhook-form.component.html

@@ -5,9 +5,6 @@
     <ng-container *ngIf="mode === 3">Delete</ng-container>
   </div>
   <div class="card-body">
-    <div class="float-end">
-      <button type="button" [routerLink]="getListLink()" class="btn btn-outline-secondary fusio-btn-back">Back</button>
-    </div>
     <fusio-message [response]="response"></fusio-message>
     <form>
       <div class="mb-3 row">
@@ -23,11 +20,7 @@
       <div class="mb-3 row">
         <label for="event" class="col-sm-2 col-form-label fw-bold">Event</label>
         <div class="col-sm-10">
-          <div class="input-group">
-            <fusio-select id="event" name="event" [data]="entity.event" (dataChange)="entity.event = $event"></fusio-select>
-            <button class="btn btn-outline-secondary" type="button" [ngbPopover]="eventHelp"><i class="bi bi-question"></i></button>
-            <ng-template #eventHelp>Target event to trigger this webhook</ng-template>
-          </div>
+          <fusio-select id="event" name="event" [service]="event" [data]="entity.event" (dataChange)="entity.event = $event"></fusio-select>
         </div>
       </div>
       <div class="mb-3 row">

projects/fusio-sdk/src/lib/component/webhook/form/webhook-form.component.ts

@@ -4,6 +4,7 @@ import {ErrorService} from "../../../service/error.service";
 import {Form} from "../../../abstract/form";
 import {ActivatedRoute, Router} from "@angular/router";
 import {WebhookService} from "../../../service/webhook.service";
+import {EventService} from "../../../service/event.service";
 
 @Component({
   selector: 'fusio-webhook-form',
@@ -12,7 +13,7 @@ import {WebhookService} from "../../../service/webhook.service";
 })
 export class WebhookFormComponent extends Form<ConsumerWebhook> {
 
-  constructor(private webhook: WebhookService, route: ActivatedRoute, router: Router, error: ErrorService) {
+  constructor(private webhook: WebhookService, public event: EventService, route: ActivatedRoute, router: Router, error: ErrorService) {
     super(route, router, error);
   }