[reclaim-ui] 384/459: move info for import

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit bf6457a579cbd8d91c7e9c6b576e287497d123b1
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Dec 27 19:14:15 2020 +0900

    move info for import
---
 src/app/edit-identity/edit-identity.component.html | 24 ++++++++--------------
 src/app/edit-identity/edit-identity.component.ts   |  7 +------
 src/locales/de/messages.json                       |  2 +-
 src/locales/en/messages.json                       |  4 ++--
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/app/edit-identity/edit-identity.component.html 
b/src/app/edit-identity/edit-identity.component.html
index 8f34a95..e77de59 100644
--- a/src/app/edit-identity/edit-identity.component.html
+++ b/src/app/edit-identity/edit-identity.component.html
@@ -1,7 +1,3 @@
-<div *ngIf="actions !== ''" class="alert alert-primary fade show" 
style="position:fixed;top:0; width:100%;z-index:100;">
-  <i class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{actions}}
-</div>
-
 <!-- Identity edit screen -->
 <div class="m-2 card">
   <div class="card-avatar card-img-top">
@@ -14,6 +10,15 @@
     <i class="fa fa-spinner fa-spin"></i>
     Please wait
   </div>
+  <div *ngIf="validImportEmail" class="col-sm alert alert-primary 
alert-dismissible fade show my-2" role="alert" >
+    {{getMessage("edit_identity_html@importInfo", {ISSUERNAME: 
getImportIssuerName()})}}<br/>
+              
<i>{{getMessage("Note")}}</i>{{getMessage("edit_credentials_html@linkAccountInfo2")}}
+              <br/>
+    <button class="ml-1 btn btn-primary" (click)="import()">
+      <span class="fa fa-download"></span> 
{{getMessage("edit_identity_html@importFrom", {ISSUERNAME: 
getImportIssuerName()})}}
+    </button>
+  </div>
+
   <!-- Attribute table -->
   <div class="card-body" *ngIf="!importInProgress">
     <div>
@@ -68,9 +73,6 @@
               <button class="ml-2 btn btn-primary"  
(click)="deleteAttribute(claim)">
                 <span class="fa fa-trash"></span>
               </button>
-              <button *ngIf="validImportEmail" class="ml-1 btn btn-primary" 
(click)="import()">
-                <span class="fa fa-download"></span> 
{{getMessage("edit_identity_html@importFrom", {ISSUERNAME: 
getImportIssuerName()})}}
-              </button>
 
             </div>
           </div>
@@ -114,14 +116,6 @@
               </button>
             </div>
           </div>
-          <div class="row mb-3" *ngIf="validImportEmail">
-            <!-- Instructions -->
-            <div
-              class="col-sm alert alert-primary alert-dismissible fade show 
my-2" role="alert" >
-              {{getMessage("edit_identity_html@importInfo")}}<br/>
-              
<i>{{getMessage("Note")}}</i>{{getMessage("edit_credentials_html@linkAccountInfo2")}}
-            </div>
-          </div>
       </div>
       <div class="table pb-1">
           <!-- Standard "profile" claims first -->
diff --git a/src/app/edit-identity/edit-identity.component.ts 
b/src/app/edit-identity/edit-identity.component.ts
index c41167e..32c4cd6 100644
--- a/src/app/edit-identity/edit-identity.component.ts
+++ b/src/app/edit-identity/edit-identity.component.ts
@@ -49,7 +49,6 @@ export class EditIdentityComponent implements OnInit {
   missingNonStandardClaims: Attribute[] = [];
   showExtraInfo: boolean = false;
   showGeneralInfo: boolean = false;
-  actions: string = '';
   claimInEdit: Attribute = null;
 
   //Attribute import
@@ -144,7 +143,7 @@ export class EditIdentityComponent implements OnInit {
       this.existingPhoneClaims = this.bootstrapClaimArray 
(this.oidcService.getStandardPhoneClaims());
       this.existingAddressClaims = this.bootstrapClaimArray 
(this.oidcService.getStandardAddressClaims());
       this.existingNonStandardClaims = [];
-      this.attributes = attributes;
+      this.attributes = attributes.sort();
       for (let attr of this.attributes) {
         if (this.oidcService.isStandardProfileClaim(attr)) {
           this.existingProfileClaims = 
this.updateClaimArray(this.existingProfileClaims, attr);
@@ -294,7 +293,6 @@ export class EditIdentityComponent implements OnInit {
        */
       this.newAttribute.credential = '';
     }
-    this.actions = "Saving...";
     this.storeAttributes()
       .pipe(
         finalize(() => {
@@ -306,7 +304,6 @@ export class EditIdentityComponent implements OnInit {
         }))
       .subscribe(res => {
         //FIXME success dialog/banner
-        this.actions = "";
         this.updateAttributes();
         this.router.navigate(['/']);
       },
@@ -381,7 +378,6 @@ export class EditIdentityComponent implements OnInit {
    * Adds a new attribute, stores all changes and STAYS on this page.
    */
   addAttribute() {
-    this.actions = "Saving..."
     this.storeAttributes()
       .pipe(
         finalize(() => {
@@ -392,7 +388,6 @@ export class EditIdentityComponent implements OnInit {
           this.updateAttributes();
         }))
       .subscribe(res => {
-        this.actions = '';
         console.log(res);
       },
       err => {
diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index 67207c3..a8e58c1 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -50,7 +50,7 @@
     "edit_credentials_ts@noAccount": "Kein Konto mit diese E-Email Addresse 
gefunden",
     "edit_credentials_ts@errorWrongAddress": "Ein Fehler ist aufgetreten - Der 
Grund könnte eine falsche E-Email Adresse sein.",
     "edit_identity_html@basicInfo": "Gebräuchliche Informationen",
-    "edit_identity_html@importInfo": "Über den 'Importieren'-Knopf kannst du 
gegebenenfalls Attribute aus einem existierenden Konto importieren.",
+    "edit_identity_html@importInfo": "Deine E-Mail-Addresse deutet darauf hin, 
dass Du Attribute eines externen Kontos bei ``{{ISSUERNAME}}´´ importieren 
kannst.",
     "edit_identity_html@linkAccount": "Attribute importieren",
 
     "edit_identity_html@standardScopes": "Die unten stehenden Attribute 
entsprechen den standard \"scopes\" von OpenID Connect:\n``profile'', 
``email'', ``phone'' and ``address''.",
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 4679ec0..9a243a9 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -53,11 +53,11 @@
     "edit_credentials_ts@noAccount": "No account found with this email",
     "edit_credentials_ts@errorWrongAddress": "An Error has occured - This may 
have been caused by a wrong e-mail address.",
     "edit_identity_html@basicInfo": "Basic user information",
-    "edit_identity_html@importInfo": "You may be able to import attributes 
from an existing online account by clicking the 'Import' button.",
+    "edit_identity_html@importInfo": "Your email address indicates that you 
may be able to import attributes from an external account at 
``{{ISSUERNAME}}´´.",
     "edit_identity_html@linkAccount": "Import attributes",
     "edit_identity_html@standardScopes": "The attributes below correspond to 
the standard scopes of the\nOpenID Connect specification: ``profile'', 
``email'', ``phone'' and ``address''.",
     "edit_identity_html@selfissued": "Self-issued",
-    "edit_identity_html@importFrom": "Import from ``{{ISSUERNAME}}´´",
+    "edit_identity_html@importFrom": "Try import from ``{{ISSUERNAME}}´´",
     "edit_identity_html@unset": "Unset",
     "edit_identity_html@attribute": "Attribute",
     "edit_identity_html@plain": "Plain",

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.