From 2cd2a64fc5c4b0308b7ff9d44003ee5b006bcfe4 Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Fri, 3 Nov 2023 13:52:34 -0500 Subject: [PATCH 1/5] commit to main --- conf/docker/docker-compose-dev.all.debug.yml | 16 ++++++++++------ designsafe/settings/common_settings.py | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml index ff7d5979ae..b897c1a568 100644 --- a/conf/docker/docker-compose-dev.all.debug.yml +++ b/conf/docker/docker-compose-dev.all.debug.yml @@ -4,6 +4,7 @@ version: "3" services: redis: image: redis:7 + platform: "linux/amd64" volumes: - redis_data:/data - ../redis.conf:/usr/local/etc/redis/redis.conf @@ -14,7 +15,7 @@ services: hostname: des_redis rabbitmq: - image: rabbitmq:3.6.10-management + image: arm64v8/rabbitmq:3.6.14-management volumes: - rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq - ../rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf @@ -29,11 +30,13 @@ services: memcached: image: memcached:latest + platform: "linux/amd64" container_name: des_memcached hostname: des_memcached elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0 + platform: "linux/amd64" ulimits: memlock: -1 environment: @@ -63,6 +66,7 @@ services: nginx: image: nginx + platform: "linux/amd64" volumes: - ../nginx/nginx.debug.conf:/etc/nginx/nginx.conf - ../nginx/gzip.conf:/etc/nginx/gzip.conf @@ -71,8 +75,8 @@ services: - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/srv/www/designsafe/static - - ../../data/media:/srv/www/designsafe/media + - ../../data/static:/var/www/designsafe-ci.org/static + - ../../data/media:/var/www/designsafe-ci.org/media links: - django:django ports: @@ -93,7 +97,7 @@ services: - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/srv/www/designsafe/media + - ../../data/media:/var/www/designsafe-ci.org/media ports: - 127.0.0.1:8000:8000 - 127.0.0.1:5678:5678 @@ -116,8 +120,8 @@ services: volumes: - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/srv/www/designsafe/static - - ../../data/media:/srv/www/designsafe/media + - ../../data/static:/var/www/designsafe-ci.org/static + - ../../data/media:/var/www/designsafe-ci.org/media dns: - 8.8.8.8 - 8.8.4.4 diff --git a/designsafe/settings/common_settings.py b/designsafe/settings/common_settings.py index 62f1314237..559b0c5648 100644 --- a/designsafe/settings/common_settings.py +++ b/designsafe/settings/common_settings.py @@ -143,7 +143,7 @@ 'cms.middleware.user.CurrentUserMiddleware', 'cms.middleware.page.CurrentPageMiddleware', 'cms.middleware.toolbar.ToolbarMiddleware', - 'cms.middleware.language.LanguageCookieMiddleware', + # 'cms.middleware.language.LanguageCookieMiddleware', 'impersonate.middleware.ImpersonateMiddleware', 'designsafe.middleware.DesignSafeTermsMiddleware', 'designsafe.middleware.DesignsafeProfileUpdateMiddleware', From 69e851140467a5c94f6aa9cd3631b183474773be Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Thu, 11 Jan 2024 11:08:54 -0600 Subject: [PATCH 2/5] removed 'data reuse' from Soc Sci collection level --- .../pipeline-amend/amend-field-recon.template.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html b/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html index 6829747856..dee7e8b283 100644 --- a/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html +++ b/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html @@ -500,15 +500,6 @@

-
-
Data Reuse
- - -  icon of line graph with rising line -  View Collection Metrics - - -

{{ collection.value.description }}

From 086c78aa6082b8390b1b3e7472da588ccfb8ff58 Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:01:27 -0600 Subject: [PATCH 3/5] remove Data Reuse from Sco Sci collection --- .../directives/templates/prj-pub-collections-template.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html b/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html index 1937e644f6..e6767e9dae 100644 --- a/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html +++ b/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html @@ -186,13 +186,6 @@
-
Data Reuse
- - -  icon of line graph with rising line -  View Collection Metrics - -
(Appears when published)
From 6d9d34b95a166427edd8e312df73ca5567049bef Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:03:37 -0600 Subject: [PATCH 4/5] docker file --- conf/docker/docker-compose-dev.all.debug.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml index b897c1a568..ff7d5979ae 100644 --- a/conf/docker/docker-compose-dev.all.debug.yml +++ b/conf/docker/docker-compose-dev.all.debug.yml @@ -4,7 +4,6 @@ version: "3" services: redis: image: redis:7 - platform: "linux/amd64" volumes: - redis_data:/data - ../redis.conf:/usr/local/etc/redis/redis.conf @@ -15,7 +14,7 @@ services: hostname: des_redis rabbitmq: - image: arm64v8/rabbitmq:3.6.14-management + image: rabbitmq:3.6.10-management volumes: - rabbitmq_data:/var/lib/rabbitmq/mnesia/rabbit@des_rabbitmq - ../rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf @@ -30,13 +29,11 @@ services: memcached: image: memcached:latest - platform: "linux/amd64" container_name: des_memcached hostname: des_memcached elasticsearch: image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0 - platform: "linux/amd64" ulimits: memlock: -1 environment: @@ -66,7 +63,6 @@ services: nginx: image: nginx - platform: "linux/amd64" volumes: - ../nginx/nginx.debug.conf:/etc/nginx/nginx.conf - ../nginx/gzip.conf:/etc/nginx/gzip.conf @@ -75,8 +71,8 @@ services: - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media + - ../../data/static:/srv/www/designsafe/static + - ../../data/media:/srv/www/designsafe/media links: - django:django ports: @@ -97,7 +93,7 @@ services: - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media + - ../../data/media:/srv/www/designsafe/media ports: - 127.0.0.1:8000:8000 - 127.0.0.1:5678:5678 @@ -120,8 +116,8 @@ services: volumes: - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media + - ../../data/static:/srv/www/designsafe/static + - ../../data/media:/srv/www/designsafe/media dns: - 8.8.8.8 - 8.8.4.4 From 0d74f4d6c0dcf17611891d01f52be92cc08055f3 Mon Sep 17 00:00:00 2001 From: Van Go <35277477+van-go@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:35:07 -0600 Subject: [PATCH 5/5] remove Data Reuse from Documents in Amends --- .../pipeline-amend/amend-field-recon.template.html | 9 --------- .../templates/prj-pub-collections-template.html | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html b/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html index dee7e8b283..f03a531b2a 100644 --- a/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html +++ b/designsafe/static/scripts/data-depot/components/projects/pipeline-amend/amend-field-recon.template.html @@ -241,15 +241,6 @@

-
-
Data Reuse
- - -  icon of line graph with rising line -  View Metrics - - -

{{ mainEntity.value.description }}

diff --git a/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html b/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html index e6767e9dae..2c7eee205d 100644 --- a/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html +++ b/designsafe/static/scripts/ng-designsafe/directives/templates/prj-pub-collections-template.html @@ -185,11 +185,11 @@ -
+

{{ collection.value.description }}