+
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 6998ca25..c457c761 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,5 +1,6 @@
import '@/styles/globals.css';
import '@/styles/prosemirror.css';
+import { GeistMono } from 'geist/font/mono';
import { GeistSans } from 'geist/font/sans';
import { Metadata } from 'next';
import 'server-only';
@@ -22,7 +23,7 @@ export default async function RootLayout({
children: React.ReactNode;
}) {
return (
-
+
{children}
diff --git a/src/data/user/projects.tsx b/src/data/user/projects.tsx
index 5f351431..2c2f68cd 100644
--- a/src/data/user/projects.tsx
+++ b/src/data/user/projects.tsx
@@ -346,4 +346,21 @@ export async function updateProjectSettingsAction({
console.error("Error updating project settings:", error);
return { status: 'error', message: 'Failed to update project settings' };
}
+}
+
+export async function deleteProject(projectId: string): Promise
> {
+ const supabase = createSupabaseUserServerComponentClient();
+ const { data, error } = await supabase
+ .from('projects')
+ .update({
+ deleted_at: new Date().toISOString(),
+ })
+ .eq('id', projectId)
+ .single();
+
+ if (error) {
+ return { status: 'error', message: error.message };
+ }
+
+ return { status: 'success', data };
}
\ No newline at end of file
diff --git a/src/data/user/runs.ts b/src/data/user/runs.ts
index 40b2e24c..f4585578 100644
--- a/src/data/user/runs.ts
+++ b/src/data/user/runs.ts
@@ -1,6 +1,7 @@
'use server';
import { createSupabaseUserServerComponentClient } from '@/supabase-clients/user/createSupabaseUserServerComponentClient';
+import { SAPayload } from '@/types';
export async function getTFVarsByProjectId(projectId: string) {
const supabaseClient = createSupabaseUserServerComponentClient();
@@ -122,3 +123,76 @@ export async function getRunsByProjectId(projectId: string) {
if (error) throw error;
return data;
}
+
+export async function requestRunApproval(
+ runId: string,
+): Promise> {
+ const supabase = createSupabaseUserServerComponentClient();
+ const { data, error } = await supabase
+ .from('digger_runs')
+ .update({ status: 'pending_approval' })
+ .eq('id', runId)
+ .select('id')
+ .single();
+
+ if (error) {
+ return { status: 'error', message: error.message };
+ }
+ return { status: 'success', data: data.id };
+}
+
+export async function approveRun(
+ runId: string,
+ userId: string,
+): Promise> {
+ const supabase = createSupabaseUserServerComponentClient();
+ const { data, error } = await supabase
+ .from('digger_runs')
+ .update({
+ status: 'pending_apply',
+ approver_user_id: userId,
+ is_approved: true,
+ })
+ .eq('id', runId)
+ .select('id')
+ .single();
+
+ if (error) {
+ return { status: 'error', message: error.message };
+ }
+ return { status: 'success', data: data.id };
+}
+
+export async function rejectRun(
+ runId: string,
+ userId: string,
+): Promise> {
+ const supabase = createSupabaseUserServerComponentClient();
+ const { data, error } = await supabase
+ .from('digger_runs')
+ .update({
+ status: 'rejected',
+ approver_user_id: userId,
+ is_approved: false,
+ })
+ .eq('id', runId)
+ .select('id')
+ .single();
+
+ if (error) {
+ return { status: 'error', message: error.message };
+ }
+ return { status: 'success', data: data.id };
+}
+
+export async function changeRunStatus(runId: string, status: string) {
+ const supabase = createSupabaseUserServerComponentClient();
+ const { error } = await supabase
+ .from('digger_runs')
+ .update({ status: status })
+ .eq('id', runId)
+ .select('id')
+ .single();
+
+ if (error) throw error;
+}
diff --git a/src/lib/database.types.ts b/src/lib/database.types.ts
index 93568bdd..6aa0a1e3 100644
--- a/src/lib/database.types.ts
+++ b/src/lib/database.types.ts
@@ -208,7 +208,7 @@ export type Database = {
deleted_at: string | null
expiry: string | null
id: number
- organisation_id: number | null
+ organisation_id: string | null
type: string | null
updated_at: string | null
value: string | null
@@ -218,7 +218,7 @@ export type Database = {
deleted_at?: string | null
expiry?: string | null
id?: number
- organisation_id?: number | null
+ organisation_id?: string | null
type?: string | null
updated_at?: string | null
value?: string | null
@@ -228,12 +228,20 @@ export type Database = {
deleted_at?: string | null
expiry?: string | null
id?: number
- organisation_id?: number | null
+ organisation_id?: string | null
type?: string | null
updated_at?: string | null
value?: string | null
}
- Relationships: []
+ Relationships: [
+ {
+ foreignKeyName: "fk_jt_organisation_id"
+ columns: ["organisation_id"]
+ isOneToOne: false
+ referencedRelation: "organizations"
+ referencedColumns: ["id"]
+ },
+ ]
}
digger_jobs: {
Row: {
@@ -403,9 +411,11 @@ export type Database = {
}
digger_runs: {
Row: {
+ apply_logs: string | null
apply_stage_id: string | null
approval_author: string | null
approval_date: string | null
+ approver_user_id: string | null
commit_id: string
created_at: string
deleted_at: string | null
@@ -415,17 +425,21 @@ export type Database = {
is_approved: boolean | null
plan_stage_id: string | null
pr_number: number | null
+ project_id: string
project_name: string | null
repo_id: number
run_type: string
status: string
+ terraform_output: string | null
triggertype: string
updated_at: string
}
Insert: {
+ apply_logs?: string | null
apply_stage_id?: string | null
approval_author?: string | null
approval_date?: string | null
+ approver_user_id?: string | null
commit_id: string
created_at?: string
deleted_at?: string | null
@@ -435,17 +449,21 @@ export type Database = {
is_approved?: boolean | null
plan_stage_id?: string | null
pr_number?: number | null
+ project_id: string
project_name?: string | null
repo_id?: number
run_type: string
status: string
+ terraform_output?: string | null
triggertype: string
updated_at?: string
}
Update: {
+ apply_logs?: string | null
apply_stage_id?: string | null
approval_author?: string | null
approval_date?: string | null
+ approver_user_id?: string | null
commit_id?: string
created_at?: string
deleted_at?: string | null
@@ -455,10 +473,12 @@ export type Database = {
is_approved?: boolean | null
plan_stage_id?: string | null
pr_number?: number | null
+ project_id?: string
project_name?: string | null
repo_id?: number
run_type?: string
status?: string
+ terraform_output?: string | null
triggertype?: string
updated_at?: string
}
@@ -477,6 +497,13 @@ export type Database = {
referencedRelation: "digger_run_stages"
referencedColumns: ["id"]
},
+ {
+ foreignKeyName: "fk_digger_runs_project"
+ columns: ["project_id"]
+ isOneToOne: false
+ referencedRelation: "projects"
+ referencedColumns: ["id"]
+ },
{
foreignKeyName: "fk_digger_runs_repo"
columns: ["repo_id"]
diff --git a/src/styles/globals.css b/src/styles/globals.css
index a8a3233b..100df39e 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -22,10 +22,10 @@
--destructive-foreground: 0 0% 98%;
--border: 240 5.9% 90%;
--input: 240 5.9% 90%;
- --ring: 240 10% 3.9%;
+ --ring: 240 5.9% 10%;
--radius: 0.5rem;
- --chart-1: 173 58% 39%;
- --chart-2: 12 76% 61%;
+ --chart-1: 12 76% 61%;
+ --chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
@@ -52,10 +52,10 @@
--input: 240 3.7% 15.9%;
--ring: 240 4.9% 83.9%;
--chart-1: 220 70% 50%;
- --chart-5: 160 60% 45%;
+ --chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
- --chart-2: 340 75% 55%;
+ --chart-5: 340 75% 55%;
}
}
diff --git a/supabase/migrations/20240726135234_remote_schema.sql b/supabase/migrations/20240726135234_remote_schema.sql
new file mode 100644
index 00000000..7e9f4d77
--- /dev/null
+++ b/supabase/migrations/20240726135234_remote_schema.sql
@@ -0,0 +1,7 @@
+drop index if exists "public"."idx_digger_runs_approval_status";
+
+alter table "public"."digger_runs" drop column "approval_status";
+
+drop type "public"."digger_run_approval_status";
+
+
diff --git a/supabase/migrations/20240726181205_add_terraform_column_to_runs.sql b/supabase/migrations/20240726181205_add_terraform_column_to_runs.sql
new file mode 100644
index 00000000..e544a795
--- /dev/null
+++ b/supabase/migrations/20240726181205_add_terraform_column_to_runs.sql
@@ -0,0 +1,8 @@
+ALTER TABLE "public"."digger_runs"
+ADD COLUMN "terraform_output" text;
+
+ALTER TABLE "public"."digger_runs"
+ADD COLUMN "apply_logs" text;
+
+ALTER TABLE "public"."digger_runs"
+ADD COLUMN "approver_user_id" uuid NULL;
\ No newline at end of file
diff --git a/supabase/migrations/20240726184158_add_changes_to_runs.sql b/supabase/migrations/20240726184158_add_changes_to_runs.sql
new file mode 100644
index 00000000..af0da71a
--- /dev/null
+++ b/supabase/migrations/20240726184158_add_changes_to_runs.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."digger_runs"
+ALTER COLUMN "project_id" SET NOT NULL
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 897db6c0..18acb7f0 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -59,6 +59,7 @@ module.exports = {
fontFamily: {
sans: ['var(--font-satoshi)'],
display: ['Lexend', ...defaultTheme.fontFamily.sans],
+ mono: ['var(--font-geist-mono)'],
},
keyframes: {
accordionDown: {