Feature Queue Dynamo conversion to Typescript, and number of fixes

src/client/components/featuredQueue/QueueItem.tsx

@@ -6,12 +6,8 @@ import { Col, Flexbox } from 'components/base/Layout';
 import Text from 'components/base/Text';
 import CSRFForm from 'components/CSRFForm';
 import CubePreview from 'components/cube/CubePreview';
-import MoveModal from 'components/featuredQueue/MoveModal';
-import withModal from 'components/WithModal';
 import Cube from 'datatypes/Cube';
 
-const MoveButton = withModal(Button, MoveModal);
-
 interface QueueItemProps {
   cube: Cube;
   index: number;
@@ -42,9 +38,6 @@ const QueueItem: React.FC<QueueItemProps> = ({ cube, index }) => {
                   Remove
                 </Button>
               </CSRFForm>
-              <MoveButton block color="accent" disabled={index < 2} modalprops={{ cube, index }}>
-                Move
-              </MoveButton>
             </Flexbox>
           </Flexbox>
         </CardBody>

src/client/pages/FeaturedCubesQueuePage.tsx

@@ -16,7 +16,7 @@ import MainLayout from 'layouts/MainLayout';
 interface FeaturedCubesQueuePageProps {
   cubes: Cube[];
   daysBetweenRotations: number;
-  lastRotation: Date;
+  lastRotation: number;
   loginCallback: string;
 }
 
@@ -38,7 +38,17 @@ const FeaturedCubesQueuePage: React.FC<FeaturedCubesQueuePageProps> = ({ cubes,
             <Flexbox direction="col" gap="2">
               <Flexbox direction="row" gap="2" alignItems="center">
                 <AddCubeButton color="primary">Add Cube to Queue</AddCubeButton>
-                <RotateButton color="accent">Rotate featured cubes</RotateButton>
+                <RotateButton
+                  color="accent"
+                  modalprops={{
+                    target: `/admin/featuredcubes/rotate`,
+                    title: 'Confirm Rotation',
+                    message: 'Are you sure you want to rotate the featured cubes?',
+                    buttonText: 'Submit',
+                  }}
+                >
+                  Rotate featured cubes
+                </RotateButton>
                 <Text sm semibold>
                   Last rotation: {new Date(lastRotation).toLocaleDateString()}
                 </Text>

src/datatypes/FeaturedQueue.ts

@@ -0,0 +1,15 @@
+export enum FeaturedQueueStatus {
+  ACTIVE = 'a',
+  INACTIVE = 'i',
+}
+
+export type NewFeaturedQueueItem = {
+  cube: string; //Cube ID
+  date: number;
+  owner: string; //User id
+  featuredOn: number | null; //Null indicates not yet featured
+};
+
+export type FeaturedQueueItem = NewFeaturedQueueItem & {
+  status: FeaturedQueueStatus;
+};

src/dynamo/models/featuredQueue.ts

@@ -0,0 +1,95 @@
+import { DocumentClient } from 'aws-sdk2-types/lib/dynamodb/document_client';
+
+import { FeaturedQueueItem, FeaturedQueueStatus, NewFeaturedQueueItem } from '../../datatypes/FeaturedQueue';
+import createClient, { QueryInput } from '../util';
+
+const client = createClient({
+  name: 'FEATURED_QUEUE',
+  partitionKey: 'cube',
+  indexes: [
+    {
+      name: 'ByDate',
+      partitionKey: 'status',
+      sortKey: 'date',
+    },
+  ],
+  attributes: {
+    cube: 'S',
+    date: 'N',
+    status: 'S',
+  },
+});
+
+module.exports = {
+  getByCube: async (id: string): Promise<FeaturedQueueItem> => {
+    return (await client.get(id)).Item as FeaturedQueueItem;
+  },
+  put: async (document: NewFeaturedQueueItem): Promise<void> => {
+    await client.put({
+      ...document,
+      status: FeaturedQueueStatus.ACTIVE,
+    });
+  },
+  querySortedByDate: async (
+    lastKey?: DocumentClient.Key,
+    limit = 36,
+  ): Promise<{ items?: FeaturedQueueItem[]; lastKey?: DocumentClient.Key }> => {
+    //Using keyof .. provides static checking that the attribute exists in the type. Also its own const b/c inline "as keyof" not validating
+    const statusAttr: keyof FeaturedQueueItem = 'status';
+
+    const query: QueryInput = {
+      IndexName: 'ByDate',
+      KeyConditionExpression: '#status = :status',
+      ExpressionAttributeNames: {
+        '#status': statusAttr,
+      },
+      ExpressionAttributeValues: {
+        ':status': FeaturedQueueStatus.ACTIVE,
+      },
+      Limit: limit,
+    };
+    if (lastKey) {
+      query.ExclusiveStartKey = lastKey;
+    }
+    const result = await client.query(query);
+
+    return {
+      items: result.Items as FeaturedQueueItem[],
+      lastKey: result.LastEvaluatedKey,
+    };
+  },
+  queryWithOwnerFilter: async (
+    ownerID: string,
+    lastKey?: DocumentClient.Key,
+  ): Promise<{ items?: FeaturedQueueItem[]; lastKey?: DocumentClient.Key }> => {
+    //Using keyof .. provides static checking that the attribute exists in the type. Also its own const b/c inline "as keyof" not validating
+    const statusAttr: keyof FeaturedQueueItem = 'status';
+    const ownerAttr: keyof FeaturedQueueItem = 'owner';
+
+    const query: QueryInput = {
+      IndexName: 'ByDate',
+      KeyConditionExpression: '#status = :status',
+      FilterExpression: '#owner = :owner',
+      ExpressionAttributeNames: {
+        '#status': statusAttr,
+        '#owner': ownerAttr,
+      },
+      ExpressionAttributeValues: {
+        ':status': FeaturedQueueStatus.ACTIVE,
+        ':owner': ownerID,
+      },
+    };
+    if (lastKey) {
+      query.ExclusiveStartKey = lastKey;
+    }
+    const result = await client.query(query);
+
+    return {
+      items: result.Items as FeaturedQueueItem[],
+      lastKey: result.LastEvaluatedKey,
+    };
+  },
+  batchPut: async (documents: FeaturedQueueItem[]): Promise<void> => client.batchPut(documents),
+  createTable: async (): Promise<DocumentClient.CreateTableOutput> => client.createTable(),
+  delete: async (id: string): Promise<void> => client.delete({ cube: id }),
+};

src/jobs/rotate_featured.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console -- Debugging */
 const fq = require('../util/featuredQueue');
 const FeaturedQueue = require('../dynamo/models/featuredQueue');
 const util = require('../util/util');
@@ -16,7 +17,7 @@ const User = require('../dynamo/models/user');
       console.warn(message);
     }
 
-    if (rotate.status === 'false') {
+    if (rotate.success === 'false') {
       console.error('featured cube rotation failed!');
       return;
     }