Dev to Stage

.github/CODEOWNERS

@@ -0,0 +1,7 @@
+# Frontend related files
+*.js    @sohit-dg
+*.jsx   @sohit-dg
+*.ts    @sohit-dg
+*.tsx   @sohit-dg
+*.css   @sohit-dg
+*.scss  @sohit-dg

.github/workflows/ci.yaml

@@ -1,27 +1,27 @@
-name: Build on Pull Request
+# name: Build on Pull Request
 
-on:
-  pull_request:
-    branches:
-      - dev
+# on:
+#   pull_request:
+#     branches:
+#       - dev
 
-jobs:
-  build:
-    runs-on: ubuntu-latest
+# jobs:
+#   build:
+#     runs-on: ubuntu-latest
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
+#       - name: Set up Node.js
+#         uses: actions/setup-node@v3
+#         with:
+#           node-version: "18"
 
-      - name: Install dependencies
-        run: npm install -f
+#       - name: Install dependencies
+#         run: npm install -f
 
-      - name: Build the project
-        env:
-          CI: false
-        run: npm run build
+#       - name: Build the project
+#         env:
+#           CI: false
+#         run: npm run build

.github/workflows/pr_validation.yml

@@ -0,0 +1,26 @@
+name: PR Title Validation
+
+on:
+  pull_request:
+    types: [opened, edited]
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check PR Title
+        run: |
+          title="${{ github.event.pull_request.title }}"
+
+          # Validate PR title
+          if [[ "$title" != feat* ]] && \
+             [[ "$title" != fix* ]] && \
+             [[ "$title" != refactor* ]] && \
+             [[ "$title" != style* ]] && \
+             [[ "$title" != chore* ]]; then
+            echo "Error: Pull request title must start with 'feat', 'fix', 'refactor', 'style', or 'chore'."
+            exit 1
+          fi
+
+          echo "Pull request title is valid."

hooks/commit-msg

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Retrieve the commit message from the file specified as the first argument
+commit_msg=$(cat "$1")
+echo "Commit message: '$commit_msg'"
+
+# Define a regular expression for the commit message format
+commit_regex="^(feat|fix|chore|refactor|docs|test|style|ci|perf|build)\([A-Z]+-[0-9]+\): .+"
+
+# Check if the commit message matches the required format
+if [[ ! "$commit_msg" =~ $commit_regex ]]; then
+    echo "Error: Invalid commit message format."
+    echo "Your commit message must follow the format: TYPE(PROJECT-123): description."
+    echo "Valid types: feat, fix, chore, refactor, docs, test, style, ci, perf, build"
+    echo "Example: feat(PROJECT-123): add authentication module"
+    exit 1
+fi
+
+# If the commit message matches, allow the commit
+exit 0

setup.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Set up the custom Git hooks directory
+git config core.hooksPath ./hooks
+
+echo "Git ~ hooks directory set to ./hooks"

src/features/default/src/Components/DatasetCard/DatasetCard.js

@@ -1,7 +1,7 @@
-import location from '../../Assets/Img/location.svg';
-import category from '../../Assets/Img/category.svg';
-import apartment from '../../Assets/Img/apartment.svg';
-import globe_img from '../../Assets/Img/globe_img.svg';
+import location from "../../Assets/Img/location.svg";
+import category_icon from "../../Assets/Img/category.svg";
+import apartment from "../../Assets/Img/apartment.svg";
+import globe_img from "../../Assets/Img/globe_img.svg";
 import { Card, Typography, useMediaQuery, useTheme } from "@mui/material";
 import React from "react";
 import LocalStyle from "./DatasetCard.module.css";
@@ -26,7 +26,7 @@ const DatasetCart = (props) => {
       className={mobile ? LocalStyle.cardContainerSm : LocalStyle.cardContainer}
     >
       <div className="published">
-        <img  src={globe_img}  />
+        <img src={globe_img} />
         <span className="published_text">
           Published on:{" "}
           {publishDate?.split("T")[0]
@@ -36,16 +36,14 @@ const DatasetCart = (props) => {
       </div>
       <div className="d_content_title">{title}</div>
       <div className={"organisation"}>
-        {orgnisationName && (
-          <img  src={apartment}  />
-        )}
+        {orgnisationName && <img src={apartment} />}
         {orgnisationName && (
           <span className="organisation_text">{orgnisationName}</span>
         )}
       </div>
       <div className="d_content_text">
         <div className="category">
-          <img  src={category}  alt="category" />
+          <img src={category_icon} alt="category" />
           <span className="category_text">
             {Object.keys(category).length
               ? category?.length > 1
@@ -55,7 +53,7 @@ const DatasetCart = (props) => {
           </span>
         </div>
         <div className="location">
-          <img  src={location}  alt="location" />
+          <img src={location} alt="location" />
           <span className="location_text">
             {geography?.country?.name
               ? geography?.country?.name

src/features/default/src/Components/Datasets_New/AddDataSet.js

@@ -481,8 +481,6 @@ const AddDataSet = (props) => {
             });
             setStandardisedFiles(tempStandardisedFiles);
 
-            setCategorises(response?.data?.categories);
-
             const updateSubCategoryIds = () => {
               const ids = new Set(
                 response?.data?.categories?.flatMap((category) =>

src/features/default/src/Components/Datasets_New/DataSetsView.js

@@ -285,6 +285,7 @@ const DataSetsView = (props) => {
                   )}
                   datasetId={response?.data?.id}
                   id={tempFile.id}
+                  getDataset={getDataset}
                   usagePolicy={tempFile.usage_policy}
                   fileType={tempFile.accessibility}
                   userType={userType === "guest" ? "guest" : ""}

src/features/default/src/Components/Resources/ResourceCard.js

@@ -39,6 +39,7 @@ import { TbEditCircle } from "react-icons/tb";
 import { CgDetailsMore } from "react-icons/cg";
 import { IoMdMore } from "react-icons/io";
 import UrlConstant from "../../Constants/UrlConstants";
+import globalConfig from "globalConfig";
 
 const cardSx = {
   maxWidth: 368,
@@ -318,6 +319,7 @@ const ResourceCard = ({
                 </span>
               </div>
               {getTokenLocal() &&
+              globalConfig.enableAI &&
               (isLoggedInUserAdmin() ||
                 isLoggedInUserCoSteward() ||
                 isLoggedInUserParticipant()) ? (