Merge pull request #122 from NeuroJSON/dev-fan

Feature: Dataset Interaction, Organization, and Processing with Autobidsify Integration

Author: elainefan331

.github/workflows/build-deploy-zodiac.yml

@@ -36,7 +36,7 @@ jobs:
           # PUBLIC_URL="/dev/${{ env.BRANCH_NAME }}/" yarn build
           export PUBLIC_URL="/dev/${{ env.BRANCH_NAME }}/"
           export REACT_APP_API_URL="/dev/${{ env.BRANCH_NAME }}/api/v1"
-          export REACT_APP_USE_CORS=true
+          export REACT_APP_USE_CORS=false
           yarn build
 
       - name: Copy JS libraries (jdata, bjdata etc.)

backend/migrations/20260127203625-create-collections.js

@@ -0,0 +1,62 @@
+"use strict";
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable("collections", {
+      id: {
+        type: Sequelize.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false,
+      },
+      user_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: "users",
+          key: "id",
+        },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      name: {
+        type: Sequelize.STRING(100),
+        allowNull: false,
+      },
+      description: {
+        type: Sequelize.TEXT,
+        allowNull: true,
+      },
+      is_public: {
+        type: Sequelize.BOOLEAN,
+        defaultValue: false,
+        allowNull: false,
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"),
+      },
+      updated_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"),
+      },
+    });
+
+    // Add indexes
+    await queryInterface.addIndex("collections", ["user_id"], {
+      name: "collections_user_id_idx",
+    });
+
+    await queryInterface.addIndex("collections", ["user_id", "name"], {
+      unique: true,
+      name: "collections_user_name_unique",
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.dropTable("collections");
+  },
+};

backend/migrations/20260127203731-create-collection-datasets.js

@@ -0,0 +1,62 @@
+"use strict";
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable("collection_datasets", {
+      id: {
+        type: Sequelize.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false,
+      },
+      collection_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: "collections",
+          key: "id",
+        },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      dataset_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: "datasets",
+          key: "id",
+        },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"),
+      },
+    });
+
+    // Add indexes
+    await queryInterface.addIndex("collection_datasets", ["collection_id"], {
+      name: "collection_datasets_collection_id_idx",
+    });
+
+    await queryInterface.addIndex("collection_datasets", ["dataset_id"], {
+      name: "collection_datasets_dataset_id_idx",
+    });
+
+    await queryInterface.addIndex(
+      "collection_datasets",
+      ["collection_id", "dataset_id"],
+      {
+        unique: true,
+        name: "collection_datasets_unique",
+      }
+    );
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.dropTable("collection_datasets");
+  },
+};

backend/migrations/20260127203948-create-projects.js

@@ -0,0 +1,61 @@
+"use strict";
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable("projects", {
+      id: {
+        type: Sequelize.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false,
+      },
+      user_id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: "users",
+          key: "id",
+        },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      name: {
+        type: Sequelize.STRING(200),
+        allowNull: false,
+      },
+      public_id: {
+        type: Sequelize.STRING(12),
+        allowNull: false,
+        unique: true,
+        defaultValue: "",
+      },
+      description: {
+        type: Sequelize.TEXT,
+        allowNull: true,
+      },
+      extractor_state: {
+        type: Sequelize.JSON,
+        allowNull: true,
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"),
+      },
+      updated_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"),
+      },
+    });
+    // Add indexes
+    await queryInterface.addIndex("projects", ["user_id"], {
+      name: "projects_user_id_idx",
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.dropTable("projects");
+  },
+};

backend/package-lock.json

@@ -29,6 +29,7 @@
     "dotenv": "^17.2.3",
     "express": "^5.1.0",
     "jsonwebtoken": "^9.0.2",
+    "nanoid": "^3.3.11",
     "nodemailer": "^7.0.11",
     "passport": "^0.7.0",
     "passport-google-oauth20": "^2.0.0",