From 5a051de5d79fd6e9fac90e1e1e53b94ee03e9542 Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Tue, 3 Jan 2023 12:26:51 +0100 Subject: [PATCH 1/3] build: deprecated --- .github/workflows/backup.yml | 22 ---------------------- .github/workflows/remote.yml | 31 ------------------------------- 2 files changed, 53 deletions(-) delete mode 100644 .github/workflows/backup.yml delete mode 100644 .github/workflows/remote.yml diff --git a/.github/workflows/backup.yml b/.github/workflows/backup.yml deleted file mode 100644 index b0049467c..000000000 --- a/.github/workflows/backup.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Backup Firestore - -on: - schedule: - - cron: "0 0 * * *" - -env: - PROJECT_ID: deckdeckgo-studio-prod - BUCKET: gs://deckdeckgo-studio-backup - -jobs: - backup: - runs-on: ubuntu-latest - steps: - - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.FIRESTORE_BACKUP_TOKEN }} - export_default_credentials: true - if: github.repository == 'deckgo/deckdeckgo' - - run: gcloud info - - run: gcloud config set project $PROJECT_ID - - run: gcloud firestore export $BUCKET diff --git a/.github/workflows/remote.yml b/.github/workflows/remote.yml deleted file mode 100644 index 5d87ef4ed..000000000 --- a/.github/workflows/remote.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: CI - Remote - -on: - release: - types: [published] - -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@master - - name: Set Node version - uses: actions/setup-node@v2 - with: - node-version: '16' - - name: Install Dependencies - run: npm ci - working-directory: ./remote - - name: Build - run: npm run build - working-directory: ./remote - - name: Deploy to Firebase - uses: w9jds/firebase-action@master - with: - args: deploy --only hosting - env: - FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }} - PROJECT_ID: 'default' - PROJECT_PATH: './remote' From ac1602f650313337a752c639a2397f771d2d028c Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Sun, 8 Jan 2023 10:37:25 +0100 Subject: [PATCH 2/3] fix: forward `updated_at` to fix delete features --- CHANGELOG.md | 8 +++++++ package-lock.json | 2 +- providers/sync/CHANGELOG.md | 6 +++++ providers/sync/package.json | 2 +- providers/sync/src/providers/deck.provider.ts | 12 +++++++--- providers/sync/src/providers/doc.provider.ts | 22 ++++++++++++------- providers/sync/src/services/admin.service.ts | 10 ++++++--- 7 files changed, 46 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e309087f..5004bda9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + + +# [7.2.0](https://github.com/deckgo/deckdeckgo/compare/v7.1.0...v7.2.0) (2023-XX-YY) + +### Providers + +- sync: v0.0.40 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/providers/offline/CHANGELOG.md)) + # [7.1.0](https://github.com/deckgo/deckdeckgo/compare/v7.0.1...v7.1.0) (2022-10-31) diff --git a/package-lock.json b/package-lock.json index e370cbc60..fa0495470 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9329,7 +9329,7 @@ }, "providers/sync": { "name": "@deckdeckgo/sync", - "version": "0.0.39", + "version": "0.0.40", "license": "AGPL-3.0-or-later", "dependencies": { "@deckdeckgo/editor": "^8.3.0", diff --git a/providers/sync/CHANGELOG.md b/providers/sync/CHANGELOG.md index fde7f6d57..f3175906d 100644 --- a/providers/sync/CHANGELOG.md +++ b/providers/sync/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.0.39 (2023-01-08) + +### Fix + +- forward `updated_at` to fix delete features + # 0.0.39 (2022-10-02) ### Build diff --git a/providers/sync/package.json b/providers/sync/package.json index cbc9e2d63..a9a28d7e5 100644 --- a/providers/sync/package.json +++ b/providers/sync/package.json @@ -1,6 +1,6 @@ { "name": "@deckdeckgo/sync", - "version": "0.0.39", + "version": "0.0.40", "author": "David Dal Busco", "description": "Sync data and auth providers for DeckDeckGo editors.", "license": "AGPL-3.0-or-later", diff --git a/providers/sync/src/providers/deck.provider.ts b/providers/sync/src/providers/deck.provider.ts index 2b925f964..5c2fe40d6 100644 --- a/providers/sync/src/providers/deck.provider.ts +++ b/providers/sync/src/providers/deck.provider.ts @@ -14,11 +14,11 @@ export const decks = async (userId: string): Promise => { throw new Error('Not implemented'); }; -export const deleteDeck = async (deckId: string): Promise => { +export const deleteDeck = async ({deckId, updated_at}: {deckId: string; updated_at?: Date | number | BigInt}): Promise => { if (EnvStore.getInstance().cloud()) { const {deleteDeck: deleteUserDeck}: {deleteDeck: DeleteDeck} = await cloudProvider<{deleteDeck: DeleteDeck}>(); - return deleteUserDeck(deckId); + return deleteUserDeck(deckId, updated_at); } throw new Error('Not implemented'); @@ -36,7 +36,13 @@ export const snapshotDeck = (): Promise<() => void | undefined> => } }); -const snapshotDeckUser = async ({deckId, onNext}: {deckId: string; onNext: (snapshot: Deck) => Promise}): Promise<() => void | undefined> => { +const snapshotDeckUser = async ({ + deckId, + onNext +}: { + deckId: string; + onNext: (snapshot: Deck) => Promise; +}): Promise<() => void | undefined> => { if (EnvStore.getInstance().cloud()) { const {snapshotDeck: snapshotUserDeck}: {snapshotDeck: SnapshotDeck} = await cloudProvider<{snapshotDeck: SnapshotDeck}>(); diff --git a/providers/sync/src/providers/doc.provider.ts b/providers/sync/src/providers/doc.provider.ts index 46dec983b..8af290dba 100644 --- a/providers/sync/src/providers/doc.provider.ts +++ b/providers/sync/src/providers/doc.provider.ts @@ -1,8 +1,8 @@ -import { DeleteDoc,Doc,DocEntries,SnapshotDoc } from '@deckdeckgo/editor'; -import { updateOfflineDoc } from '@deckdeckgo/offline'; -import { DocStore } from '../stores/doc.store'; -import { EnvStore } from '../stores/env.store'; -import { cloudProvider } from '../utils/providers.utils'; +import {DeleteDoc, Doc, DocEntries, SnapshotDoc} from '@deckdeckgo/editor'; +import {updateOfflineDoc} from '@deckdeckgo/offline'; +import {DocStore} from '../stores/doc.store'; +import {EnvStore} from '../stores/env.store'; +import {cloudProvider} from '../utils/providers.utils'; export const docs = async (userId: string): Promise => { if (EnvStore.getInstance().cloud()) { @@ -14,11 +14,11 @@ export const docs = async (userId: string): Promise => { throw new Error('Not implemented'); }; -export const deleteDoc = async (docId: string): Promise => { +export const deleteDoc = async ({docId, updated_at}: {docId: string; updated_at?: Date | number | BigInt}): Promise => { if (EnvStore.getInstance().cloud()) { const {deleteDoc: deleteUserDoc}: {deleteDoc: DeleteDoc} = await cloudProvider<{deleteDoc: DeleteDoc}>(); - return deleteUserDoc(docId); + return deleteUserDoc(docId, updated_at); } throw new Error('Not implemented'); @@ -36,7 +36,13 @@ export const snapshotDoc = (): Promise<() => void | undefined> => } }); -const snapshotUserDoc = async ({docId, onNext}: {docId: string; onNext: (snapshot: Doc) => Promise}): Promise<() => void | undefined> => { +const snapshotUserDoc = async ({ + docId, + onNext +}: { + docId: string; + onNext: (snapshot: Doc) => Promise; +}): Promise<() => void | undefined> => { if (EnvStore.getInstance().cloud()) { const {snapshotDoc: snapshotUserDoc}: {snapshotDoc: SnapshotDoc} = await cloudProvider<{snapshotDoc: SnapshotDoc}>(); diff --git a/providers/sync/src/services/admin.service.ts b/providers/sync/src/services/admin.service.ts index a45d09c52..d9ad223f8 100644 --- a/providers/sync/src/services/admin.service.ts +++ b/providers/sync/src/services/admin.service.ts @@ -160,14 +160,15 @@ export const deleteDeckOrDoc = async ({data, deleteStorage}: {data: DeckOrDoc; d const { doc: { id, - data: {meta} + data: {meta}, + updated_at } } = data; // If a pathname is defined, then there is a storage const hasStorage: boolean = hasPathname(meta); - await Promise.all([deleteStorageFile({meta, folder: 'd', deleteStorage}), deleteDoc(id)]); + await Promise.all([deleteStorageFile({meta, folder: 'd', deleteStorage}), deleteDoc({docId: id, updated_at})]); // If we deleted the file in the storage, we also want to update the list of posts displayed on the landing page but only if there is a storage if (deleteStorage && hasStorage) { @@ -179,7 +180,10 @@ export const deleteDeckOrDoc = async ({data, deleteStorage}: {data: DeckOrDoc; d const {deck} = data; - await Promise.all([deleteStorageFile({meta: deck.data.meta, folder: 'p', deleteStorage}), deleteDeck(deck.id)]); + await Promise.all([ + deleteStorageFile({meta: deck.data.meta, folder: 'p', deleteStorage}), + deleteDeck({deckId: deck.id, updated_at: deck.updated_at}) + ]); }; const deleteStorageFile = async ({meta, folder, deleteStorage}: {meta: Meta | undefined; folder: 'p' | 'd'; deleteStorage: boolean}) => { From 2ca42b2919f38180946f6629a9862167e0aee603 Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Tue, 6 Feb 2024 17:50:48 +0100 Subject: [PATCH 3/3] docs: moved to fork --- webcomponents/highlight-code/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webcomponents/highlight-code/README.md b/webcomponents/highlight-code/README.md index 1a002cf26..43c226218 100644 --- a/webcomponents/highlight-code/README.md +++ b/webcomponents/highlight-code/README.md @@ -8,6 +8,8 @@ # DeckDeckGo - Highlight Code +> Moved to [https://github.com/peterpeterparker/highlight-code](https://github.com/peterpeterparker/highlight-code) + This component is the code highlighter of [DeckDeckGo]. It is developed with [Stencil](https://stenciljs.com) and use [Prism.js](https://prismjs.com) from [Lea Verou](http://lea.verou.me) and [James DiGioia](https://twitter.com/jamesdigioia) for the highlighting itself.