Merge branch 'master' into issue/#83-lock-events

buggregator · Dec 4, 2023 · a622584 · a622584
2 parents 49505d5 + 3b626c5
commit a622584
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/docker-dev-image.yml b/.github/workflows/docker-dev-image.yml
@@ -35,6 +35,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./
+          platforms: linux/amd64,linux/arm64
           file: ./.docker/Dockerfile
           push: true
           build-args:

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -35,6 +35,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./
+          platforms: linux/amd64,linux/arm64
           file: ./.docker/Dockerfile
           push: true
           build-args:

diff --git a/plugins/events.client.ts b/plugins/events.client.ts
@@ -92,11 +92,10 @@ export default defineNuxtPlugin(() => {
   }
 
   const getAll = () => {
-    getEventsAll().then((allEvents: ServerEvent<unknown>[]) => {
-      if (allEvents.length) {
-        eventsStore.addList(allEvents);
-        cachedIdsStore.syncWithActive(allEvents.map(({ uuid }) => uuid));
-        lockedIdsStore.syncWithActive(allEvents.map(({ uuid }) => uuid));
+    getEventsAll().then((events: ServerEvent<unknown>[]) => {
+      if (events.length) {
+        eventsStore.initialize(events);
+        cachedIdsStore.syncWithActive(events.map(({ uuid }) => uuid));
       } else {
         // NOTE: clear cached events hardly
         eventsStore.removeAll();

diff --git a/stores/events.ts b/stores/events.ts
@@ -8,11 +8,14 @@ export const useEventStore = defineStore("useEventStore", {
     events: [] as ServerEvent<unknown>[],
   }),
   actions: {
+    initialize(events: ServerEvent<unknown>[]) {
+      this.events = events;
+    },
     addList(events: ServerEvent<unknown>[]) {
       events.forEach((event) => {
         const isExistedEvent = this.events.some((el) => el.uuid === event.uuid);
         if (!isExistedEvent) {
-          this.events.push(event);
+          this.events.unshift(event);
         } else {
           this.events = this.events.map((el) => {
             if (el.uuid !== event.uuid) {