Merge branch 'main' into production

MESH-Research · Dec 3, 2024 · 3ab69d9 · 3ab69d9
2 parents c4939d1 + df7604b
commit 3ab69d9
Show file tree

Hide file tree

Showing 45 changed files with 560 additions and 28,449 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -108,7 +108,17 @@ jobs:
       #     path: /var/lib/docker/
       #     key: local-docker-directory
 
-      - name: Build Image
+      - name: Build AMD Image for production or main
+        if: env.RELEASE_VERSION == 'production' || env.RELEASE_VERSION == 'latest'
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        run: |
+          docker build . --file Dockerfile --platform=linux/amd64 --tag $DOCKERHUB_REGISTRY/$DOCKERHUB_USERNAME/$IMAGE_NAME:$RELEASE_VERSION --tag $GITHUB_REGISTRY/$DOCKERHUB_USERNAME/$IMAGE_NAME:$RELEASE_VERSION --tag $ECR_REGISTRY/kcworks:$RELEASE_VERSION
+          docker image ls
+
+      - name: Build AMD Image for staging
+        if: env.RELEASE_VERSION == 'staging'
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
@@ -122,7 +132,7 @@ jobs:
         run: |
           docker push $DOCKERHUB_REGISTRY/$DOCKERHUB_USERNAME/$IMAGE_NAME --all-tags
 
-      - name: Push image to Amazon ECR
+      - name: Push production or staging image to Amazon ECR
         if: env.RELEASE_VERSION == 'production' || env.RELEASE_VERSION == 'staging'
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}

