From dd9e8950f4473dd39841ba3150bff23b8f172016 Mon Sep 17 00:00:00 2001
From: Baptiste Lemoine <contact@cipherbliss.com>
Date: Tue, 4 Feb 2020 11:35:29 +0100
Subject: [PATCH] :zap: unify update config after fetching a poll config

---
 src/app/app.module.ts                         |  2 ++
 src/app/config/PollConfig.ts                  |  1 +
 .../end-confirmation.component.html           | 20 ++-----------------
 .../poll-display/poll-display.component.html  | 11 ++--------
 .../poll-display/poll-display.component.ts    | 15 +++++---------
 .../visibility/visibility.component.html      |  2 +-
 src/app/services/config.service.ts            |  1 +
 7 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 07094b7b..46e5344e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -54,6 +54,7 @@ import {ErasableInputComponent} from './ui/erasable-input/erasable-input.compone
 import {ConfirmDialogModule} from 'primeng/confirmdialog';
 import {DialogModule} from 'primeng/dialog';
 import {DateValueAccessorModule} from "angular-date-value-accessor";
+import {CopyTextComponent} from './ui/copy-text/copy-text.component';
 
 export class MyMissingTranslationHandler implements MissingTranslationHandler {
     handle(params: MissingTranslationHandlerParams) {
@@ -97,6 +98,7 @@ export function HttpLoaderFactory(http: HttpClient) {
         VotingCommentComponent,
         ResettableInputDirective,
         ErasableInputComponent,
+        CopyTextComponent,
 
     ],
     imports: [
diff --git a/src/app/config/PollConfig.ts b/src/app/config/PollConfig.ts
index 12e3bfe2..10e37a34 100644
--- a/src/app/config/PollConfig.ts
+++ b/src/app/config/PollConfig.ts
@@ -54,6 +54,7 @@ export class PollConfig {
     urlSlugPublic = null;
     urlPublic = environment.baseHref + '/#/poll/id/3';
     urlAdmin = environment.baseHref + '/#/admin/d65es45fd45sdf45sd345f312sdf31sgfd345';
+    adminKey = '';
     canModifyAnswers = 1;// everybody, self, nobody (= just admin)
     whoModifiesAnswers = "self";// everybody, self, nobody (= just admin)
     whoCanChangeAnswers = 'everybody';// everybody, self, nobody (= just admin)
diff --git a/src/app/pages/end-confirmation/end-confirmation.component.html b/src/app/pages/end-confirmation/end-confirmation.component.html
index ed76da26..a0a60d6c 100644
--- a/src/app/pages/end-confirmation/end-confirmation.component.html
+++ b/src/app/pages/end-confirmation/end-confirmation.component.html
@@ -21,15 +21,7 @@
         <a href="{{config.urlAdmin}}" >{{config.urlAdmin}}
         </a >
     </p >
-    <button
-        class="btn btn--primary"
-        (click)="copyLink(config.urlAdmin)"
-        [ngxClipboard]
-        cbContent="{{config.urlAdmin}}"
-    >
-        <i class="fa fa-copy" ></i >
-        Copier le lien
-    </button >
+    <framadate-copy-text [textToCopy]='config.urlAdmin' ></framadate-copy-text >
     <a href="{{config.urlAdmin}}" >
         Voir le sondage coté administrateur·ice
     </a >
@@ -48,15 +40,7 @@
         </a >
 
     </p >
-    <button
-        class="btn btn--primary"
-        (click)="copyLink(config.urlPublic)"
-        [ngxClipboard]
-        cbContent="{{config.urlPublic}}"
-    >
-        <i class="fa fa-copy" ></i >
-        Copier le lien
-    </button >
+    <framadate-copy-text [textToCopy]='config.urlPublic' ></framadate-copy-text >
     <a href="{{config.urlPublic}}" >
         Voir le sondage
     </a >
diff --git a/src/app/pages/poll-display/poll-display.component.html b/src/app/pages/poll-display/poll-display.component.html
index 292e9fca..00f575d9 100644
--- a/src/app/pages/poll-display/poll-display.component.html
+++ b/src/app/pages/poll-display/poll-display.component.html
@@ -34,7 +34,6 @@
     <!--        </ul >-->
     <!--    </nav >-->
 
-
 </div >
 <section class="name" >
     <label for="name" >
@@ -143,14 +142,8 @@
             {{config.currentPoll.urlPublic}}
         </a >
     </p >
-    <button
-        class=" btn btn--primary btn--outline"
-        [ngxClipboard]
-        [cbContent]="config.currentPoll.urlPublic"
-        id="copyLink" >
-        <i class='fa fa-copy' ></i >
-        {{"admin.copy_link" |translate}}
-    </button >
+
+    <framadate-copy-text [textToCopy]='config.currentPoll.urlPublic' ></framadate-copy-text >
     <h3 class="margin-top-x6 margin-btm-x3" >
         Exporter/Imprimer
     </h3 >
diff --git a/src/app/pages/poll-display/poll-display.component.ts b/src/app/pages/poll-display/poll-display.component.ts
index a7d36768..c46ac19c 100644
--- a/src/app/pages/poll-display/poll-display.component.ts
+++ b/src/app/pages/poll-display/poll-display.component.ts
@@ -20,7 +20,7 @@ export class PollDisplayComponent extends BaseComponent implements OnInit {
                 public activeRoute: ActivatedRoute) {
         super(config);
         this.activeRoute.paramMap.subscribe(params => {
-            console.log('params', params)
+            console.log('params', params);
             this.config.pollId = params.get('poll');
             this.config.pollSlug = params.get('pollSlug');
             if (!this.config.loading) {
@@ -41,24 +41,21 @@ export class PollDisplayComponent extends BaseComponent implements OnInit {
         const pollSlug = this.activeRoute.snapshot.params.pollSlug;
 
         if (!environment.production) {
-            console.log('mockPoll3', mockPoll3)
+            console.log('mockPoll3', mockPoll3);
             this.config.currentPoll = mockPoll3;
             return;
         }
         if (id) {
             this.config.loading = true;
-            this.config.pollId = id;
             // store it in the poll property here
             this.config.getPollById(id).subscribe(
                 (res: any) => {
                     console.log('res', res);
-
-
-                    this.config.currentPoll = res;
+                    this.config.updateCurrentPollFromResponse(res);
                     this.config.loading = false;
                 }, (e) => {
                     // handle need for a password
-                    console.log('e', e)
+                    console.log('e', e);
                     this.config.handleError(e)
                 }
             );
@@ -66,10 +63,8 @@ export class PollDisplayComponent extends BaseComponent implements OnInit {
             this.config.loading = true;
             this.config.getPollByURL(pollSlug).subscribe(
                 (res: any) => {
-                    console.log('res', res)
-                    this.config.pollId = res.id;
-                    this.config.currentPoll = res;
                     this.config.loading = false;
+                    this.config.updateCurrentPollFromResponse(res);
                 }, (e) => {
                     // handle need for a password
                     this.config.handleError(e)
diff --git a/src/app/pages/visibility/visibility.component.html b/src/app/pages/visibility/visibility.component.html
index b28281e4..979015c1 100644
--- a/src/app/pages/visibility/visibility.component.html
+++ b/src/app/pages/visibility/visibility.component.html
@@ -121,7 +121,7 @@
         <a [href]="'/#/vote/poll/slug/' + config.customUrl" >
             {{environment.baseHref + '#/vote/poll/slug/' + config.customUrl}}
         </a >
-
+        <framadate-copy-text [textToCopy]='config.urlPublic' ></framadate-copy-text >
     </div >
     <br >
     <label for="passwordAccess" >
diff --git a/src/app/services/config.service.ts b/src/app/services/config.service.ts
index 96a1d983..0fc55762 100644
--- a/src/app/services/config.service.ts
+++ b/src/app/services/config.service.ts
@@ -288,6 +288,7 @@ export class ConfigService extends PollConfig {
         if (res.poll.customUrl) {
             this.urlSlugPublic = this.baseHref + '#/vote/poll/id/' + res.poll.customUrl;
         }
+        this.adminKey = res.admin_key;
         this.urlAdmin = this.baseHref + '#/admin/' + res.admin_key;
     }