Use tmp folder to store temp uploaded logos in project admin form

.gitignore

@@ -28,6 +28,7 @@ files/certs
 files/data/filetypes.json
 images/tempcaptcha/
 images/vue
+files/dev
 
 # nginx config created by generate_config.sh
 ops/configuration/nginx-conf/sites/staging/gigadb.staging.http.conf
@@ -89,6 +90,7 @@ vault
 staging_vault
 live_vault
 js/fuw-*
+js/vite-logo-upload-*
 
 # docs
 docs/apidocs/phpdoc-cache-*

CHANGELOG.md

@@ -4,6 +4,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+- Feat #376: Use tmp folder to store temp uploaded logos in project admin form
+- Feat #376: Uppy logo uploader for admin projects
 - Feat #701: Code refactoring to separate upload status transitions and notifications to prepare for upload status overhaul
 - Security #1867: Update the gitlab static application security testing (SAST) job using the Semgrep-based analyzer
 

less/index.less

@@ -64,4 +64,5 @@
 @import "modules/team-grid.less";
 @import "modules/map.less";
 @import "modules/lists.less";
-@import "modules/tooltip.less";
+@import "modules/tooltip.less";
+@import "modules/spinner.less";

less/modules/spinner.less

@@ -0,0 +1,13 @@
+.spinner {
+  border: 4px solid @color-gigadb-green;
+  border-top: 4px solid transparent;
+  border-radius: 50%;
+  width: 1.5rem;
+  height: 1.5rem;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}

ops/deployment/docker-compose.yml

@@ -93,16 +93,17 @@ services:
       - ${APPLICATION}/less:/var/www/less
       - ${APPLICATION}/css:/var/www/css
       - ${APPLICATION}/sql:/var/www/sql
-      - ${APPLICATION}/style-guide:/var/www/style-guide      
+      - ${APPLICATION}/style-guide:/var/www/style-guide
       - ${APPLICATION}/index.php:/var/www/index.php
       - ${APPLICATION}/composer.json:/var/www/composer.json
       - ${APPLICATION}/composer.lock:/var/www/composer.lock
       - ${APPLICATION}/ops/configuration/php-conf/php-${GIGADB_ENV}.ini:/usr/local/etc/php/php.ini
       - ${APPLICATION}/ops/configuration/php-conf/gigadb.pool.conf:/usr/local/etc/php-fpm.d/gigadb.pool.conf
       - ${APPLICATION}/ops/configuration/php-conf/opcache.ini:/usr/local/etc/php/conf.d/opcache.ini
       # access to File Upload Wizard model classes
-      - ../../fuw/app:/app      
+      - ../../fuw/app:/app
       - ../../gigadb:/gigadb
+      - /tmp:/var/www/datasetfiles
     expose:
       - "9000"
     extra_hosts:
@@ -348,15 +349,15 @@ services:
         ipv4_address: 172.16.238.11
     extra_hosts:
       - "gigadb.test:172.16.238.10"
-      - "fuw-admin-api:172.16.238.10"      
+      - "fuw-admin-api:172.16.238.10"
     environment: # to run headless, set false and comment out port 5900 above and make sure to pass --headless arg in acceptance.suite.yml
       START_XVFB: "false"
 
   fuw-admin:
     <<: *logging
     environment:
       GIGADB_ENV: $GIGADB_ENV
-      DOCKER_HOST: "tcp://host.docker.internal:2375"    
+      DOCKER_HOST: "tcp://host.docker.internal:2375"
     build:
       context: ../../fuw/app
       dockerfile: common/Dockerfile
@@ -465,7 +466,7 @@ services:
       - ~/.composer/cache:/root/.composer/cache:delegated
       # Mount source-code for development
       - ../../fuw/app:/app
-      - ../../gigadb/app:/gigadb-apps        
+      - ../../gigadb/app:/gigadb-apps
       # php config
       - ../../fuw/app/php-conf/fuw.ini:/usr/local/etc/php/conf.d/fuw.ini
       - ../../fuw/app/php-conf/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
