Remove TODOs and implement correct types in environmentDataSources.ts (#98)

* Remove TODOs and implement correct types in environmentDataSources.ts

* Add delete cascade to datasource properties

* Update app/lib/stores/environmentDataSources.ts

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Update app/lib/stores/environmentDataSources.ts

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: kapicic

app/components/@settings/tabs/data/forms/AddDataSourceForm.tsx

@@ -51,7 +51,6 @@ interface AddDataSourceFormProps {
   onSuccess: () => void;
 }
 
-// TODO: @skos update the form to use EnvironmentDataSource
 export default function AddDataSourceForm({ isSubmitting, setIsSubmitting, onSuccess }: AddDataSourceFormProps) {
   const [dbType, setDbType] = useState<DataSourceOption>(DEFAULT_DATA_SOURCES[0]);
   const [dbName, setDbName] = useState('');

app/components/@settings/tabs/data/forms/EditDataSourceForm.tsx

@@ -41,7 +41,6 @@ interface EnvironmentsResponse {
   error?: string;
 }
 
-// TODO: @skos update the form to use EnvironmentDataSource
 interface EditDataSourceFormProps {
   selectedDataSource: EnvironmentDataSource | null;
   isSubmitting: boolean;

app/components/DataLoader.tsx

@@ -28,7 +28,6 @@ interface DataLoaderProps {
 
 export function DataLoader({ children, rootData }: DataLoaderProps) {
   const { data: session } = useSession();
-  // TODO: @skos this is the main idea, keep it this way but fetch envId, envName and connectionUrl
   const { setEnvironmentDataSources } = useEnvironmentDataSourcesStore();
   const { setPluginAccess } = usePluginStore();
   const { setDataSourceTypes } = useDataSourceTypesStore();

app/lib/services/dataSourceService.ts

@@ -237,7 +237,6 @@ export function getDataSource(id: string) {
   return prisma.dataSource.findUnique({ where: { id } });
 }
 
-// TODO: @skos update this and the routes and UI
 export async function updateDataSource(data: { id: string; name: string; connectionString: string; userId: string }) {
   validateDataSource(data.connectionString);
 
@@ -247,7 +246,6 @@ export async function updateDataSource(data: { id: string; name: string; connect
   });
 }
 
-// TODO: @skos update this with environmentId (routes and UI as well)
 export async function deleteDataSource(id: string, userId: string) {
   return prisma.dataSource.delete({ where: { id, createdById: userId } });
 }

app/lib/stores/environmentDataSources.ts

@@ -3,14 +3,13 @@ import { useRouter } from 'next/navigation';
 import { persist } from 'zustand/middleware';
 import { DATA_SOURCE_CONNECTION_ROUTE } from '~/lib/constants/routes';
 
-// TODO: @skos we could reassign the prisma types in lib/ to a variable and import here as a type
 export interface EnvironmentVariable {
   id: string;
   key: string;
   value: string;
   description: string | null;
-  // TODO: @skos the type should be EnvironmentVariableType (but can't import directly from prisma)
-  type: any;
+  // this must be synced with EnvironmentVariableType enum in prisma
+  type: 'GLOBAL' | 'DATA_SOURCE';
   environmentId: string;
   dataSourceId: string | null;
   createdById: string;
@@ -36,11 +35,11 @@ export interface EnvironmentDataSource {
   };
   dataSourceProperties: [
     {
-      type: any;
+      // this must be synced with DataSourcePropertyType enum in prisma
+      type: 'CONNECTION_URL' | 'ACCESS_TOKEN' | 'REFRESH_TOKEN' | 'CLIENT_ID' | 'CLIENT_SECRET' | 'API_KEY';
       environmentVariables: EnvironmentVariable[];
     },
   ];
-  // TODO: @skos this should be DataSourcePropertyType (but can't import from prisma directly)
 }
 
 interface EnvironmentDataSourcesStore {

prisma/migrations/20250828165329_add_cascade_delete_to_data_source_properties/migration.sql

@@ -0,0 +1,5 @@
+-- DropForeignKey
+ALTER TABLE "public"."data_source_property" DROP CONSTRAINT "data_source_property_environment_id_data_source_id_fkey";
+
+-- AddForeignKey
+ALTER TABLE "public"."data_source_property" ADD CONSTRAINT "data_source_property_environment_id_data_source_id_fkey" FOREIGN KEY ("environment_id", "data_source_id") REFERENCES "public"."environment_data_source"("environment_id", "data_source_id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -49,7 +49,7 @@ model DataSourceProperty {
 
   environmentId         String                @map("environment_id")
   dataSourceId          String                @map("data_source_id")
-  environmentDataSource EnvironmentDataSource @relation(fields: [environmentId, dataSourceId], references: [environmentId, dataSourceId])
+  environmentDataSource EnvironmentDataSource @relation(fields: [environmentId, dataSourceId], references: [environmentId, dataSourceId], onDelete: Cascade)
 
   @@map("data_source_property")
 }