diff --git a/.gitignore b/.gitignore
@@ -86,9 +86,15 @@ logs/*
 **/logs/*
 **/test_logs/*
 nohup.out
+record_importer_created_records.jsonl
+record_importer_failed_records.jsonl
+record_importer_touched_records.jsonl
 record_importer_created_records*.jsonl
+record_importer_created_records.jsonl
 record_importer_failed_records*.jsonl
+record_importer_failed_records.jsonl
 record_importer_touched_records*.jsonl
+record_importer_touched_records.jsonl
 
 # auto-symlinked during build process
 site/kcworks/assets/semantic-ui/less/site/globals/site.variables

diff --git a/assets/js/invenio_app_rdm/overridableRegistry/requests/search/RequestsSearchLayout.js b/assets/js/invenio_app_rdm/overridableRegistry/requests/search/RequestsSearchLayout.js
@@ -68,7 +68,7 @@ export const RequestsSearchLayout = ({ config, appName }) => {
             width={4}
             open={sidebarVisible}
             onHideClick={() => setSidebarVisible(false)}
-            className="widescreen large monitor only"
+            className="widescreen large-monitor only"
           >
             <SearchAppFacets aggs={config.aggs} appName={appName} />
           </GridResponsiveSidebarColumn>

diff --git a/assets/js/invenio_app_rdm/overridableRegistry/search/ResultOptions.jsx b/assets/js/invenio_app_rdm/overridableRegistry/search/ResultOptions.jsx
@@ -133,7 +133,7 @@ const ResultOptions = ({
             label={(cmp) => (
               <>
                 {cmp}{" "}
-                <span className="tablet computer widescreen large monitor only">
+                <span className="tablet computer widescreen large-monitor only">
                   &nbsp;works{" "}
                 </span>
                 found

diff --git a/assets/less/site/collections/form.overrides b/assets/less/site/collections/form.overrides
@@ -459,9 +459,6 @@ textarea {
             .ui.message {
               display: flex;
               align-items: center;
-              .info.icon {
-                font-size: @huge;
-              }
               p {
                 margin: 0;
               }
@@ -496,9 +493,19 @@ textarea {
             align-items: center;
             > .field:first-child > .grid {
               align-items: center;
+              margin-right: 1rem;
+              overflow-x: auto;
+              max-height: 10rem;
               .ui-small-header {
                 margin-top: 0;
               }
+              .community-header-logo {
+                width: 2.5rem;
+                height: 2.5rem;
+                max-width: 2.5rem;
+                max-height: 2.5rem;
+                object-fit: cover;
+              }
             }
           }
         }

diff --git a/assets/less/site/collections/grid.overrides b/assets/less/site/collections/grid.overrides
@@ -226,8 +226,15 @@
           padding-right: 1rem;
           margin-bottom: 0;
         }
-    }
-      .row:not(.default-community):not(.additional-communities) {
+      }
+      .row.manage-communities {
+        background-color: transparent !important;
+        padding: 0;
+        border: none !important;
+      }
+      .row:not(.default-community):not(.additional-communities):not(
+          .manage-communities
+        ) {
         padding: 0.5rem 1rem 0.5rem 0;
         font-size: 1rem;
         background-color: transparent;
@@ -247,11 +254,21 @@
           border-radius: @defaultBorderRadius @defaultBorderRadius;
           border-bottom: 1px solid @sidebarBorderColor;
         }
+        & + .row.manage-communities {
+          .ui.button {
+            border-top: none !important;
+            border-radius: 0 0 @defaultBorderRadius @defaultBorderRadius;
+            &:hover,
+            &:active,
+            &:focus {
+              border-top: 1px solid @mint;
+            }
+          }
+        }
       }
       .row.additional-communities {
         background-color: @sidebarBackgroundColor;
-        padding: 0.5rem;
-        padding-left: 1rem;
+        padding: 0;
         border: 1px solid @sidebarBorderColor;
         border-top: none;
         border-radius: 0 0 @defaultBorderRadius @defaultBorderRadius;
@@ -262,6 +279,28 @@
           border-top: 1px solid @sidebarBorderColor;
           justify-content: flex-end;
         }
+        .button {
+          width: 100%;
+          text-align: left;
+          border: none !important;
+          box-shadow: none !important;
+          padding-left: 1rem;
+          margin: 0;
+        }
+        & + .row.manage-communities {
+          .ui.button {
+            border-top: none !important;
+            border-radius: 0 0 @defaultBorderRadius @defaultBorderRadius;
+            &:hover,
+            &:active,
+            &:focus {
+              border-top: 1px solid @mint;
+            }
+          }
+        }
+        &:has(+ .row.manage-communities) {
+          border-radius: 0 0 0 0 !important;
+        }
       }
     }
   }

diff --git a/assets/less/site/collections/menu.overrides b/assets/less/site/collections/menu.overrides
@@ -49,6 +49,11 @@
         @media screen and (max-width: @largestTabletScreen) {
           padding: 0;
         }
+        &:hover,
+        &:focus,
+        &:active {
+          z-index: 100;
+        }
         & > span {
           padding-left: 1.5rem;
           padding-right: 1.5rem;
@@ -60,10 +65,10 @@
           border-color: @sidebarBorderColor;
           height: 1px;
           color: @sidebarBorderColor;
-          &::before{
+          &::before {
             content: none;
           }
-          &::after{
+          &::after {
             content: none;
           }
         }
@@ -136,6 +141,7 @@
             &:focus,
             &:active {
               background-color: @mint60 !important;
+              z-index: 100;
             }
           }
           a,
@@ -244,6 +250,7 @@
   }
 }
 
+
 .communities-settings,
 .communities-members {
   .ui.vertical.menu {
@@ -271,3 +278,63 @@
     }
   }
 }
+
+
+// detail page mobile menu
+
+.ui.menu.sticky.bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    justify-content: center;
+    background-color: transparent;
+    .item {
+      background-color: rgba(0, 0, 0, 0.8);
+      backdrop-filter: blur(2px);
+      border-top: 2px solid @white;
+      &:hover,
+      &:focus,
+      &:active {
+        background-color: #333;
+        z-index: 100;
+      }
+      &.active {
+        background-color: rgba(0, 0, 0, 1);
+      }
+      &:first-child {
+        border-radius: @defaultBorderRadius 0 0 0;
+        border-left: 2px solid @white;
+      }
+      &:last-child {
+        border-radius: 0 @defaultBorderRadius 0 0;
+        border-right: 2px solid @white;
+      }
+      &#record-details-export.ui.dropdown {
+        .menu {
+          left: -75%;
+        }
+      }
+      &#record-details-download.ui.dropdown {
+        .menu {
+          left: -250%;
+          .description.filesize {
+            display: block;
+            float: none;
+            margin-left: 0;
+            margin-top: 0.5rem;
+          }
+          &::after {
+            left: 81%;
+          }
+        }
+      }
+      &.ui.dropdown {
+        .menu {
+          left: -200%;
+          backdrop-filter: none;
+          font-size: @medium;
+        }
+      }
+    }
+  }
diff --git a/assets/less/site/collections/message.overrides b/assets/less/site/collections/message.overrides
@@ -4,6 +4,10 @@
   color: @verdigrisDark;
   box-shadow: none;
 
+  p {
+    flex-grow: 1;
+  }
+
   &.negative,
   &.file-box-message {
     border: 1px solid @negativeBorderColor;
@@ -54,6 +58,9 @@
 
 .file-upload-note {
   .ui.message {
+    .info.icon {
+      margin-top: 0.2rem;
+    }
     .header {
       font-size: 1rem;
       margin: 0;
@@ -64,11 +71,21 @@
 
 .ui.message.file-type-message {
   align-items: flex-start;  // Aligns the icon to the top of the accordion
-  .icon {
+  .large.icon {
     color: @infoColor;
-    margin-top: 0.2rem;
-    &.dropdown {
-      color: @infoTextColor;
-    }
+    margin-right: 1.5rem;
+    font-size: 1.5rem !important;
+    position: relative;
+    left: 1px;
   }
-}
+}
+
+.file-uploader-container > .column > .column:first-child {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  & + .info.message {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top: none;
+  }
+}