@@ -480,7 +481,7 @@ services:
       # volume mount the location of public ftp directory
       - /tmp:/var/ftp/public
       # access to files and reference data
-      - ../../files:/var/www/files      
+      - ../../files:/var/www/files
     depends_on:
       - database
       - beanstalkd
@@ -509,7 +510,7 @@ services:
       - ~/.composer/cache:/root/.composer/cache:delegated
       # Mount source-code for development
       - ../../fuw/app:/app
-      - ../../gigadb/app:/gigadb-apps        
+      - ../../gigadb/app:/gigadb-apps
       # php config
       - ../../fuw/app/php-conf/fuw.ini:/usr/local/etc/php/conf.d/fuw.ini
       - ../../fuw/app/php-conf/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
@@ -524,7 +525,7 @@ services:
       # volume mount the location of public ftp directory
       - /tmp:/var/ftp/public
       # access to files and reference data
-      - ../../files:/var/www/files      
+      - ../../files:/var/www/files
     depends_on:
       - database
       - beanstalkd
@@ -565,7 +566,7 @@ services:
       - ~/.composer/cache:/root/.composer/cache:delegated
       # Mount source-code for development
       - ../../fuw/app:/app
-      - ../../gigadb/app:/gigadb-apps      
+      - ../../gigadb/app:/gigadb-apps
       - ../../vendor:/gigadb-website/vendor
       - ../../sql:/gigadb-website/sql
       - ../../protected:/gigadb-website
@@ -587,7 +588,7 @@ services:
       # to run tests that interact with containers
       # - /var/run/docker.sock:/var/run/docker.sock:ro
       # volume mount the location of public ftp directory
-      - /tmp:/var/ftp/public      
+      - /tmp:/var/ftp/public
     networks:
       - web-tier
       - db-tier
@@ -634,7 +635,7 @@ services:
       - ${DATA_SAVE_PATH}/fuw/repo:/var/repo/
       - ${DATA_SAVE_PATH}/fuw/flags:/var/tmp/processing_flag
       # access to the ftp tokens so the upload's location attribute can be populated
-      - ${DATA_SAVE_PATH}/fuw/credentials:/var/private:ro    
+      - ${DATA_SAVE_PATH}/fuw/credentials:/var/private:ro
       # access to the fuw/console so tusd hooks can trigger upload update
       - ../../fuw/app:/fuw/app
       # access to data feeds
@@ -657,7 +658,7 @@ services:
       - ${DATA_SAVE_PATH}/fuw/incoming/tusd:/var/inbox/
       - ${DATA_SAVE_PATH}/fuw/repo:/var/repo/
       # access to the ftp tokens so the upload's location attribute can be populated
-      - ${DATA_SAVE_PATH}/fuw/credentials:/var/private    
+      - ${DATA_SAVE_PATH}/fuw/credentials:/var/private
       # access to the fuw/console so tusd hooks can trigger upload update
       - ../../fuw/app:/app
       # access to data feeds
@@ -705,6 +706,17 @@ services:
       - le_config:/ca
     command: --domains '*.gigasciencejournal.com'
 
+  # Using similar workflow as js service
+  vite-project-image-location-prod:
+    image: node:$NODE_VERSION-bullseye-slim
+    working_dir: /var/www/vite
+    volumes:
+      - ${APPLICATION}/:/var/www
+    shm_size: '1gb'
+    command: bash -c "npm run test:unit ; npm run build ; npm run deploy"
+    networks:
+      - web-tier
+
 networks:
   web-tier:
     driver: bridge
@@ -717,4 +729,4 @@ networks:
 volumes:
   le_config:
   le_webrootpath:
-  portainer_data:
+  portainer_data:

playwright/package.json

@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "npx playwright test"
+    "test": "npx playwright test",
+    "test:single": "npx playwright test --workers=1 --project=chromium"
   },
   "keywords": [],
   "author": "",