Feat/differ between multiview preset and layout (#20)

* feat: add management lock * fix: remove left-over file, has been renamed * Feat/thumbnail fetch (#14) * feat: add additional filtering * fix: handle active + source filter, reduce code * fix: allow multiple source type selection * fix: linting * fixup! * feat: sorting ui * fix: add ingest type to database * feat: add sort based on lastConnected * fix: remove duplicate handleSorting call * fixup! * fix: add date to source card * fixup! * fix: add status-not-gone check * fix: linting error * fix: remove unused function * feat: updated to add additional multiviewers in the production-output-modal * feat: updated the functions on the production-page to handle a multiview-array * fix: changed the interface to have multiview as array * feat: updated to handle multiview-array when fetching server and api * fix: updated to stream-handling, not comfortable with the structure of this part * fix: updated to handle multiview-arr * feat: not possible to add output to same port, will cause visible error * fix: changed find to filter and maped through the results * fix: removed dev-logs * fix: correct filtering * fix: lint test fail * fix: changed to a some-check instead of a map * fix: multiview-arr does individual fetch for all mvs and creates unique ids for each * fix: updated ts-error * fix: adding and removing source from active production is working again * fix: added duplicate-check whenever multiviews-arr update and minor fixes * fix: updated multiview-arr-interface to be called multiviews instead of multiview, and minor fixes * fix: bug solve for incorrect gone assignment * fix: some cleanups * style: redesign SourceListItem Thumbnails * feat: imageComponent and sourceListing cleanup * feat: editView always shows same image as listing thumbnail * feat: general sourceList component and GlobalContext * fix: bad main merge * fix: lint * chore: add refresh images to translate and make modal z-index 50 * fix: use translate for refresh thumbnails and delete duplicated code from merge * fix: remove another duplicated line --------- Co-authored-by: Saelmala <[email protected]> Co-authored-by: malmen237 <[email protected]> Co-authored-by: Linda Malm <[email protected]> * feat: add management lock * fix: use global context instead of state * fix: remove duplicates * Feat/thumbnail fetch (#14) * feat: add additional filtering * fix: handle active + source filter, reduce code * fix: allow multiple source type selection * fix: linting * fixup! * feat: sorting ui * fix: add ingest type to database * feat: add sort based on lastConnected * fix: remove duplicate handleSorting call * fixup! * fix: add date to source card * fixup! * fix: add status-not-gone check * fix: linting error * fix: remove unused function * feat: updated to add additional multiviewers in the production-output-modal * feat: updated the functions on the production-page to handle a multiview-array * fix: changed the interface to have multiview as array * feat: updated to handle multiview-array when fetching server and api * fix: updated to stream-handling, not comfortable with the structure of this part * fix: updated to handle multiview-arr * feat: not possible to add output to same port, will cause visible error * fix: changed find to filter and maped through the results * fix: removed dev-logs * fix: correct filtering * fix: lint test fail * fix: changed to a some-check instead of a map * fix: multiview-arr does individual fetch for all mvs and creates unique ids for each * fix: updated ts-error * fix: adding and removing source from active production is working again * fix: added duplicate-check whenever multiviews-arr update and minor fixes * fix: updated multiview-arr-interface to be called multiviews instead of multiview, and minor fixes * fix: bug solve for incorrect gone assignment * fix: some cleanups * style: redesign SourceListItem Thumbnails * feat: imageComponent and sourceListing cleanup * feat: editView always shows same image as listing thumbnail * feat: general sourceList component and GlobalContext * fix: bad main merge * fix: lint * chore: add refresh images to translate and make modal z-index 50 * fix: use translate for refresh thumbnails and delete duplicated code from merge * fix: remove another duplicated line --------- Co-authored-by: Saelmala <[email protected]> Co-authored-by: malmen237 <[email protected]> Co-authored-by: Linda Malm <[email protected]> * fix: errors after conflict solving * fix: build error * fix: remove leftover file, unused import * fix: update lock * Feat/specify multiview layout when doing production-config(#16) * feat: added another mv-preset and updated code to be arr instead of single-object * feat: added optional style to be added to the options-dropdown * feat: first draft of a multiview-layout setting * feat: possible to create new layouts as multiview-previews and add it to productions * feat: added feedback-streams to input-choice for multiviewer-layout * fix: removed unnecessary undefined * fix: when added a new layout it will be chosen in output-form on save * feat: preview and program is now selectable and restructured the way options handle value * feat: separated db-preset into db-preset and db-layout - 'multiview-preset' and 'multiviews' * fix: a folder had accidentily been made as a file * feat: resolved the remaining issues, so preset is turned into a layout and saved in production * fix: resolved rebase-conflicts * fix: updates due to feedback and some label-fixes --------- Co-authored-by: Saelmala <[email protected]> Co-authored-by: Lucas Maupin <[email protected]>
Eyevinn · Oct 3, 2024 · 78ea35d · 78ea35d
1 parent 5ae889e
commit 78ea35d
Show file tree

Hide file tree

Showing 41 changed files with 710 additions and 421 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/manager/multiview-presets.ts b/src/api/manager/multiview-presets.ts
@@ -0,0 +1,30 @@
+import { ObjectId, WithId } from 'mongodb';
+import { MultiviewPreset } from '../../interfaces/preset';
+import { getDatabase } from '../mongoClient/dbClient';
+
+export async function getMultiviewPresets(): Promise<MultiviewPreset[]> {
+  const db = await getDatabase();
+  return await db
+    .collection<MultiviewPreset>('multiview-presets')
+    .find({})
+    .toArray();
+}
+
+export async function getMultiviewPreset(
+  id: string
+): Promise<WithId<MultiviewPreset>> {
+  const db = await getDatabase();
+  return (await db
+    .collection<MultiviewPreset>('multiview-presets')
+    .findOne({ _id: new ObjectId(id) })) as WithId<MultiviewPreset>;
+}
+
+// TODO Add this when possibility to update and add mv-presets are added
+// export async function putMultiviewPreset(
+//   newMultiviewPreset: MultiviewPreset
+// ): Promise<void> {
+//   const db = await getDatabase();
+//   await db
+//     .collection('multiview-presets')
+//     .insertOne({ ...newMultiviewPreset, _id: new ObjectId() });
+// }
diff --git a/src/api/manager/multiviews.ts b/src/api/manager/multiviews.ts
@@ -0,0 +1,38 @@
+import { ObjectId, WithId } from 'mongodb';
+import { MultiviewPreset } from '../../interfaces/preset';
+import { getDatabase } from '../mongoClient/dbClient';
+
+export async function getMultiviewLayouts(): Promise<MultiviewPreset[]> {
+  const db = await getDatabase();
+  return await db.collection<MultiviewPreset>('multiviews').find({}).toArray();
+}
+
+export async function getMultiviewLayout(
+  id: string
+): Promise<WithId<MultiviewPreset>> {
+  const db = await getDatabase();
+  return (await db
+    .collection<MultiviewPreset>('multiviews')
+    .findOne({ _id: new ObjectId(id) })) as WithId<MultiviewPreset>;
+}
+
+export async function putMultiviewLayout(
+  newMultiviewLayout: MultiviewPreset
+): Promise<void> {
+  const db = await getDatabase();
+  const collection = db.collection('multiviews');
+  const editLayout = await collection.findOne({
+    name: newMultiviewLayout.name
+  });
+  const newMultiviewLayoutWithoutID = { ...newMultiviewLayout };
+  delete newMultiviewLayoutWithoutID._id;
+
+  if (editLayout) {
+    await collection.updateOne(
+      { name: newMultiviewLayout.name },
+      { $set: { ...newMultiviewLayoutWithoutID } }
+    );
+  } else {
+    await collection.insertOne({ ...newMultiviewLayout, _id: new ObjectId() });
+  }
+}
diff --git a/src/api/manager/presets.ts b/src/api/manager/presets.ts
@@ -1,5 +1,5 @@
-import { ObjectId, WithId } from 'mongodb';
-import { MultiviewPreset, PresetWithId } from '../../interfaces/preset';
+import { ObjectId } from 'mongodb';
+import { PresetWithId } from '../../interfaces/preset';
 import { getDatabase } from '../mongoClient/dbClient';
 
 export async function getPresets(): Promise<PresetWithId[]> {
@@ -14,29 +14,6 @@ export async function getPresetByid(id: string): Promise<PresetWithId> {
     .findOne({ _id: new ObjectId(id) })) as PresetWithId;
 }
 
-export async function getMultiviewPresets(): Promise<MultiviewPreset[]> {
-  const db = await getDatabase();
-  return await db.collection<MultiviewPreset>('multiviews').find({}).toArray();
-}
-
-export async function getMultiviewPreset(
-  id: string
-): Promise<WithId<MultiviewPreset>> {
-  const db = await getDatabase();
-  return (await db
-    .collection<MultiviewPreset>('multiviews')
-    .findOne({ _id: new ObjectId(id) })) as WithId<MultiviewPreset>;
-}
-
-export async function putMultiviewPreset(
-  newMultiviewPreset: MultiviewPreset
-): Promise<void> {
-  const db = await getDatabase();
-  await db
-    .collection('multiviews')
-    .insertOne({ ...newMultiviewPreset, _id: new ObjectId() });
-}
-
 export async function putPreset(
   id: string,
   preset: PresetWithId

diff --git a/src/api/mongoClient/dbClient.ts b/src/api/mongoClient/dbClient.ts
@@ -47,11 +47,17 @@ async function bootstrapDbCollections(db: Db) {
       await migratePresets(db);
     }
 
-    const multiviews = await db.collection('multiviews').countDocuments();
+    const multiviews = await db
+      .collection('multiview-presets')
+      .countDocuments();
     if (multiviews === 0) {
       Log().info('Bootstrapping database with default multiview');
 
-      await db.collection('multiviews').insertMany(defaultMultiview);
+      await db.collection('multiview-presets').insertMany(defaultMultiview);
+      await db.collection('multiviews').insertOne({
+        ...defaultMultiview[0],
+        name: 'Default - ' + defaultMultiview[0].name
+      });
     } else {
       await migrateMultiviewPresets(db);
     }

diff --git a/src/api/mongoClient/dbMigrate.ts b/src/api/mongoClient/dbMigrate.ts
@@ -102,7 +102,7 @@ export async function migratePresets(db: Db) {
 
 export async function migrateMultiviewPresets(db: Db) {
   const multiviewPresets = await db
-    .collection<MultiviewPreset>('multiviews')
+    .collection<MultiviewPreset>('multiview-presets')
     .find({})
     .toArray();
   for (const preset of multiviewPresets) {
@@ -114,13 +114,15 @@ export async function migrateMultiviewPresets(db: Db) {
         `Upgrading multiview preset '${migratedPreset.name}' with new SRT output settings`
       );
       const { _id, ...rest } = migratedPreset;
-      await db.collection<MultiviewPreset>('multiviews').findOneAndReplace(
-        { _id: new ObjectId(_id) },
-        {
-          ...rest
-        },
-        { returnDocument: 'after' }
-      );
+      await db
+        .collection<MultiviewPreset>('multiview-presets')
+        .findOneAndReplace(
+          { _id: new ObjectId(_id) },
+          {
+            ...rest
+          },
+          { returnDocument: 'after' }
+        );
     }
   }
 }

diff --git a/src/api/mongoClient/dbOverrides.ts b/src/api/mongoClient/dbOverrides.ts
@@ -100,7 +100,7 @@ async function overrideMultiviewPreset(
       break;
   }
   const { _id, ...rest } = multiviewPreset;
-  await db.collection<MultiviewPreset>('multiviews').findOneAndReplace(
+  await db.collection<MultiviewPreset>('multiview-presets').findOneAndReplace(
     { _id: new ObjectId(_id) },
     {
       ...rest
@@ -131,7 +131,7 @@ export async function applyPresetOverrides(db: Db, overrideString: string) {
       }
     } else if (override.type === 'multiview') {
       const multiviewPreset = await db
-        .collection<MultiviewPreset>('multiviews')
+        .collection<MultiviewPreset>('multiview-presets')
         .findOne({ name: override.name });
       if (multiviewPreset) {
         await overrideMultiviewPreset(db, multiviewPreset, override);

diff --git a/src/app/api/manager/multiview-presets/[id]/route.ts b/src/app/api/manager/multiview-presets/[id]/route.ts
@@ -0,0 +1,22 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { Params } from 'next/dist/shared/lib/router/utils/route-matcher';
+import { getMultiviewPreset } from '../../../../../api/manager/multiview-presets';
+import { isAuthenticated } from '../../../../../api/manager/auth';
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Params }
+): Promise<NextResponse> {
+  if (!(await isAuthenticated())) {
+    return new NextResponse(`Not Authorized!`, {
+      status: 403
+    });
+  }
+  try {
+    return NextResponse.json(await getMultiviewPreset(params.id));
+  } catch (e) {
+    return new NextResponse(JSON.stringify(e), {
+      status: 500
+    });
+  }
+}
diff --git a/src/app/api/manager/multiview-presets/route.ts b/src/app/api/manager/multiview-presets/route.ts
@@ -0,0 +1,48 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { isAuthenticated } from '../../../../api/manager/auth';
+import {
+  getMultiviewPresets
+  // TODO Add this when possibility to update and add mv-presets are added
+  // putMultiviewPreset
+} from '../../../../api/manager/multiview-presets';
+// TODO Add this when possibility to update and add mv-presets are added
+// import { Log } from '../../../../api/logger';
+// import { MultiviewPreset } from '../../../../interfaces/preset';
+
+export async function GET(request: NextRequest): Promise<NextResponse> {
+  if (!(await isAuthenticated())) {
+    return new NextResponse(`Not Authorized!`, {
+      status: 403
+    });
+  }
+
+  try {
+    return NextResponse.json(await getMultiviewPresets());
+  } catch (e) {
+    return new NextResponse(JSON.stringify(e), {
+      status: 500
+    });
+  }
+}
+
+// TODO Add this when possibility to update and add mv-presets are added
+// export async function PUT(request: NextRequest): Promise<NextResponse> {
+//   if (!(await isAuthenticated())) {
+//     return new NextResponse(`Not Authorized!`, {
+//       status: 403
+//     });
+//   }
+
+//   try {
+//     const body = (await request.json()) as MultiviewPreset;
+//     const newMultiviewPreset = await putMultiviewPreset(body);
+//     return await new NextResponse(JSON.stringify(newMultiviewPreset), {
+//       status: 200
+//     });
+//   } catch (error) {
+//     Log().warn('Could not update preset', error);
+//     return new NextResponse(`Error searching DB! Error: ${error}`, {
+//       status: 500
+//     });
+//   }
+// }
diff --git a/src/app/api/manager/multiviews/[id]/route.ts b/src/app/api/manager/multiviews/[id]/route.ts
@@ -1,9 +1,14 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { isAuthenticated } from '../../../../../api/manager/auth';
-import { getMultiviewPreset } from '../../../../../api/manager/presets';
 import { Params } from 'next/dist/shared/lib/router/utils/route-matcher';
 import { updateMultiviewForPipeline } from '../../../../../api/ateliereLive/pipelines/multiviews/multiviews';
 import { MultiviewViews } from '../../../../../interfaces/multiview';
+import { getMultiviewLayout } from '../../../../../api/manager/multiviews';
+
+type PutMultiviewRequest = {
+  pipelineId: string;
+  multiviews: MultiviewViews[];
+};
 
 export async function GET(
   request: NextRequest,
@@ -15,17 +20,14 @@ export async function GET(
     });
   }
   try {
-    return NextResponse.json(await getMultiviewPreset(params.id));
+    return NextResponse.json(await getMultiviewLayout(params.id));
   } catch (e) {
     return new NextResponse(JSON.stringify(e), {
       status: 500
     });
   }
 }
-type PutMultiviewRequest = {
-  pipelineId: string;
-  multiviews: MultiviewViews[];
-};
+
 export async function PUT(
   request: NextRequest,
   { params }: { params: Params }

diff --git a/src/app/api/manager/multiviews/route.tsx b/src/app/api/manager/multiviews/route.tsx
@@ -1,6 +1,11 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { getMultiviewPresets } from '../../../../api/manager/presets';
 import { isAuthenticated } from '../../../../api/manager/auth';
+import {
+  getMultiviewLayouts,
+  putMultiviewLayout
+} from '../../../../api/manager/multiviews';
+import { MultiviewPreset } from '../../../../interfaces/preset';
+import { Log } from '../../../../api/logger';
 
 export async function GET(request: NextRequest): Promise<NextResponse> {
   if (!(await isAuthenticated())) {
@@ -10,10 +15,31 @@ export async function GET(request: NextRequest): Promise<NextResponse> {
   }
 
   try {
-    return NextResponse.json(await getMultiviewPresets());
+    return NextResponse.json(await getMultiviewLayouts());
   } catch (e) {
     return new NextResponse(JSON.stringify(e), {
       status: 500
     });
   }
 }
+
+export async function PUT(request: NextRequest): Promise<NextResponse> {
+  if (!(await isAuthenticated())) {
+    return new NextResponse(`Not Authorized!`, {
+      status: 403
+    });
+  }
+
+  try {
+    const body = (await request.json()) as MultiviewPreset;
+    const newMultiviewLayout = await putMultiviewLayout(body);
+    return await new NextResponse(JSON.stringify(newMultiviewLayout), {
+      status: 200
+    });
+  } catch (error) {
+    Log().warn('Could not update layout', error);
+    return new NextResponse(`Error searching DB! Error: ${error}`, {
+      status: 500
+    });
+  }
+}
diff --git a/src/app/api/manager/presets/route.ts b/src/app/api/manager/presets/route.ts
@@ -1,11 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
-import {
-  getPresets,
-  putMultiviewPreset
-} from '../../../../api/manager/presets';
+import { getPresets } from '../../../../api/manager/presets';
 import { isAuthenticated } from '../../../../api/manager/auth';
-import { Log } from '../../../../api/logger';
-import { MultiviewPreset } from '../../../../interfaces/preset';
 
 export async function GET(request: NextRequest): Promise<NextResponse> {
   if (!(await isAuthenticated())) {
@@ -22,24 +17,3 @@ export async function GET(request: NextRequest): Promise<NextResponse> {
     });
   }
 }
-
-export async function PUT(request: NextRequest): Promise<NextResponse> {
-  if (!(await isAuthenticated())) {
-    return new NextResponse(`Not Authorized!`, {
-      status: 403
-    });
-  }
-
-  try {
-    const body = (await request.json()) as MultiviewPreset;
-    const newMultiviewPreset = await putMultiviewPreset(body);
-    return await new NextResponse(JSON.stringify(newMultiviewPreset), {
-      status: 200
-    });
-  } catch (error) {
-    Log().warn('Could not update preset', error);
-    return new NextResponse(`Error searching DB! Error: ${error}`, {
-      status: 500
-    });
-  }
-}