refactor: github publish information

Author: peterpeterparker

cloud/functions/src/model/data/deck.ts

@@ -20,7 +20,8 @@ export interface DeckGitHubRepo {
 }
 
 export interface DeckGitHub {
-  repo: DeckGitHubRepo;
+  repo?: DeckGitHubRepo;
+  publish: boolean;
 }
 
 export interface DeckMetaAuthor {
@@ -43,7 +44,6 @@ export interface DeckMeta {
   published_at: firestore.Timestamp;
 
   feed: boolean;
-  github?: boolean;
 
   updated_at: firestore.Timestamp;
 }

cloud/functions/src/watch/publish/github/utils/github-db.ts

@@ -1,7 +1,7 @@
 import * as admin from 'firebase-admin';
 
 import {Token, TokenData} from '../../../../model/data/token';
-import {DeckData, DeckGitHubRepo} from '../../../../model/data/deck';
+import {DeckData, DeckGitHub, DeckGitHubRepo} from '../../../../model/data/deck';
 
 export function findToken(userId: string): Promise<Token> {
   return new Promise<Token>(async (resolve, reject) => {
@@ -43,7 +43,7 @@ export function updateDeckGitHub(deckId: string, repo: DeckGitHubRepo | undefine
         updated_at: admin.firestore.Timestamp.now(),
         github: {
           repo: {...repo},
-        },
+        } as DeckGitHub,
       };
 
       const documentReference: admin.firestore.DocumentReference = admin.firestore().doc(`/decks/${deckId}`);

cloud/functions/src/watch/publish/github/utils/github-utils.ts

@@ -15,7 +15,7 @@ export async function getRepo(githubToken: string, user: GitHubUser, userId: str
   const project: string = deckData.meta.title.replace(' ', '-').toLowerCase();
   const description: string = deckData.meta.description ? (deckData.meta.description as string) : '';
 
-  if (deckData.github) {
+  if (deckData.github && deckData.github.repo) {
     const existingRepo: DeckGitHubRepo | undefined = await findRepo(githubToken, user, deckData.github.repo.name);
 
     if (existingRepo) {

studio/src/app/components/editor/publish/app-publish-done/app-publish-done.tsx

@@ -54,11 +54,11 @@ export class AppPublishDone {
       return undefined;
     }
 
-    if (!deckStore.state.deck || !deckStore.state.deck.data || !deckStore.state.deck.data.meta || !deckStore.state.deck.data.meta.github) {
+    if (!deckStore.state.deck || !deckStore.state.deck.data || !deckStore.state.deck.data.github || !deckStore.state.deck.data.github.publish) {
       return undefined;
     }
 
-    if (!deckStore.state.deck.data.github) {
+    if (!deckStore.state.deck.data.github || !deckStore.state.deck.data.github.repo) {
       return (
         <ion-label class="published-url ion-padding ion-text-center">
           The source code of the presentation is processing <ion-spinner color="tertiary"></ion-spinner>

studio/src/app/components/editor/publish/app-publish-edit/app-publish-edit.tsx

@@ -105,7 +105,7 @@ export class AppPublishEdit {
         ? (deckStore.state.deck.data.meta.description as string)
         : await this.getFirstSlideContent();
     this.tags = deckStore.state.deck.data.meta && deckStore.state.deck.data.meta.tags ? (deckStore.state.deck.data.meta.tags as string[]) : [];
-    this.pushToGitHub = deckStore.state.deck.data.meta && deckStore.state.deck.data.meta.github !== undefined ? deckStore.state.deck.data.meta.github : true;
+    this.pushToGitHub = deckStore.state.deck.data.github ? deckStore.state.deck.data.github.publish : true;
   }
 
   private getFirstSlideContent(): Promise<string> {

studio/src/app/models/data/deck.tsx

@@ -18,7 +18,8 @@ export interface DeckGitHubRepo {
 }
 
 export interface DeckGitHub {
-  repo: DeckGitHubRepo;
+  repo?: DeckGitHubRepo;
+  publish: boolean;
 }
 
 export interface DeckMetaAuthor {
@@ -41,7 +42,6 @@ export interface DeckMeta {
   published_at?: firebase.firestore.Timestamp;
 
   feed?: boolean;
-  github?: boolean;
 
   updated_at: firebase.firestore.Timestamp;
 }

studio/src/app/services/editor/publish/publish.service.tsx

@@ -5,6 +5,7 @@ import 'firebase/auth';
 import deckStore from '../../../stores/deck.store';
 import userStore from '../../../stores/user.store';
 import errorStore from '../../../stores/error.store';
+import authStore from '../../../stores/auth.store';
 
 import {Deck, DeckData, DeckMetaAuthor} from '../../../models/data/deck';
 
@@ -68,7 +69,7 @@ export class PublishService {
             deckId: deck.id,
             ownerId: deck.data.owner_id,
             publish: true,
-            github: deck.data.meta.github,
+            github: deck.data.github ? deck.data.github.publish : false,
           }),
         });
 
@@ -99,13 +100,11 @@ export class PublishService {
         if (!deck.data.meta) {
           deck.data.meta = {
             title: deck.data.name,
-            github: github,
             updated_at: now,
           };
         } else {
           deck.data.meta.title = deck.data.name;
           deck.data.meta.updated_at = now;
-          deck.data.meta.github = github;
         }
 
         if (description && description !== undefined && description !== '') {
@@ -149,6 +148,17 @@ export class PublishService {
           deck.data.meta.author = firebase.firestore.FieldValue.delete();
         }
 
+        // Update GitHub info (push or not) for GitHub users so next time user publish, the choice is kept
+        if (authStore.state.gitHub) {
+          if (deck.data.github) {
+            deck.data.github.publish = github;
+          } else {
+            deck.data.github = {
+              publish: github,
+            };
+          }
+        }
+
         const updatedDeck: Deck = await this.deckService.update(deckStore.state.deck);
         deckStore.state.deck = {...updatedDeck};