From 3ab0bbbfd2ce2ae68ada11ead0efccd3662d6531 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Mar 2019 16:56:14 -0600
Subject: [PATCH] Use template variables and convert Google Calendar widgets to
 new format

Fixes https://github.com/turt2live/matrix-dimension/issues/179

Part of https://github.com/turt2live/matrix-dimension/issues/141
---
 .../widget/google-calendar/gcal.widget.component.html |  2 +-
 .../widget/google-calendar/gcal.widget.component.ts   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/app/configs/widget/google-calendar/gcal.widget.component.html b/web/app/configs/widget/google-calendar/gcal.widget.component.html
index ae67f6b..b7ecbbd 100644
--- a/web/app/configs/widget/google-calendar/gcal.widget.component.html
+++ b/web/app/configs/widget/google-calendar/gcal.widget.component.html
@@ -4,7 +4,7 @@
             Shared Calendar ID
             <input type="text" class="form-control"
                    placeholder="en.uk#holiday@group.v.calendar.google.com"
-                   [(ngModel)]="widget.dimension.newData.src" name="widget-url-{{widget.id}}"
+                   [(ngModel)]="widget.dimension.newData.shareId" name="widget-url-{{widget.id}}"
                    [disabled]="isUpdating"/>
         </label>
     </ng-template>
diff --git a/web/app/configs/widget/google-calendar/gcal.widget.component.ts b/web/app/configs/widget/google-calendar/gcal.widget.component.ts
index 7d88dda..8a28e17 100644
--- a/web/app/configs/widget/google-calendar/gcal.widget.component.ts
+++ b/web/app/configs/widget/google-calendar/gcal.widget.component.ts
@@ -12,7 +12,7 @@ export class GoogleCalendarWidgetConfigComponent extends WidgetComponent {
     }
 
     protected  OnNewWidgetPrepared(widget: EditableWidget) {
-        widget.dimension.newData.src = "";
+        widget.dimension.newData.shareId = "";
     }
 
     protected OnWidgetsDiscovered(widgets: EditableWidget[]) {
@@ -21,6 +21,10 @@ export class GoogleCalendarWidgetConfigComponent extends WidgetComponent {
                 // Convert legacy Dimension widgets to new source
                 widget.data.src = widget.data.dimSrc;
             }
+            if (widget.data.src && !widget.data.shareId) {
+                // Convert even more legacy Dimension widgets to new source
+                widget.data.shareId = widget.data.src;
+            }
         }
     }
 
@@ -33,11 +37,10 @@ export class GoogleCalendarWidgetConfigComponent extends WidgetComponent {
     }
 
     private setCalendarUrl(widget: EditableWidget) {
-        if (!widget.dimension.newData.src || widget.dimension.newData.src.trim().length === 0) {
+        if (!widget.dimension.newData.shareId || widget.dimension.newData.shareId.trim().length === 0) {
             throw new Error("Please enter a shared calendar ID");
         }
 
-        const encodedId = encodeURIComponent(widget.dimension.newData.src);
-        widget.dimension.newUrl = window.location.origin + "/widgets/gcal?calendarId=" + encodedId;
+        widget.dimension.newUrl = window.location.origin + "/widgets/gcal?calendarId=$shareId";
     }
 }
\ No newline at end of file