Merge branch 'master' into documentation-augmentation

Author: todvora

changelog/unreleased/issue-24370.toml

@@ -0,0 +1,5 @@
+type = "f"
+message = "Make modal footer sticky to always show modal action buttons."
+
+pulls = ["24303"]
+issues = ["24370"]

graylog2-server/src/main/java/org/graylog2/migrations/V202406260800_MigrateCertificateAuthority.java

@@ -64,6 +64,7 @@ public void upgrade() {
         }
         readExistingKeystore().ifPresent(keystore -> clusterConfigService.write(new EncryptedCaKeystore(keystore)));
         mongoConnection.getMongoDatabase().getCollection(LEGACY_COLLECTION_NAME).drop();
+        clusterConfigService.write(new V202406260800_MigrateCertificateAuthority.MigrationCompleted());
     }
 
     public Optional<EncryptedValue> readExistingKeystore() {

graylog2-server/src/test/java/org/graylog2/migrations/V202406260800_MigrateCertificateAuthorityTest.java

@@ -60,5 +60,7 @@ void testMigration(MongoCollections mongoCollections) {
 
         final Set<String> existingCollections = mongoConnection.getMongoDatabase().listCollectionNames().into(new HashSet<>());
         Assertions.assertThat(existingCollections).doesNotContain(V202406260800_MigrateCertificateAuthority.LEGACY_COLLECTION_NAME);
+
+        Mockito.verify(clusterConfigService, Mockito.times(1)).write(Mockito.any(V202406260800_MigrateCertificateAuthority.MigrationCompleted.class));
     }
 }

graylog2-web-interface/src/components/bootstrap/Modal.tsx

@@ -33,6 +33,15 @@ const ModalContent = styled(MantineModal.Content)`
   border-radius: 10px;
 `;
 
+const StyledModalFooter = styled(MantineModal.Body)(
+  ({ theme }) => css`
+    position: sticky;
+    bottom: 0;
+    background-color: ${theme.colors.global.contentBackground};
+    padding: ${theme.spacings.md};
+  `,
+);
+
 const StyledModalRoot = styled(MantineModal.Root)<{ $scrollInContent: boolean }>(
   ({ theme, $scrollInContent }) => css`
     --mantine-color-body: ${theme.colors.global.contentBackground};
@@ -115,6 +124,6 @@ Modal.Title = styled(MantineModal.Title)`
 `;
 
 Modal.Body = MantineModal.Body;
-Modal.Footer = MantineModal.Body;
+Modal.Footer = StyledModalFooter;
 
 export default Modal;