Merge pull request #77 from wri/create_edit_teams

Create edit teams

.github/workflows/main.yml

@@ -60,8 +60,14 @@ jobs:
       - name: Set up Docker Containers
         env:
           CKAN_IMAGE: '${{ steps.login-ecr.outputs.registry }}/${{ secrets.ECR_CKAN_REPO }}:${{ github.sha }}'
+          MINIO_ROOT_USER: 'minioadmin'
+          MINIO_ROOT_PASSWORD: 'minioadmin'
         run: docker compose -f docker-compose.test.yml --env-file .env.example up --build -d
         working-directory: ./ckan-backend-dev
+      - name: Print Container names
+        run: docker ps -a
+      - name: Print logs
+        run: docker logs wri-frontend
       - name: Cypress Install and CKAN setup
         uses: cypress-io/github-action@v6
         with:
@@ -70,13 +76,26 @@ jobs:
           node-version: 18
           runTests: false
           working-directory: ./integration-tests
+      - name: Cypress Install and Frontend setup
+        uses: cypress-io/github-action@v6
+        with:
+          wait-on: 'http://localhost:3000'
+          wait-on-timeout: 120
+          node-version: 18
+          runTests: false
+          working-directory: ./e2e-tests
       - name: Create sysadmin API for Authorization
         run: bash ./ckan-backend-dev/ckan/scripts/cypress_setup.sh
       - name: Run Integration tests 🧪
         uses: cypress-io/github-action@v6
         with:
           command: node test.js
           working-directory: ./integration-tests
+      - name: Run frontend tests 🧪
+        uses: cypress-io/github-action@v6
+        with:
+          command: npm run test
+          working-directory: ./e2e-tests
       - name: Copy run_unit_tests.sh
         run: docker cp ./ckan/scripts/run_unit_tests.sh ckan-wri:/srv/app/run_unit_tests.sh
         working-directory: ./ckan-backend-dev

ckan-backend-dev/ckan/Dockerfile.dev

@@ -73,4 +73,4 @@ RUN ckan config-tool ${CKAN_INI} "api_token.jwt.algorithm = RS256" && \
     ckan config-tool ${CKAN_INI} "api_token.jwt.encode.secret = file:${APP_DIR}/jwtRS256.key" && \
     ckan config-tool ${CKAN_INI} "api_token.jwt.decode.secret = file:${APP_DIR}/jwtRS256.key.pub"
 
-CMD ["sh", "-c", "${APP_DIR}/start_ckan_development.sh"]
+CMD ["sh", "-c", "${APP_DIR}/start_ckan_development.sh"]

ckan-backend-dev/ckan/scripts/cypress_setup.sh

@@ -17,3 +17,4 @@ cp ../../../integration-tests/cypress.json.example ../../../integration-tests/cy
 
 # Replace the token placeholder with the generated token
 sed -i "s/CKAN_API_TOKEN/$token/g" ../../../integration-tests/cypress.json
+sed -i "s/CKAN_API_TOKEN/$token/g" ../../../e2e-tests/cypress.config.js

ckan-backend-dev/docker-compose.dev.yml

@@ -34,6 +34,31 @@ services:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
     image: ${CKAN_IMAGE}
 
+  frontend:
+    container_name: wri-frontend
+    build:
+      context: ../deployment/frontend/
+      args:
+        - NEXTAUTH_SECRET=secret
+        - NEXTAUTH_URL=http://localhost:3000
+        - CKAN_URL=http://ckan-dev:5000
+        - S3_ACCESS_KEY_ID=${MINIO_ROOT_USER}
+        - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
+        - S3_BUCKET_NAME=ckan
+        - S3_BUCKET_REGION=us-east-1
+    environment:
+      - NEXTAUTH_SECRET=secret
+      - NEXTAUTH_URL=http://localhost:3000
+      - CKAN_URL=http://ckan-dev:5000
+      - S3_ACCESS_KEY_ID=${MINIO_ROOT_USER}
+      - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
+      - S3_BUCKET_NAME=ckan
+      - S3_BUCKET_REGION=us-east-1
+    ports:
+      - "0.0.0.0:3000:3000"
+    healthcheck:
+      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:3000"]
+
   datapusher:
     container_name: ${DATAPUSHER_CONTAINER_NAME}
     image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
@@ -45,6 +70,8 @@ services:
     container_name: ${POSTGRESQL_CONTAINER_NAME}
     build:
       context: postgresql/
+    ports:
+      - "5432:5432"
     environment:
       - POSTGRES_USER
       - POSTGRES_PASSWORD

ckan-backend-dev/docker-compose.test.yml

@@ -36,6 +36,31 @@ services:
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
 
+  frontend:
+    container_name: wri-frontend
+    build:
+      context: ../deployment/frontend/
+      args:
+        - NEXTAUTH_SECRET=secret
+        - NEXTAUTH_URL=http://localhost:3000
+        - CKAN_URL=http://ckan-dev:5000
+        - S3_ACCESS_KEY_ID=${MINIO_ROOT_USER}
+        - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
+        - S3_BUCKET_NAME=ckan
+        - S3_BUCKET_REGION=us-east-1
+    environment:
+      - NEXTAUTH_SECRET=secret
+      - NEXTAUTH_URL=http://localhost:3000
+      - CKAN_URL=http://ckan-dev:5000
+      - S3_ACCESS_KEY_ID=${MINIO_ROOT_USER}
+      - S3_SECRET_KEY_ID=${MINIO_ROOT_PASSWORD}
+      - S3_BUCKET_NAME=ckan
+      - S3_BUCKET_REGION=us-east-1
+    ports:
+      - "0.0.0.0:3000:3000"
+    healthcheck:
+      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:3000"]
+
   db:
     container_name: ${POSTGRESQL_CONTAINER_NAME}
     build:

deployment/frontend/.env.example

@@ -13,8 +13,14 @@
 # You can generate a new secret on the command line with:
 # openssl rand -base64 32
 # https://next-auth.js.org/configuration/options#secret
-#NEXTAUTH_SECRET="secret"
-#NEXTAUTH_URL="http://localhost:3000"
+NEXTAUTH_SECRET="secret"
+NEXTAUTH_URL="http://localhost:3000"
 
 # Next Auth CKAN Login Provider
-#CKAN_URL="https://demo.dev.datopian.com"
+CKAN_URL="https://demo.dev.datopian.com"
+#
+# S3 Storage
+S3_ACCESS_KEY_ID="minioadmin"
+S3_SECRET_KEY_ID="minioadmin"
+S3_BUCKET_NAME="ckan"
+S3_BUCKET_REGION="us-east-1"