Merge branch 'main' into ships/add-stevie

Dockerfile

@@ -16,7 +16,14 @@ FROM node:${NODE_VERSION}-alpine as base
 ARG PNPM_VERSION=8.14.3
 
 # Install python deps for node-gyp
-RUN apk add g++ make py3-pip
+RUN apk add g++ make py3-pip ca-certificates curl
+
+# Setup RDS CA Certificates
+
+RUN curl -L \
+      -o  /usr/local/share/ca-certificates/rds-global-bundle.pem \
+      https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem \
+    && update-ca-certificates
 
 # Set working directory for all build stages.
 WORKDIR /usr/src/app

core/.env.docker

@@ -1 +1 @@
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}:${PGPORT}/${PGDATABASE}?sslmode=require
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}:${PGPORT}/${PGDATABASE}

core/actions/_lib/runActionInstance.ts

@@ -1,5 +1,6 @@
 "use server";
 
+import { revalidateTag } from "next/cache";
 import { captureException } from "@sentry/nextjs";
 import { sql } from "kysely";
 
@@ -117,8 +118,11 @@ const _runActionInstance = async ({
 				values: values as any,
 			},
 			runParameters: runParameters,
+			stageId: actionInstance.stageId,
 		});
 
+		revalidateTag(`community-stages_${pub.communityId}`);
+
 		return result;
 	} catch (error) {
 		captureException(error);

core/actions/api/index.ts

@@ -3,6 +3,7 @@
 import type Event from "~/kysely/types/public/Event";
 import * as email from "../email/action";
 import * as log from "../log/action";
+import * as move from "../move/action";
 import * as pdf from "../pdf/action";
 import * as pushToV6 from "../pushToV6/action";
 
@@ -11,6 +12,7 @@ export const actions = {
 	[pdf.action.name]: pdf.action,
 	[email.action.name]: email.action,
 	[pushToV6.action.name]: pushToV6.action,
+	[move.action.name]: move.action,
 } as const;
 
 export const getActionByName = (name: keyof typeof actions) => {

core/actions/move/action.ts

@@ -0,0 +1,16 @@
+import * as z from "zod";
+
+import { MoveHorizontal } from "ui/icon";
+
+import { defineAction } from "../types";
+
+export const action = defineAction({
+	name: "move",
+	config: z.object({
+		stage: z.string().describe("Destination stage"),
+	}),
+	description: "Move a pub to a different stage",
+	runParameters: z.object({}).optional(),
+	pubFields: [],
+	icon: MoveHorizontal,
+});

core/actions/move/run.ts

@@ -0,0 +1,42 @@
+"use server";
+
+import { logger } from "logger";
+
+import type { action } from "./action";
+import type { PubsId } from "~/kysely/types/public/Pubs";
+import type { StagesId } from "~/kysely/types/public/Stages";
+import { db } from "~/kysely/database";
+import { defineRun } from "../types";
+
+export const run = defineRun<typeof action>(async ({ pub, config, stageId }) => {
+	try {
+		await db
+			.with("leave-stage", (db) =>
+				db
+					.deleteFrom("PubsInStages")
+					.where("pubId", "=", pub.id as PubsId)
+					.where("stageId", "=", stageId)
+			)
+			.insertInto("PubsInStages")
+			.values({
+				pubId: pub.id as PubsId,
+				stageId: config.stage as StagesId,
+			})
+			.execute();
+	} catch (error) {
+		logger.error({ msg: "move", error });
+		return {
+			title: "Failed to move pub",
+			error: "An error occured while moving the pub",
+			cause: error,
+		};
+	}
+
+	logger.info({ msg: "move", pub, config });
+
+	return {
+		success: true,
+		report: "Pub moved",
+		data: {},
+	};
+});

core/actions/runs.ts

@@ -1,4 +1,5 @@
 export { run as pdf } from "./pdf/run";
 export { run as email } from "./email/run";
 export { run as log } from "./log/run";
+export { run as move } from "./move/run";
 export { run as pushToV6 } from "./pushToV6/run";

core/actions/types.ts

@@ -5,6 +5,7 @@ import type * as Icons from "ui/icon";
 
 import type { CorePubField } from "./corePubFields";
 import type { ClientExceptionOptions } from "~/lib/serverActions";
+import { StagesId } from "~/kysely/types/public/Stages";
 
 export type ActionPubType = CorePubField[];
 
@@ -17,7 +18,7 @@ export type ActionPub<T extends ActionPubType> = {
 
 export type RunProps<T extends Action> =
 	T extends Action<infer PT, infer AC, infer RP>
-		? { config: AC; pub: ActionPub<PT>; runParameters: RP }
+		? { config: AC; pub: ActionPub<PT>; runParameters: RP; stageId: StagesId }
 		: never;
 
 export type ConfigProps<C> = {

core/kysely/types/public/Action.ts

@@ -7,6 +7,7 @@ enum Action {
 	pdf = "pdf",
 	email = "email",
 	pushToV6 = "pushToV6",
+	move = "move",
 }
 
 export default Action;

core/kysely/types/public/PublicSchema.ts

@@ -30,8 +30,6 @@ import { type default as StagesTable } from "./Stages";
 import { type default as UsersTable } from "./Users";
 
 export default interface PublicSchema {
-	rules: RulesTable;
-
 	_prisma_migrations: PrismaMigrationsTable;
 
 	users: UsersTable;
@@ -83,4 +81,6 @@ export default interface PublicSchema {
 	action_instances: ActionInstancesTable;
 
 	PubsInStages: PubsInStagesTable;
+
+	rules: RulesTable;
 }

core/next.docker.config.js

@@ -1,6 +1,5 @@
 const baseConfig = {
 	experimental: {
-		serverActions: true,
 		instrumentationHook: true,
 	},
 };

core/prisma/migrations/20240506184830_add_move_action/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "Action" ADD VALUE 'move';

core/prisma/schema.prisma

@@ -347,6 +347,7 @@ enum Action {
   pdf
   email
   pushToV6
+  move
 }
 
 model Rule {

infrastructure/nginx/default.conf.template

@@ -8,6 +8,11 @@ server {
 
   location / {
     proxy_pass  $scheme://nextjs;
+
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Real-IP $remote_addr;
   }
 
   location /legacy_healthcheck {

infrastructure/terraform/modules/core-services/outputs.tf

@@ -2,7 +2,6 @@ locals {
   db_user = aws_db_instance.core_postgres.username
   db_name = aws_db_instance.core_postgres.db_name
   db_host = aws_db_instance.core_postgres.address
-  db_sslmode = "require"
 }
 
 output "secrets" {
@@ -23,17 +22,12 @@ output "asset_uploader_key_id" {
   value = aws_iam_access_key.asset_uploader.id
 }
 
-output "rds_connection_string_sans_password" {
-  value = "postgresql://${local.db_user}@${local.db_host}:5432/${local.db_name}?sslmode=${local.db_sslmode}"
-}
-
 output "rds_connection_components" {
   value = {
     user = local.db_user
     database = local.db_name
     host = local.db_host
     port = "5432"
-    sslmode = local.db_sslmode
     id = aws_db_instance.core_postgres.id
   }
 }

infrastructure/terraform/modules/deployment/main.tf

@@ -76,7 +76,6 @@ module "service_core" {
   configuration = {
     container_port = 3000
     environment = [
-      # { name = "DATABASE_URL", value = module.core_dependency_services.rds_connection_string_sans_password },
       { name = "PGUSER", value = module.core_dependency_services.rds_connection_components.user },
       { name = "PGDATABASE", value = module.core_dependency_services.rds_connection_components.database },
       { name = "PGHOST", value = module.core_dependency_services.rds_connection_components.host },
@@ -213,7 +212,6 @@ module "service_flock" {
 
    configuration = {
      environment = [
-       # { name = "DATABASE_URL", value = module.core_dependency_services.rds_connection_string_sans_password },
        { name = "PGUSER", value = module.core_dependency_services.rds_connection_components.user },
        { name = "PGDATABASE", value = module.core_dependency_services.rds_connection_components.database },
        { name = "PGHOST", value = module.core_dependency_services.rds_connection_components.host },

integrations/evaluations/next.docker.config.js

@@ -2,7 +2,6 @@ const baseConfig = {
 	basePath: "/intg/evaluations",
 	assetPrefix: "/intg/evaluations",
 	experimental: {
-		serverActions: true,
 		instrumentationHook: true,
 	},
 };

integrations/submissions/next.docker.config.js

@@ -2,7 +2,6 @@ const baseConfig = {
 	basePath: "/intg/submissions",
 	assetPrefix: "/intg/submissions",
 	experimental: {
-		serverActions: true,
 		instrumentationHook: true,
 	},
 };

jobs/next.docker.config.js

@@ -1,6 +1,5 @@
 const baseConfig = {
 	experimental: {
-		serverActions: true,
 		instrumentationHook: true,
 	},
 };

packages/contracts/src/resources/integrations.ts

@@ -64,6 +64,7 @@ export const GetPubResponseBodyBase = commonPubFields.extend({
 	id: z.string(),
 	values: z.record(JsonOutput),
 	assignee: User.optional(),
+	communityId: z.string(),
 });
 export type GetPubResponseBodyBase = z.infer<typeof GetPubResponseBodyBase>;
 

packages/ui/src/icon.tsx

@@ -17,6 +17,7 @@ export {
 	Mail,
 	Menu,
 	MoreVertical,
+	MoveHorizontal,
 	Pencil,
 	Plus,
 	Play,