edgecreator,edgecreator-api: Fix upload

ducksmanager · Jan 24, 2025 · 81f003f · 81f003f
1 parent 5bdfd8c
commit 81f003f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/apps/edgecreator/api/services/upload/index.ts b/apps/edgecreator/api/services/upload/index.ts
@@ -25,6 +25,13 @@ export default (io: Server) => {
     ({ services: edgeCreatorServices } =
       dmSocket.addNamespace<EdgeCreatorServices>(
         EdgeCreatorServices.namespaceEndpoint,
+        {
+          session: {
+            getToken: () => socket.handshake.auth.token,
+            clearSession: () => {},
+            sessionExists: () => Promise.resolve(true),
+          }
+        }
       ));
     console.log("connected to upload");
 
@@ -36,6 +43,9 @@ export default (io: Server) => {
         });
       const [countrycode, magazinecode] = publicationcode.split("/");
       const path = `${edgesPath}/${countrycode}/photos`;
+      if (!fs.existsSync(path)) {
+        fs.mkdirSync(path, { recursive: true });
+      }
       const tentativeFileName = `${magazinecode}.${issuenumber}.photo`;
       const fileName = getNextAvailableFile(
         `${path}/${tentativeFileName}`,

diff --git a/apps/edgecreator/src/components/IssueSelect.vue b/apps/edgecreator/src/components/IssueSelect.vue
@@ -37,7 +37,7 @@
             }
           "
           @change="
-            currentFirstIssuecode = $event;
+            currentFirstIssuecode = $event.issuecode;
             onChange();
           "
         />
@@ -67,7 +67,7 @@
             </b-form-select-option>
           </template>
         </b-form-select>
-        <template v-if="canBeMultiple && currentFirstIssuecode !== null">
+        <template v-if="canBeMultiple && currentFirstIssuecode !== undefined">
           <b-form-group class="mt-2">
             <b-form-radio
               v-model="editMode"
@@ -97,7 +97,7 @@
         </template>
       </template>
     </template>
-    <slot v-if="$slots.dimensions && currentFirstIssuecode !== null" />
+    <slot v-if="slots.dimensions && currentFirstIssuecode !== undefined" name="dimensions" />
   </div>
 </template>
 <script setup lang="ts">
@@ -111,6 +111,11 @@ const { t: $t } = useI18n();
 const edgeCatalogStore = edgeCatalog();
 const coaStore = webStores.coa();
 
+const slots = defineSlots<{
+  default(): never;
+  dimensions?(): never;
+}>();
+
 interface Selection {
   editMode: "single" | "range";
   countrycode: string;
@@ -187,7 +192,6 @@ const publicationIssues = computed(
 const issues = computed(
   () =>
     publicationIssues.value &&
-    edgeCatalogStore.publishedEdges[currentPublicationcode.value!] &&
     coaStore.issuecodesByPublicationcode[currentPublicationcode.value!].map(
       (issuecode) => {
         const status = edgeCatalogStore.getEdgeStatus(issuecode);

diff --git a/apps/edgecreator/src/pages/upload.vue b/apps/edgecreator/src/pages/upload.vue
@@ -56,13 +56,13 @@ meta:
           "
           disable-ongoing-or-published
           :disable-not-ongoing-nor-published="false"
-          @change="currentCrop = $event && $event.width ? $event : null"
+          @change="currentCrop = $event?.issuecode ? (currentCrop ? { ...currentCrop, ...$event.issuecode } : $event.issuecode): undefined"
         >
           <template #dimensions>
             <dimensions
               :width="currentCrop ? currentCrop.width : 15"
               :height="currentCrop ? currentCrop.height : 200"
-              @change="currentCrop = $event && $event.width ? $event : null"
+              @change="currentCrop = currentCrop ? { ...currentCrop, ...$event } : $event"
             />
           </template>
         </issue-select>
@@ -164,6 +164,7 @@ import { useCookies } from "@vueuse/integrations/useCookies";
 import { useToastController } from "bootstrap-vue-next";
 import type Cropper from "cropperjs";
 import { nextTick } from "vue";
+import VueCropper from 'vue-cropperjs';
 import type { CropperData } from "vue-cropperjs";
 import { useI18n } from "vue-i18n";
 
@@ -188,7 +189,7 @@ type CropWithData = Crop & {
   error?: string;
 };
 
-const currentCrop = ref<CropWithData | null>(null);
+const currentCrop = ref<CropWithData>();
 const crops = ref<CropWithData[]>([]);
 const uploadedImageData = ref<{ url: string } | null>(null);
 const cropper = ref<Cropper | null>(null);
@@ -223,7 +224,7 @@ const addCrop = () => {
         "image/jpeg"
       ),
     });
-    currentCrop.value = null;
+    currentCrop.value = undefined;
   }
 };
 const uploadAll = async () => {

diff --git a/packages/api/services/edges/index.ts b/packages/api/services/edges/index.ts
@@ -12,7 +12,7 @@ const getEdges = async (filters: {
   publicationcode?: string;
   issuecodes?: string[];
 }) => {
-  if (!filters.publicationcode || !filters.issuecodes) {
+  if (!(filters.publicationcode || filters.issuecodes)) {
     throw new Error("Invalid filter");
   }
   const issuecode = filters.issuecodes
@@ -26,13 +26,7 @@ const getEdges = async (filters: {
         issuecode,
       },
     })
-  ).reduce(
-    (acc, model) => {
-      acc[model.issuecode] = model;
-      return acc;
-    },
-    {} as Record<string, edgeModel>,
-  );
+  ).groupBy('issuecode');
 
   return (
     await prismaDm.edge.findMany({
@@ -41,6 +35,7 @@ const getEdges = async (filters: {
         issuecode: true,
       },
       where: {
+        publicationcode: filters.publicationcode,
         issuecode,
       },
     })