CONCD-551 Merge Main into Feature branch (#2117)

* Added ability to redownload all items from a bulk import. Added automatic reprocessing of import items that are missing assets. (#2075) * fix image tag env variable qualifier (#2076) * Added the ability to stack the viewer and transcription form vertically (#2078) * Partial implementation of stacking * Added missing image * Added full split toggle * Fixed broken images in horizontal layout. Added buttons for toggling layout * Finished layout changes to support switching between vertical and horizontal layouts * Added split size and direction persistence * Added automatic zoom when changing the transcription layout (#2079) * CONCD-467 backfill daily data (#2080) * CONCD-467 backfill daily data * CONCD-467 pin node to version 9 * Added redirects from projects, items and assets that don't exist but that are in a valid campaign (primarily to handle assets, etc. removed when retiring a campaign) * Added new and updated text for the OCR help modal (#2087) * Removed ocr disclaimer (#2088) * Use environments for deploy workflows (#2090) * update ecr log in step - post robo formatting * add a job environment to each workflow for more control and better isolation * remove ecr registry type setting * remove ecr registry type from remaining deploy workflows * Updated help button hover and pop-up text (#2091) * Correct/additional changes to the nothing to transcribe help (#2093) * initial commit prod deploy (#2095) * Update job name and add second ecs service (#2097) * initial commit prod deploy * Correct job step name and add celerybeat and importer ecs service * add apt-get update and dist-install to system package install step for build, test workflows to see if it's enough to resolve the exit code 100. (#2098) * fix command permissions (#2099) * add apt-get update and dist-install to system package install step for build, test workflows to see if it's enough to resolve the exit code 100. * fix added command permissions * update remaining workflow install system packages step (#2101) * add apt-get update and dist-install to system package install step for build, test workflows to see if it's enough to resolve the exit code 100. * fix added command permissions * update dev, stage, and feature workflow install system packages step * Add a height of 489px when the screen height is greater than 768px when switching into the vertical transcription layout (#2100) * Explicitly set the height of the viewer column when switching layouts (#2104) * Accessibility changes on the account profile page (#2106) * Removed code that set height in vertical layout (#2107) * CONCD-536 Fix indenting in profile template (#2108) * CONCD-536 Fix indenting in template * CONCD-536 this should do it * CONCD-533 update workflow to run for specific events on specified branches and to ignore changes to an initial list of specific paths (#2109) * update system packages for codeQL workflow (#2110) * Separated sizes for vertical and horizontal layouts (#2112) * Bump cryptography from 41.0.3 to 41.0.4 (#2111) Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.3 to 41.0.4. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](pyca/cryptography@41.0.3...41.0.4) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * capture CloudFormation Template drift prior to stack deletion (#2113) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Josh Stegmaier <[email protected]> Co-authored-by: Jennifer Kuenning <[email protected]> Co-authored-by: joshuastegmaier <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
LibraryOfCongress · Oct 3, 2023 · db6496f · db6496f
1 parent dd0100b
commit db6496f
Show file tree

Hide file tree

Showing 8 changed files with 708 additions and 580 deletions.
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -1,6 +1,19 @@
 name: Lint
 
-on: [push, pull_request]
+on:
+    workflow_dispatch:
+    push:
+        branches: [release]
+        paths-ignore:
+            - docs/**
+            - README.md
+            - .github/**
+    pull_request:
+        branches: [main, 'feature-*']
+        paths-ignore:
+            - docs/**
+            - README.md
+            - .github/**
 
 jobs:
     lint:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,9 @@ jobs:
         steps:
             - name: Install system packages
               run: |
-                  sudo apt-get install -qy libmemcached-dev libz-dev libfreetype6-dev libtiff-dev libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
+                  sudo apt-get update -qy && sudo apt-get dist-upgrade -qy && sudo apt-get install -qy \
+                  libmemcached-dev libz-dev libfreetype6-dev libtiff-dev \
+                  libjpeg-dev libopenjp2-7-dev libwebp-dev zlib1g-dev libpq-dev
 
             - name: Checkout repository
               uses: actions/checkout@v3

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/cloudformation/infrastructure/jenkins-server.yaml b/cloudformation/infrastructure/jenkins-server.yaml
@@ -5,19 +5,19 @@ Resources:
         Type: AWS::EC2::Instance
         Properties:
             ImageId: 'ami-042e8287309f5df03'
-            InstanceType: 't2.large'
+            InstanceType: 't2.xlarge'
             IamInstanceProfile: 'concordia-jenkins-ec2-role'
             BlockDeviceMappings:
                 - DeviceName: /dev/sda1
                   Ebs:
                       VolumeSize: 128
-                      VolumeType: gp2
+                      VolumeType: gp3
                       DeleteOnTermination: true
             NetworkInterfaces:
                 - AssociatePublicIpAddress: true
                   DeviceIndex: '0'
                   GroupSet:
-                      - 'sg-f7985fb9'
+                      - 'sg-02ff28781d04fd191'
                   SubnetId: 'subnet-3748107d'
             UserData:
                 Fn::Base64: !Sub |

diff --git a/concordia/static/scss/base.scss b/concordia/static/scss/base.scss
@@ -1165,9 +1165,12 @@ input.duet-date__input {
     border-radius: 0;
 }
 
-table.table thead.border-y th {
-    border-bottom: 1px solid #000;
-    border-top: 1px solid #000;
+table.table thead.border-y {
+    th,
+    td {
+        border-bottom: 1px solid #000;
+        border-top: 1px solid #000;
+    }
 }
 
 #current-filters {

diff --git a/concordia/templates/account/profile.html b/concordia/templates/account/profile.html
diff --git a/concordia/templates/fragments/recent-pages.html b/concordia/templates/fragments/recent-pages.html
@@ -10,9 +10,11 @@ <h2>Recent Pages Worked On</h2>
         <span class="font-weight-bold mr-1">Date: </span>Select Range
     </div>
     <div class="d-flex flex-row pb-1">
-        <duet-date-picker name="start"></duet-date-picker>
+        <label for="id_start"><span class="visually-hidden">Start</span></label>
+        <duet-date-picker name="start" identifier="id_start"></duet-date-picker>
         <div class="p-2">to</div>
-        <duet-date-picker name="end"></duet-date-picker>
+        <label for="id_end"><span class="visually-hidden">End</span></label>
+        <duet-date-picker name="end" identifier="id_end"></duet-date-picker>
         <button type="submit" class="btn btn-primary rounded-0 p-2">Go</button>
     </div>
     <div class="d-flex flex-row pt-1">

diff --git a/concordia/templates/transcriptions/asset_detail.html b/concordia/templates/transcriptions/asset_detail.html
@@ -861,13 +861,23 @@ <h5 class="modal-title">Are you sure?</h5>
         let editorColumn = document.getElementById("editor-column");
         let helpContainer = document.getElementById("help-container");
         let layoutColumns = ["#viewer-column", "#editor-column"];
+        let verticalKey = 'transcription-split-sizes-vertical';
+        let horizontalKey = 'transcription-split-sizes-horizontal';
 
-        let sizes = localStorage.getItem('transcription-split-sizes');
+        let sizesVertical = localStorage.getItem(verticalKey);
 
-        if (sizes) {
-            sizes = JSON.parse(sizes);
+        if (sizesVertical) {
+            sizesVertical = JSON.parse(sizesVertical);
         } else {
-            sizes = [50, 50]; // default sizes
+            sizesVertical = [50, 50];
+        }
+
+        let sizesHorizontal = localStorage.getItem(horizontalKey);
+
+        if (sizesHorizontal) {
+            sizesHorizontal = JSON.parse(sizesHorizontal);
+        } else {
+            sizesHorizontal = [50, 50];
         }
 
         let splitDirection = localStorage.getItem("transcription-split-direction");
@@ -879,7 +889,15 @@ <h5 class="modal-title">Are you sure?</h5>
         }
 
         function saveSizes(sizes){
-            localStorage.setItem('transcription-split-sizes', JSON.stringify(sizes));
+            let sizeKey;
+            if(splitDirection == "h"){
+                sizeKey = horizontalKey;
+                sizesHorizontal = sizes;
+            } else {
+                sizeKey = verticalKey;
+                sizesVertical = sizes;
+            }
+            localStorage.setItem(sizeKey, JSON.stringify(sizes));
         }
 
         function saveDirection(direction){
@@ -905,7 +923,7 @@ <h5 class="modal-title">Are you sure?</h5>
             }
 
             return Split(layoutColumns, {
-                sizes: sizes,
+                sizes: sizesVertical,
                 minSize: 100,
                 gutterSize: 8,
                 direction: 'vertical',
@@ -931,7 +949,7 @@ <h5 class="modal-title">Are you sure?</h5>
                 helpContainer.prepend(ocrSection);
             }
             return Split(layoutColumns, {
-                sizes: sizes,
+                sizes: sizesHorizontal,
                 minSize: 100,
                 gutterSize: 8,
                 elementStyle: function(dimension, size, gutterSize) {
@@ -979,7 +997,6 @@ <h5 class="modal-title">Are you sure?</h5>
 
         if (splitDirection == "v") {
             pageSplit = verticalSplit();
-            setTimeout(setVerticalLayoutHeight, 10);
         } else {
             pageSplit = horizontalSplit();
         }