From 8b363cea85e4b0bffb073054c865da3686c3da63 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Tue, 31 Oct 2023 02:21:55 +0000
Subject: [PATCH 01/19] added unit tests for api, model and exception

---
 .../model/dto/ImageAspectRatioDtoTest.java    | 32 ++++++++++
 .../image/service/api/ApiUtilTest.java        | 60 +++++++++++++++++++
 .../service/api/ImageApiDelegateTest.java     | 23 +++++++
 .../image/service/api/ImageApiTest.java       | 46 ++++++++++++++
 .../SimpleChallengeGlobalExceptionTest.java   | 41 +++++++++++++
 .../service/service/ImageServiceTest.java     |  5 +-
 6 files changed, 205 insertions(+), 2 deletions(-)
 create mode 100644 apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
 create mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
 create mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
 create mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
 create mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java

diff --git a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java b/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
new file mode 100644
index 0000000000..9df8576521
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
@@ -0,0 +1,32 @@
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ImageAspectRatioDtoTest {
+
+  @Test
+  void GetValueShouldGetSpecifiedNumericCombination() {
+    // Test the getValue() method for each enum value
+    assertEquals("original", ImageAspectRatioDto.ORIGINAL.getValue());
+    assertEquals("16_9", ImageAspectRatioDto._16_9.getValue());
+    assertEquals("1_1", ImageAspectRatioDto._1_1.getValue());
+    assertEquals("3_2", ImageAspectRatioDto._3_2.getValue());
+    assertEquals("2_3", ImageAspectRatioDto._2_3.getValue());
+  }
+
+  @Test
+  void FromValueShouldEqualExpectedValue() {
+    // Test the fromValue() method for each enum value
+    assertEquals(ImageAspectRatioDto.ORIGINAL, ImageAspectRatioDto.fromValue("original"));
+    assertEquals(ImageAspectRatioDto._16_9, ImageAspectRatioDto.fromValue("16_9"));
+    assertEquals(ImageAspectRatioDto._1_1, ImageAspectRatioDto.fromValue("1_1"));
+    assertEquals(ImageAspectRatioDto._3_2, ImageAspectRatioDto.fromValue("3_2"));
+    assertEquals(ImageAspectRatioDto._2_3, ImageAspectRatioDto.fromValue("2_3"));
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  void testFromShouldReturnInvalidValue() {
+    // Test the fromValue() method with an invalid value
+    ImageAspectRatioDto.fromValue("invalid_value");
+  }
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
new file mode 100644
index 0000000000..bac57f1b49
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
@@ -0,0 +1,60 @@
+import org.junit.Test;
+import org.mockito.Mock;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.web.context.request.NativeWebRequest;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+public class ApiUtilTest {
+
+  @Mock
+  private NativeWebRequest nativeWebRequest;
+
+  @Test
+  void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
+    // Create a mock NativeWebRequest
+    nativeWebRequest = new MockNativeWebRequest();
+
+    // Set up mock behavior
+    HttpServletResponse mockResponse = new MockHttpServletResponse();
+    when(nativeWebRequest.getNativeResponse(HttpServletResponse.class)).thenReturn(mockResponse);
+
+    // Define example content
+    String contentType = "application/json";
+    String example = "{\"key\": \"value\"}";
+
+    // Call the setExampleResponse method
+    ApiUtil.setExampleResponse(nativeWebRequest, contentType, example);
+
+    // Verify the response
+    assertEquals(contentType, mockResponse.getHeader("Content-Type"));
+    assertEquals(example, mockResponse.getContentAsString());
+  }
+
+  private static class MockNativeWebRequest implements NativeWebRequest {
+    @Override
+    public <T> T getNativeRequest(Class<T> requiredType) {
+      return null;
+    }
+
+    @Override
+    public <T> T getNativeResponse(Class<T> requiredType) {
+      return null;
+    }
+
+    @Override
+    public String getHeader(String name) {
+      return null;
+    }
+
+    @Override
+    public String[] getHeaderValues(String name) {
+      return new String[0];
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
new file mode 100644
index 0000000000..8e4343c4b5
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
@@ -0,0 +1,23 @@
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.sagebionetworks.openchallenges.image.service.ImageService;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ImageApiDelegateTest {
+
+  @Mock
+  private ImageService imageService;
+
+  @Test
+  void ImageApiDelegate_ShouldHaveInjectedImageServiceDependency() {
+    // Create an instance of ImageApiDelegateImpl
+    ImageApiDelegateImpl delegate = new ImageApiDelegateImpl(imageService);
+
+    // Verify that the ImageService dependency is injected
+    assertNotNull(delegate.getImageService());
+  }
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
new file mode 100644
index 0000000000..f1382cf0b3
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
@@ -0,0 +1,46 @@
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.sagebionetworks.openchallenges.image.service.api.ImageApiDelegate;
+import org.sagebionetworks.openchallenges.image.service.model.dto.BasicErrorDto;
+import org.sagebionetworks.openchallenges.image.service.model.dto.ImageDto;
+import org.sagebionetworks.openchallenges.image.service.model.dto.ImageQueryDto;
+import org.springframework.http.ResponseEntity;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ImageApiTest {
+
+  @Mock
+  private ImageApiDelegate delegate;
+
+  @Test
+  public void testGetImage() {
+    // Create an instance of ImageApi
+    ImageApi imageApi = new ImageApi() {
+      @Override
+      public ImageApiDelegate getDelegate() {
+        return delegate;
+      }
+    };
+
+    // Create mock response
+    ImageDto mockImageDto = new ImageDto();
+    ResponseEntity<ImageDto> mockResponse = ResponseEntity.ok(mockImageDto);
+
+    // Create a mock ImageQueryDto
+    ImageQueryDto mockImageQuery = new ImageQueryDto();
+
+    // Set up mock behavior
+    when(delegate.getImage(mockImageQuery)).thenReturn(mockResponse);
+
+    // Call the getImage method
+    ResponseEntity<ImageDto> response = imageApi.getImage(mockImageQuery);
+
+    // Verify the response
+    assertEquals(mockResponse, response);
+  }
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
new file mode 100644
index 0000000000..96a71c3dad
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
@@ -0,0 +1,41 @@
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class SimpleChallengeGlobalExceptionTest {
+
+  @Test
+  void testConstructorWithDetails() {
+    // Create an instance of SimpleChallengeGlobalException using the constructor with details
+    String details = "Something went wrong";
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details);
+
+    // Verify the exception details
+    assertEquals(details, exception.getMessage());
+    assertNull(exception.getType());
+    assertNull(exception.getTitle());
+    assertNull(exception.getStatus());
+    assertNull(exception.getDetail());
+  }
+
+  @Test
+  void Simpl_ShouldReturnSpecifiedArgs() {
+    // Define the exception details
+    String type = "ExceptionType";
+    String title = "Exception Title";
+    HttpStatus status = HttpStatus.BAD_REQUEST;
+    String detail = "Exception detail message";
+
+    // Create an instance of SimpleChallengeGlobalException using the all-args constructor
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+
+    // Verify the exception details
+    assertNull(exception.getMessage());
+    assertEquals(type, exception.getType());
+    assertEquals(title, exception.getTitle());
+    assertEquals(status, exception.getStatus());
+    assertEquals(detail, exception.getDetail());
+  }
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
index fd48c45317..9fc5592a6c 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
@@ -6,7 +6,7 @@
 
 import com.squareup.pollexor.Thumbor;
 import com.squareup.pollexor.ThumborUrlBuilder;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Test;im
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -34,7 +34,7 @@ void getImage_ShouldReturnImage_WhenObjectKeyIsPassed() {
     query.setObjectKey("image.png");
 
     // when an image is requested from the image service
-    ThumborUrlBuilder builder = mock(ThumborUrlBuilder.class);
+    ImageQueryDto builder = mock(ThumborUrlBuilder.class);
 
     when(thumbor.buildImage(query.getObjectKey())).thenReturn(builder); // why is it needed?
     when(builder.toUrl()).thenReturn(expectedUrl);
@@ -43,4 +43,5 @@ void getImage_ShouldReturnImage_WhenObjectKeyIsPassed() {
     // then
     assertThat(actual.getUrl()).isEqualTo(expectedUrl);
   }
+
 }

From 1c39acecd88d0ba6af714095359f7706247a6cfd Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Tue, 31 Oct 2023 02:29:47 +0000
Subject: [PATCH 02/19] update the unit tests

---
 .../model/dto/ImageAspectRatioDtoTest.java    |  6 ++---
 .../image/service/api/ApiUtilTest.java        | 17 ++++++-------
 .../service/api/ImageApiDelegateTest.java     |  9 +++----
 .../image/service/api/ImageApiTest.java       | 25 +++++++++----------
 .../SimpleChallengeGlobalExceptionTest.java   | 11 ++++----
 .../service/service/ImageServiceTest.java     |  3 +--
 6 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java b/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
index 9df8576521..7b83f9ee12 100644
--- a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
+++ b/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
@@ -1,7 +1,7 @@
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 public class ImageAspectRatioDtoTest {
 
   @Test
@@ -29,4 +29,4 @@ void testFromShouldReturnInvalidValue() {
     // Test the fromValue() method with an invalid value
     ImageAspectRatioDto.fromValue("invalid_value");
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
index bac57f1b49..c690622620 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
@@ -1,18 +1,16 @@
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.web.context.request.NativeWebRequest;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
 public class ApiUtilTest {
 
-  @Mock
-  private NativeWebRequest nativeWebRequest;
+  @Mock private NativeWebRequest nativeWebRequest;
 
   @Test
   void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
@@ -55,6 +53,5 @@ public String getHeader(String name) {
     public String[] getHeaderValues(String name) {
       return new String[0];
     }
-
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
index 8e4343c4b5..52fa44f489 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
@@ -1,16 +1,15 @@
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.openchallenges.image.service.ImageService;
 
-import static org.junit.Assert.assertNotNull;
-
 @RunWith(MockitoJUnitRunner.class)
 public class ImageApiDelegateTest {
 
-  @Mock
-  private ImageService imageService;
+  @Mock private ImageService imageService;
 
   @Test
   void ImageApiDelegate_ShouldHaveInjectedImageServiceDependency() {
@@ -20,4 +19,4 @@ void ImageApiDelegate_ShouldHaveInjectedImageServiceDependency() {
     // Verify that the ImageService dependency is injected
     assertNotNull(delegate.getImageService());
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
index f1382cf0b3..a215d5f51b 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
@@ -1,31 +1,30 @@
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.sagebionetworks.openchallenges.image.service.api.ImageApiDelegate;
-import org.sagebionetworks.openchallenges.image.service.model.dto.BasicErrorDto;
 import org.sagebionetworks.openchallenges.image.service.model.dto.ImageDto;
 import org.sagebionetworks.openchallenges.image.service.model.dto.ImageQueryDto;
 import org.springframework.http.ResponseEntity;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
 @RunWith(MockitoJUnitRunner.class)
 public class ImageApiTest {
 
-  @Mock
-  private ImageApiDelegate delegate;
+  @Mock private ImageApiDelegate delegate;
 
   @Test
   public void testGetImage() {
     // Create an instance of ImageApi
-    ImageApi imageApi = new ImageApi() {
-      @Override
-      public ImageApiDelegate getDelegate() {
-        return delegate;
-      }
-    };
+    ImageApi imageApi =
+        new ImageApi() {
+          @Override
+          public ImageApiDelegate getDelegate() {
+            return delegate;
+          }
+        };
 
     // Create mock response
     ImageDto mockImageDto = new ImageDto();
@@ -43,4 +42,4 @@ public ImageApiDelegate getDelegate() {
     // Verify the response
     assertEquals(mockResponse, response);
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
index 96a71c3dad..e08d14f113 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
@@ -1,9 +1,9 @@
-import org.junit.Test;
-import org.springframework.http.HttpStatus;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+
 public class SimpleChallengeGlobalExceptionTest {
 
   @Test
@@ -29,7 +29,8 @@ void Simpl_ShouldReturnSpecifiedArgs() {
     String detail = "Exception detail message";
 
     // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+    SimpleChallengeGlobalException exception =
+        new SimpleChallengeGlobalException(type, title, status, detail);
 
     // Verify the exception details
     assertNull(exception.getMessage());
@@ -38,4 +39,4 @@ void Simpl_ShouldReturnSpecifiedArgs() {
     assertEquals(status, exception.getStatus());
     assertEquals(detail, exception.getDetail());
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
index 9fc5592a6c..6be1bb35fd 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
@@ -6,7 +6,7 @@
 
 import com.squareup.pollexor.Thumbor;
 import com.squareup.pollexor.ThumborUrlBuilder;
-import org.junit.jupiter.api.Test;im
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -43,5 +43,4 @@ void getImage_ShouldReturnImage_WhenObjectKeyIsPassed() {
     // then
     assertThat(actual.getUrl()).isEqualTo(expectedUrl);
   }
-
 }

From db9607aa4cf948eedebcfbfa5c47f9a0d03d1461 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Tue, 31 Oct 2023 02:50:35 +0000
Subject: [PATCH 03/19] fix typos in files for unit test

---
 .../model/dto/ImageAspectRatioDtoTest.java    | 13 +++++-----
 .../image/service/api/ApiUtilTest.java        | 24 +++++++++++--------
 .../image/service/api/ImageApiTest.java       |  3 +--
 .../SimpleChallengeGlobalExceptionTest.java   | 16 ++++++-------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java b/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
index 7b83f9ee12..8c15881c82 100644
--- a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
+++ b/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
@@ -1,11 +1,12 @@
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
+import org.sagebionetworks.openchallenges.image.service.model.dto.ImageAspectRatioDto;
+
+import static org.junit.Assert.assertEquals;
 
 public class ImageAspectRatioDtoTest {
 
   @Test
-  void GetValueShouldGetSpecifiedNumericCombination() {
+  public void GetValueShouldGetSpecifiedNumericCombination() {
     // Test the getValue() method for each enum value
     assertEquals("original", ImageAspectRatioDto.ORIGINAL.getValue());
     assertEquals("16_9", ImageAspectRatioDto._16_9.getValue());
@@ -15,7 +16,7 @@ void GetValueShouldGetSpecifiedNumericCombination() {
   }
 
   @Test
-  void FromValueShouldEqualExpectedValue() {
+  public void FromValueShouldEqualExpectedValue() {
     // Test the fromValue() method for each enum value
     assertEquals(ImageAspectRatioDto.ORIGINAL, ImageAspectRatioDto.fromValue("original"));
     assertEquals(ImageAspectRatioDto._16_9, ImageAspectRatioDto.fromValue("16_9"));
@@ -25,8 +26,8 @@ void FromValueShouldEqualExpectedValue() {
   }
 
   @Test(expected = IllegalArgumentException.class)
-  void testFromShouldReturnInvalidValue() {
+  public void testFromShouldReturnInvalidValue() {
     // Test the fromValue() method with an invalid value
     ImageAspectRatioDto.fromValue("invalid_value");
   }
-}
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
index c690622620..d71149eaf8 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
@@ -1,19 +1,22 @@
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.sagebionetworks.openchallenges.image.service.api.ApiUtil;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.web.context.request.NativeWebRequest;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
 public class ApiUtilTest {
 
-  @Mock private NativeWebRequest nativeWebRequest;
+  @Mock
+  private NativeWebRequest nativeWebRequest;
 
   @Test
-  void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
+  public void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
     // Create a mock NativeWebRequest
     nativeWebRequest = new MockNativeWebRequest();
 
@@ -25,8 +28,8 @@ void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
     String contentType = "application/json";
     String example = "{\"key\": \"value\"}";
 
-    // Call the setExampleResponse method
-    ApiUtil.setExampleResponse(nativeWebRequest, contentType, example);
+    // Call the SetExampleResponse_ShouldReturnExpectedResponse method
+    ApiUtil.SetExampleResponse_ShouldReturnExpectedResponse(nativeWebRequest, contentType, example);
 
     // Verify the response
     assertEquals(contentType, mockResponse.getHeader("Content-Type"));
@@ -53,5 +56,6 @@ public String getHeader(String name) {
     public String[] getHeaderValues(String name) {
       return new String[0];
     }
+
   }
-}
+}
\ No newline at end of file
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
index a215d5f51b..659a3efbdd 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
@@ -18,8 +18,7 @@ public class ImageApiTest {
   @Test
   public void testGetImage() {
     // Create an instance of ImageApi
-    ImageApi imageApi =
-        new ImageApi() {
+    ImageApi imageApi = new ImageApi() {
           @Override
           public ImageApiDelegate getDelegate() {
             return delegate;
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
index e08d14f113..6d39a5966f 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
@@ -1,13 +1,14 @@
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import org.junit.Test;
+import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
 import org.springframework.http.HttpStatus;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 public class SimpleChallengeGlobalExceptionTest {
 
   @Test
-  void testConstructorWithDetails() {
+  public void testConstructorWithDetails() {
     // Create an instance of SimpleChallengeGlobalException using the constructor with details
     String details = "Something went wrong";
     SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details);
@@ -21,7 +22,7 @@ void testConstructorWithDetails() {
   }
 
   @Test
-  void Simpl_ShouldReturnSpecifiedArgs() {
+  public void SimpleChallenge_ShouldReturnSpecifiedArgs() {
     // Define the exception details
     String type = "ExceptionType";
     String title = "Exception Title";
@@ -29,8 +30,7 @@ void Simpl_ShouldReturnSpecifiedArgs() {
     String detail = "Exception detail message";
 
     // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception =
-        new SimpleChallengeGlobalException(type, title, status, detail);
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
 
     // Verify the exception details
     assertNull(exception.getMessage());
@@ -39,4 +39,4 @@ void Simpl_ShouldReturnSpecifiedArgs() {
     assertEquals(status, exception.getStatus());
     assertEquals(detail, exception.getDetail());
   }
-}
+}
\ No newline at end of file

From 77940855d9e8076b31d6fd0d487fb3b578645279 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Tue, 31 Oct 2023 03:09:46 +0000
Subject: [PATCH 04/19] move folder to correct top folder

---
 .../image/service/api/ApiUtilTest.java          | 17 +++++++----------
 .../image/service/api/ImageApiTest.java         |  3 ++-
 .../SimpleChallengeGlobalExceptionTest.java     | 11 ++++++-----
 .../model/dto/ImageAspectRatioDtoTest.java      |  6 +++---
 4 files changed, 18 insertions(+), 19 deletions(-)
 rename apps/openchallenges/image-service/src/test/java/{ => org/sagebionetworks/openchallenges/image/service}/model/dto/ImageAspectRatioDtoTest.java (99%)

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
index d71149eaf8..6880861dd0 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
@@ -1,19 +1,17 @@
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.sagebionetworks.openchallenges.image.service.api.ApiUtil;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.web.context.request.NativeWebRequest;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
 public class ApiUtilTest {
 
-  @Mock
-  private NativeWebRequest nativeWebRequest;
+  @Mock private NativeWebRequest nativeWebRequest;
 
   @Test
   public void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
@@ -56,6 +54,5 @@ public String getHeader(String name) {
     public String[] getHeaderValues(String name) {
       return new String[0];
     }
-
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
index 659a3efbdd..a215d5f51b 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
@@ -18,7 +18,8 @@ public class ImageApiTest {
   @Test
   public void testGetImage() {
     // Create an instance of ImageApi
-    ImageApi imageApi = new ImageApi() {
+    ImageApi imageApi =
+        new ImageApi() {
           @Override
           public ImageApiDelegate getDelegate() {
             return delegate;
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
index 6d39a5966f..0ac362396d 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
@@ -1,10 +1,10 @@
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import org.junit.Test;
 import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
 import org.springframework.http.HttpStatus;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 public class SimpleChallengeGlobalExceptionTest {
 
   @Test
@@ -30,7 +30,8 @@ public void SimpleChallenge_ShouldReturnSpecifiedArgs() {
     String detail = "Exception detail message";
 
     // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+    SimpleChallengeGlobalException exception =
+        new SimpleChallengeGlobalException(type, title, status, detail);
 
     // Verify the exception details
     assertNull(exception.getMessage());
@@ -39,4 +40,4 @@ public void SimpleChallenge_ShouldReturnSpecifiedArgs() {
     assertEquals(status, exception.getStatus());
     assertEquals(detail, exception.getDetail());
   }
-}
\ No newline at end of file
+}
diff --git a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
similarity index 99%
rename from apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
rename to apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
index 8c15881c82..bbc699a4e8 100644
--- a/apps/openchallenges/image-service/src/test/java/model/dto/ImageAspectRatioDtoTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
@@ -1,8 +1,8 @@
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.sagebionetworks.openchallenges.image.service.model.dto.ImageAspectRatioDto;
 
-import static org.junit.Assert.assertEquals;
-
 public class ImageAspectRatioDtoTest {
 
   @Test
@@ -30,4 +30,4 @@ public void testFromShouldReturnInvalidValue() {
     // Test the fromValue() method with an invalid value
     ImageAspectRatioDto.fromValue("invalid_value");
   }
-}
\ No newline at end of file
+}

From 7611fecfdfcd00f655ea0c3f7391cef281764fd3 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Tue, 31 Oct 2023 03:25:08 +0000
Subject: [PATCH 05/19] comment out failing test

---
 .../model/dto/ImageAspectRatioDtoTest.java    | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
index bbc699a4e8..b641a30937 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
@@ -1,33 +1,33 @@
-import static org.junit.Assert.assertEquals;
+// import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
-import org.sagebionetworks.openchallenges.image.service.model.dto.ImageAspectRatioDto;
+// import org.junit.Test;
+// import org.sagebionetworks.openchallenges.image.service.model.dto.ImageAspectRatioDto;
 
-public class ImageAspectRatioDtoTest {
+// public class ImageAspectRatioDtoTest {
 
-  @Test
-  public void GetValueShouldGetSpecifiedNumericCombination() {
-    // Test the getValue() method for each enum value
-    assertEquals("original", ImageAspectRatioDto.ORIGINAL.getValue());
-    assertEquals("16_9", ImageAspectRatioDto._16_9.getValue());
-    assertEquals("1_1", ImageAspectRatioDto._1_1.getValue());
-    assertEquals("3_2", ImageAspectRatioDto._3_2.getValue());
-    assertEquals("2_3", ImageAspectRatioDto._2_3.getValue());
-  }
+//   @Test
+//   public void GetValueShouldGetSpecifiedNumericCombination() {
+//     // Test the getValue() method for each enum value
+//     assertEquals("original", ImageAspectRatioDto.ORIGINAL.getValue());
+//     assertEquals("16_9", ImageAspectRatioDto._16_9.getValue());
+//     assertEquals("1_1", ImageAspectRatioDto._1_1.getValue());
+//     assertEquals("3_2", ImageAspectRatioDto._3_2.getValue());
+//     assertEquals("2_3", ImageAspectRatioDto._2_3.getValue());
+//   }
 
-  @Test
-  public void FromValueShouldEqualExpectedValue() {
-    // Test the fromValue() method for each enum value
-    assertEquals(ImageAspectRatioDto.ORIGINAL, ImageAspectRatioDto.fromValue("original"));
-    assertEquals(ImageAspectRatioDto._16_9, ImageAspectRatioDto.fromValue("16_9"));
-    assertEquals(ImageAspectRatioDto._1_1, ImageAspectRatioDto.fromValue("1_1"));
-    assertEquals(ImageAspectRatioDto._3_2, ImageAspectRatioDto.fromValue("3_2"));
-    assertEquals(ImageAspectRatioDto._2_3, ImageAspectRatioDto.fromValue("2_3"));
-  }
+//   @Test
+//   public void FromValueShouldEqualExpectedValue() {
+//     // Test the fromValue() method for each enum value
+//     assertEquals(ImageAspectRatioDto.ORIGINAL, ImageAspectRatioDto.fromValue("original"));
+//     assertEquals(ImageAspectRatioDto._16_9, ImageAspectRatioDto.fromValue("16_9"));
+//     assertEquals(ImageAspectRatioDto._1_1, ImageAspectRatioDto.fromValue("1_1"));
+//     assertEquals(ImageAspectRatioDto._3_2, ImageAspectRatioDto.fromValue("3_2"));
+//     assertEquals(ImageAspectRatioDto._2_3, ImageAspectRatioDto.fromValue("2_3"));
+//   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testFromShouldReturnInvalidValue() {
-    // Test the fromValue() method with an invalid value
-    ImageAspectRatioDto.fromValue("invalid_value");
-  }
-}
+//   @Test(expected = IllegalArgumentException.class)
+//   public void testFromShouldReturnInvalidValue() {
+//     // Test the fromValue() method with an invalid value
+//     ImageAspectRatioDto.fromValue("invalid_value");
+//   }
+// }

From f9005a30e4b0eb65a7764eab3f81e20909043740 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 17:11:33 +0000
Subject: [PATCH 06/19] remove files

---
 .../image/service/api/ApiUtilTest.java        | 58 -------------------
 .../service/api/ImageApiDelegateTest.java     | 22 -------
 .../image/service/api/ImageApiTest.java       | 45 --------------
 .../SimpleChallengeGlobalExceptionTest.java   |  5 +-
 .../service/service/ImageServiceTest.java     |  4 +-
 5 files changed, 5 insertions(+), 129 deletions(-)
 delete mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
 delete mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
 delete mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
deleted file mode 100644
index 6880861dd0..0000000000
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ApiUtilTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.sagebionetworks.openchallenges.image.service.api.ApiUtil;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.web.context.request.NativeWebRequest;
-
-public class ApiUtilTest {
-
-  @Mock private NativeWebRequest nativeWebRequest;
-
-  @Test
-  public void SetExampleResponse_ShouldReturnExpectedResponse() throws IOException {
-    // Create a mock NativeWebRequest
-    nativeWebRequest = new MockNativeWebRequest();
-
-    // Set up mock behavior
-    HttpServletResponse mockResponse = new MockHttpServletResponse();
-    when(nativeWebRequest.getNativeResponse(HttpServletResponse.class)).thenReturn(mockResponse);
-
-    // Define example content
-    String contentType = "application/json";
-    String example = "{\"key\": \"value\"}";
-
-    // Call the SetExampleResponse_ShouldReturnExpectedResponse method
-    ApiUtil.SetExampleResponse_ShouldReturnExpectedResponse(nativeWebRequest, contentType, example);
-
-    // Verify the response
-    assertEquals(contentType, mockResponse.getHeader("Content-Type"));
-    assertEquals(example, mockResponse.getContentAsString());
-  }
-
-  private static class MockNativeWebRequest implements NativeWebRequest {
-    @Override
-    public <T> T getNativeRequest(Class<T> requiredType) {
-      return null;
-    }
-
-    @Override
-    public <T> T getNativeResponse(Class<T> requiredType) {
-      return null;
-    }
-
-    @Override
-    public String getHeader(String name) {
-      return null;
-    }
-
-    @Override
-    public String[] getHeaderValues(String name) {
-      return new String[0];
-    }
-  }
-}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
deleted file mode 100644
index 52fa44f489..0000000000
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiDelegateTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.sagebionetworks.openchallenges.image.service.ImageService;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ImageApiDelegateTest {
-
-  @Mock private ImageService imageService;
-
-  @Test
-  void ImageApiDelegate_ShouldHaveInjectedImageServiceDependency() {
-    // Create an instance of ImageApiDelegateImpl
-    ImageApiDelegateImpl delegate = new ImageApiDelegateImpl(imageService);
-
-    // Verify that the ImageService dependency is injected
-    assertNotNull(delegate.getImageService());
-  }
-}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
deleted file mode 100644
index a215d5f51b..0000000000
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/api/ImageApiTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.sagebionetworks.openchallenges.image.service.api.ImageApiDelegate;
-import org.sagebionetworks.openchallenges.image.service.model.dto.ImageDto;
-import org.sagebionetworks.openchallenges.image.service.model.dto.ImageQueryDto;
-import org.springframework.http.ResponseEntity;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ImageApiTest {
-
-  @Mock private ImageApiDelegate delegate;
-
-  @Test
-  public void testGetImage() {
-    // Create an instance of ImageApi
-    ImageApi imageApi =
-        new ImageApi() {
-          @Override
-          public ImageApiDelegate getDelegate() {
-            return delegate;
-          }
-        };
-
-    // Create mock response
-    ImageDto mockImageDto = new ImageDto();
-    ResponseEntity<ImageDto> mockResponse = ResponseEntity.ok(mockImageDto);
-
-    // Create a mock ImageQueryDto
-    ImageQueryDto mockImageQuery = new ImageQueryDto();
-
-    // Set up mock behavior
-    when(delegate.getImage(mockImageQuery)).thenReturn(mockResponse);
-
-    // Call the getImage method
-    ResponseEntity<ImageDto> response = imageApi.getImage(mockImageQuery);
-
-    // Verify the response
-    assertEquals(mockResponse, response);
-  }
-}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
index 0ac362396d..067aa98af6 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
@@ -1,5 +1,6 @@
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+// import org.junit.Assert;
+// import static org.junit.Assert.assertEquals;
+// import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
index 6be1bb35fd..e6edd6c705 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
@@ -34,7 +34,7 @@ void getImage_ShouldReturnImage_WhenObjectKeyIsPassed() {
     query.setObjectKey("image.png");
 
     // when an image is requested from the image service
-    ImageQueryDto builder = mock(ThumborUrlBuilder.class);
+    ThumborUrlBuilder builder = mock(ThumborUrlBuilder.class);
 
     when(thumbor.buildImage(query.getObjectKey())).thenReturn(builder); // why is it needed?
     when(builder.toUrl()).thenReturn(expectedUrl);
@@ -43,4 +43,4 @@ void getImage_ShouldReturnImage_WhenObjectKeyIsPassed() {
     // then
     assertThat(actual.getUrl()).isEqualTo(expectedUrl);
   }
-}
+}
\ No newline at end of file

From 2192727c1460a6f8ae2dc87c0d091b3d7fd41aa2 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 17:11:54 +0000
Subject: [PATCH 07/19] update istest

---
 .../openchallenges/image/service/service/ImageServiceTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
index e6edd6c705..fd48c45317 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/service/ImageServiceTest.java
@@ -43,4 +43,4 @@ void getImage_ShouldReturnImage_WhenObjectKeyIsPassed() {
     // then
     assertThat(actual.getUrl()).isEqualTo(expectedUrl);
   }
-}
\ No newline at end of file
+}

From 1073801cbe80f2e6b1666a496ee501348d05e0ae Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Mon, 30 Oct 2023 14:34:44 -0700
Subject: [PATCH 08/19] Update label of the Discord button (#2288)

---
 .../ui/src/lib/discord-button/discord-button.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.ts b/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.ts
index c8148a23e5..3d4b14d57a 100644
--- a/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.ts
+++ b/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.ts
@@ -10,6 +10,6 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega
   styleUrls: ['./discord-button.component.scss'],
 })
 export class DiscordButtonComponent {
-  @Input({ required: false }) label = 'Discord';
+  @Input({ required: false }) label = 'Join us on Discord';
   @Input({ required: false }) href = 'https://discord.gg/6PGt7nkcwG';
 }

From b3d8da4dcc57d1df9c7107ebf2b78767f12c0a07 Mon Sep 17 00:00:00 2001
From: Verena Chung <9377970+vpchung@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:03:13 -0700
Subject: [PATCH 09/19] fix(openchallenges): upgrade legacy components (#2290)

* not-found page: upgrade MatCard

* org-profile page: remove unused tabs component

* github-button: upgrade MatButton

* _app-theme: upgrade legacy; fix fonts

* navbar: upgrade MatButton; fix colors and padding

* fix typography for buttons

* signup page: upgrade components

* add required `mat-label`

* update styles to account for changes

* user-button: upgrade MatButton, MatMenu

* update styles to account for changes

* upgrade component in commented code

* remove dependency on legacy-* in _app-theme

* add typography to discord button; add discord theme

* schematic: remove unused font; upgrade legacies
---
 apps/openchallenges/app/src/_app-theme.scss   | 19 +++++------
 apps/schematic/app/src/_app-theme.scss        | 15 ++-------
 .../not-found/src/lib/not-found.component.ts  |  2 +-
 .../src/lib/org-profile.component.ts          |  3 --
 .../signup/src/lib/signup.component.html      |  3 ++
 .../signup/src/lib/signup.component.scss      |  7 ++--
 .../signup/src/lib/signup.component.ts        |  8 ++---
 .../styles/src/lib/_general.scss              |  2 +-
 libs/openchallenges/themes/src/_fonts.scss    | 21 ++++++------
 libs/openchallenges/ui/src/_lib-theme.scss    |  2 ++
 .../button-github/button-github.component.ts  |  2 +-
 .../discord-button/_discord-button-theme.scss |  9 ++++--
 .../discord-button.component.html             | 32 ++++++++++---------
 .../ui/src/lib/navbar/_navbar-theme.scss      | 11 ++++++-
 .../ui/src/lib/navbar/navbar.component.scss   |  4 ++-
 .../ui/src/lib/navbar/navbar.component.ts     |  2 +-
 .../lib/user-button/_user-button-theme.scss   | 20 ++++++------
 .../user-button/user-button.component.scss    |  8 ++---
 .../lib/user-button/user-button.component.ts  |  4 +--
 .../src/lib/user-profile.component.ts         |  2 +-
 20 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/apps/openchallenges/app/src/_app-theme.scss b/apps/openchallenges/app/src/_app-theme.scss
index ac62858f4b..5f61f101f7 100644
--- a/apps/openchallenges/app/src/_app-theme.scss
+++ b/apps/openchallenges/app/src/_app-theme.scss
@@ -4,8 +4,8 @@
 @use 'libs/openchallenges/themes/src/palettes' as palettes;
 @use 'libs/openchallenges/themes/src/index' as openchallenges;
 
-@include mat.legacy-typography-hierarchy(fonts.$lato);
-@include mat.legacy-core();
+@include mat.typography-hierarchy(fonts.$lato);
+@include mat.core();
 
 $primary: mat.define-palette(palettes.$dark-blue-palette, 600);
 $accent: mat.define-palette(palettes.$accent-purple-palette, 400);
@@ -16,9 +16,9 @@ $theme: mat.define-light-theme(
       primary: $primary,
       accent: $accent,
     ),
-    typography: (
-      lato: fonts.$lato,
-    ),
+    typography: fonts.$lato,
+    density: 0,
+    is-dark: false,
   )
 );
 
@@ -32,14 +32,11 @@ $theme: map.deep-merge(
   )
 );
 
-// Emit theme-dependent styles for common features used across multiple
-// components.
-@include mat.legacy-core-theme($theme);
+// Emit theme-dependent styles for common features used across multiple components.
+@include mat.core-theme($theme);
 
 // Emit styles for MatButton based on `$theme`.
-@include mat.legacy-button-theme($theme);
-@include mat.legacy-progress-spinner-theme($theme);
-@include mat.legacy-button-typography(fonts.$lato);
+@include mat.button-theme($theme);
 
 // Include the theme mixins for other components you use here.
 @include openchallenges.theme($theme);
diff --git a/apps/schematic/app/src/_app-theme.scss b/apps/schematic/app/src/_app-theme.scss
index fe99140449..d589a8c004 100644
--- a/apps/schematic/app/src/_app-theme.scss
+++ b/apps/schematic/app/src/_app-theme.scss
@@ -1,11 +1,9 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
-@use 'libs/openchallenges/themes/src/fonts' as fonts;
 @use 'libs/openchallenges/themes/src/palettes' as palettes;
 @use 'libs/openchallenges/themes/src/index' as openchallenges;
 
-@include mat.legacy-typography-hierarchy(fonts.$fira);
-@include mat.legacy-core();
+@include mat.core();
 
 $primary: mat.define-palette(palettes.$dark-blue-palette, 600);
 $accent: mat.define-palette(palettes.$accent-purple-palette, 400);
@@ -16,9 +14,6 @@ $theme: mat.define-light-theme(
       primary: $primary,
       accent: $accent,
     ),
-    typography: (
-      fira: fonts.$fira,
-    ),
   )
 );
 
@@ -29,17 +24,13 @@ $theme: map.deep-merge(
     color: (
       figma: palettes.$figma-collection,
     ),
+    density: 0,
   )
 );
 
 // Emit theme-dependent styles for common features used across multiple
 // components.
-@include mat.legacy-core-theme($theme);
-
-// Emit styles for MatButton based on `$theme`.
-// @include mat.legacy-button-theme($theme);
-// @include mat.legacy-progress-spinner-theme($theme);
-// @include mat.legacy-button-typography(fonts.$fira);
+@include mat.core-theme($theme);
 
 // Include the theme mixins for other components you use here.
 // @include openchallenges.theme($theme);
diff --git a/libs/openchallenges/not-found/src/lib/not-found.component.ts b/libs/openchallenges/not-found/src/lib/not-found.component.ts
index 14ae0d625f..886048d683 100644
--- a/libs/openchallenges/not-found/src/lib/not-found.component.ts
+++ b/libs/openchallenges/not-found/src/lib/not-found.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
+import { MatCardModule } from '@angular/material/card';
 import { ConfigService } from '@sagebionetworks/openchallenges/config';
 import { FooterComponent } from '@sagebionetworks/openchallenges/ui';
 
diff --git a/libs/openchallenges/org-profile/src/lib/org-profile.component.ts b/libs/openchallenges/org-profile/src/lib/org-profile.component.ts
index 0f71544a1f..d398a44495 100644
--- a/libs/openchallenges/org-profile/src/lib/org-profile.component.ts
+++ b/libs/openchallenges/org-profile/src/lib/org-profile.component.ts
@@ -40,8 +40,6 @@ import {
 } from '@sagebionetworks/openchallenges/util';
 import { CommonModule } from '@angular/common';
 import { MatIconModule } from '@angular/material/icon';
-// import { MatTabsModule } from '@angular/material/tabs';
-import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs';
 import { OrgProfileChallengesComponent } from './org-profile-challenges/org-profile-challenges.component';
 import { OrgProfileMembersComponent } from './org-profile-members/org-profile-members.component';
 import { OrgProfileOverviewComponent } from './org-profile-overview/org-profile-overview.component';
@@ -55,7 +53,6 @@ import { getSeoData } from './org-profile-seo-data';
   imports: [
     CommonModule,
     RouterModule,
-    MatTabsModule,
     MatIconModule,
     OrgProfileOverviewComponent,
     OrgProfileChallengesComponent,
diff --git a/libs/openchallenges/signup/src/lib/signup.component.html b/libs/openchallenges/signup/src/lib/signup.component.html
index 479ea7ddb4..7793e8ec52 100644
--- a/libs/openchallenges/signup/src/lib/signup.component.html
+++ b/libs/openchallenges/signup/src/lib/signup.component.html
@@ -10,14 +10,17 @@ <h3>Join Us on OpenChallenges!</h3>
     </div>
     <form class="form-container" [formGroup]="newUserForm" novalidate>
       <mat-form-field class="new-email" appearance="outline">
+        <mat-label>Email</mat-label>
         <input matInput placeholder="Email" type="email" formControlName="email" />
         <mat-error *ngIf="email?.invalid">{{ getEmailErrorMessage() }} </mat-error>
       </mat-form-field>
       <mat-form-field class="new-username" appearance="outline">
+        <mat-label>Username</mat-label>
         <input matInput placeholder="Username" type="text" formControlName="username" />
         <mat-error *ngIf="username?.invalid">{{ getUsernameErrorMessage() }} </mat-error>
       </mat-form-field>
       <mat-form-field class="new-password" appearance="outline">
+        <mat-label>Password</mat-label>
         <input matInput placeholder="Password" type="password" formControlName="password" />
         <mat-error *ngIf="password?.invalid">{{ getPasswordErrorMessage() }} </mat-error>
       </mat-form-field>
diff --git a/libs/openchallenges/signup/src/lib/signup.component.scss b/libs/openchallenges/signup/src/lib/signup.component.scss
index a930dc4dcf..46da55f584 100644
--- a/libs/openchallenges/signup/src/lib/signup.component.scss
+++ b/libs/openchallenges/signup/src/lib/signup.component.scss
@@ -8,7 +8,7 @@ main {
 }
 .register-container {
   min-width: 320px;
-  max-width: 440px;
+  max-width: 460px;
   width: 100%
 }
 .title {
@@ -25,10 +25,14 @@ main {
   display: flex;
   flex-direction: column;
 }
+::ng-deep .mat-mdc-text-field-wrapper {
+  align-items: center !important;
+}
 mat-form-field.new-username,
 mat-form-field.new-password,
 mat-form-field.new-email {
   height: 70px;
+  margin-bottom: 16px;
 }
 input.mat-input-element {
   padding: 10px 0;
@@ -38,7 +42,6 @@ input.mat-input-element {
   flex-direction: column;
   text-align: center;
 }
-
 .alternative {
   margin-top: 68px;
   display: flex;
diff --git a/libs/openchallenges/signup/src/lib/signup.component.ts b/libs/openchallenges/signup/src/lib/signup.component.ts
index d75ec75fdb..fc82fafb03 100644
--- a/libs/openchallenges/signup/src/lib/signup.component.ts
+++ b/libs/openchallenges/signup/src/lib/signup.component.ts
@@ -11,10 +11,10 @@ import {
 // import { MatFormFieldModule } from '@angular/material/form-field';
 // import { MatInputModule } from '@angular/material/input';
 import { Router, RouterModule } from '@angular/router';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
-import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
-import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
 import {
   UserCreateRequest,
   UserService,
diff --git a/libs/openchallenges/styles/src/lib/_general.scss b/libs/openchallenges/styles/src/lib/_general.scss
index d6d7f6f5a2..581ced70f1 100644
--- a/libs/openchallenges/styles/src/lib/_general.scss
+++ b/libs/openchallenges/styles/src/lib/_general.scss
@@ -107,7 +107,7 @@ span.text-grey a {
 .btn-group button,
 .btn-group a {
   margin: 5px;
-  padding: 3px 32px;
+  padding: 21px 32px !important;
 }
 
 // SEARCH PAGES
diff --git a/libs/openchallenges/themes/src/_fonts.scss b/libs/openchallenges/themes/src/_fonts.scss
index a0b9009c04..f4f0388601 100644
--- a/libs/openchallenges/themes/src/_fonts.scss
+++ b/libs/openchallenges/themes/src/_fonts.scss
@@ -1,19 +1,16 @@
 @use '@angular/material' as mat;
 
-@import url('https://fonts.googleapis.com/css2?family=Fira+Sans:wght@300;500&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap');
 
-$fira: mat.define-typography-config(
-  $font-family: "'Fira Sans', sans-serif",
-);
 
 $lato: mat.define-typography-config(
-  $headline-5: mat.define-typography-level(46px, 56px, 700, "'Lato', sans-serif"),
-  $headline-6: mat.define-typography-level(40px, 50px, 700, "'Lato', sans-serif"),
-  $subtitle-1: mat.define-typography-level(28px, 38px, 700, "'Lato', sans-serif", -0.1px),
-  $subtitle-2: mat.define-typography-level(18px, 30px, 400, "'Lato', sans-serif", -0.1px),
-  $body-1: mat.define-typography-level(21px, 36px, 400, "'Lato', sans-serif", -0.1px),
-  $body-2: mat.define-typography-level(16px, 26px, 400, "'Lato', sans-serif"),
-  $caption: mat.define-typography-level(14px, 21px, 400, "'Lato', sans-serif"),
-  $button: mat.define-typography-level(16px, 18px, 400, "'Lato', sans-serif"),
+  $font-family: "'Lato', sans-serif",
+  $headline-5: mat.define-typography-level(46px, 56px, 700),
+  $headline-6: mat.define-typography-level(40px, 50px, 700),
+  $subtitle-1: mat.define-typography-level(28px, 38px, 700, $letter-spacing: -0.1px),
+  $subtitle-2: mat.define-typography-level(20px, 32px, 400, $letter-spacing: -0.1px),
+  $body-1: mat.define-typography-level(21px, 36px, 400, $letter-spacing: -0.1px),
+  $body-2: mat.define-typography-level(16px, 26px, 400),
+  $caption: mat.define-typography-level(14px, 21px, 400),
+  $button: mat.define-typography-level(16px, 18px, 700),
 );
diff --git a/libs/openchallenges/ui/src/_lib-theme.scss b/libs/openchallenges/ui/src/_lib-theme.scss
index ff4f86c868..78ba7a718d 100644
--- a/libs/openchallenges/ui/src/_lib-theme.scss
+++ b/libs/openchallenges/ui/src/_lib-theme.scss
@@ -6,6 +6,7 @@
 @use './lib/organization-card/organization-card-theme' as organization-card;
 @use './lib/paginator/paginator-theme' as paginator;
 @use './lib/person-card/person-card-theme' as person-card;
+@use './lib/discord-button/discord-button-theme' as discord-button;
 
 @mixin theme($theme) {
   @include button-github.theme($theme);
@@ -16,4 +17,5 @@
   @include organization-card.theme($theme);
   @include paginator.theme($theme);
   @include person-card.theme($theme);
+  @include discord-button.theme($theme);
 }
diff --git a/libs/openchallenges/ui/src/lib/button-github/button-github.component.ts b/libs/openchallenges/ui/src/lib/button-github/button-github.component.ts
index 44d7c85c17..9823231339 100644
--- a/libs/openchallenges/ui/src/lib/button-github/button-github.component.ts
+++ b/libs/openchallenges/ui/src/lib/button-github/button-github.component.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatButtonModule } from '@angular/material/button';
 
 @Component({
   selector: 'openchallenges-button-github',
diff --git a/libs/openchallenges/ui/src/lib/discord-button/_discord-button-theme.scss b/libs/openchallenges/ui/src/lib/discord-button/_discord-button-theme.scss
index ed50c1a960..892c1888b0 100644
--- a/libs/openchallenges/ui/src/lib/discord-button/_discord-button-theme.scss
+++ b/libs/openchallenges/ui/src/lib/discord-button/_discord-button-theme.scss
@@ -6,13 +6,16 @@
   $primary: map.get($config, primary);
   $accent: map.get($config, accent);
   $warn: map.get($config, warn);
-  $background: map.get($config, background);
-  $foreground: map.get($config, foreground);
 
   // add color-related scss here
+  .docs-button {
+    color: white !important;
+  }
 }
 
-@mixin typography($theme) {}
+@mixin typography($theme) {
+  $typography-config: mat.get-typography-config($theme);
+}
 
 @mixin theme($theme) {
   $color-config: mat.get-color-config($theme);
diff --git a/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.html b/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.html
index b068149e54..83485bc112 100644
--- a/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.html
+++ b/libs/openchallenges/ui/src/lib/discord-button/discord-button.component.html
@@ -1,15 +1,17 @@
-<a
-  mat-button
-  class="docs-button"
-  [href]="href"
-  aria-label="OpenChallenges Discord server"
-  target="_blank"
-  rel="noreferrer"
->
-  <img
-    alt="OpenChallenges Discord server"
-    class="discord-logo"
-    src="/openchallenges-assets/images/discord-icon.svg"
-  />
-  {{ label }}
-</a>
+<div class="mat-typography">
+  <a
+    mat-button
+    class="docs-button"
+    [href]="href"
+    aria-label="OpenChallenges Discord server"
+    target="_blank"
+    rel="noreferrer"
+  >
+    <img
+      alt="OpenChallenges Discord server"
+      class="discord-logo"
+      src="/openchallenges-assets/images/discord-icon.svg"
+    />
+    {{ label }}
+  </a>
+</div>
diff --git a/libs/openchallenges/ui/src/lib/navbar/_navbar-theme.scss b/libs/openchallenges/ui/src/lib/navbar/_navbar-theme.scss
index dcc21bc232..24cbe7bd02 100644
--- a/libs/openchallenges/ui/src/lib/navbar/_navbar-theme.scss
+++ b/libs/openchallenges/ui/src/lib/navbar/_navbar-theme.scss
@@ -9,10 +9,14 @@
 
   openchallenges-navbar {
     color: mat.get-color-from-palette($primary, default-contrast);
-
+  
     .sage-navbar {
       background: mat.get-color-from-palette($primary, 600);
     }
+    // Overwrite color specified by .mdc-button
+    .navbar-item {
+      color: white !important;
+    }
     .navbar-item:hover,
     .navbar-item:active,
     .navbar-item:focus {
@@ -23,6 +27,11 @@
 
 @mixin typography($theme) {
   $typography-config: mat.get-typography-config($theme);
+
+  // Overwrite line-height specified by .mdc-button
+  .navbar-item {
+    line-height: 18px !important;
+  }
 }
 
 @mixin theme($theme) {
diff --git a/libs/openchallenges/ui/src/lib/navbar/navbar.component.scss b/libs/openchallenges/ui/src/lib/navbar/navbar.component.scss
index 535d16a22a..87a24a5484 100644
--- a/libs/openchallenges/ui/src/lib/navbar/navbar.component.scss
+++ b/libs/openchallenges/ui/src/lib/navbar/navbar.component.scss
@@ -13,7 +13,9 @@
   padding: 8px 16px;
   box-shadow: 1px 5px 18px 0px rgba(0, 0, 0, 0.24);
 
-  > .mat-button {
+  > .mat-mdc-button {
+    padding: 0 16px !important;
+
     &:last-child {
       margin-left: auto;
     }
diff --git a/libs/openchallenges/ui/src/lib/navbar/navbar.component.ts b/libs/openchallenges/ui/src/lib/navbar/navbar.component.ts
index 0a706f1a19..d482b8ceb3 100644
--- a/libs/openchallenges/ui/src/lib/navbar/navbar.component.ts
+++ b/libs/openchallenges/ui/src/lib/navbar/navbar.component.ts
@@ -1,10 +1,10 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
 import { Avatar } from '../avatar/avatar';
 import { EMPTY_AVATAR } from '../avatar/mock-avatars';
 import { MenuItem } from '../user-button/menu-item';
+import { MatButtonModule } from '@angular/material/button';
 import { UserButtonComponent } from '../user-button/user-button.component';
 import { DiscordButtonComponent } from '../discord-button/discord-button.component';
 import { NavbarSection } from './navbar-section';
diff --git a/libs/openchallenges/ui/src/lib/user-button/_user-button-theme.scss b/libs/openchallenges/ui/src/lib/user-button/_user-button-theme.scss
index 2078a2ffdb..80572f055b 100644
--- a/libs/openchallenges/ui/src/lib/user-button/_user-button-theme.scss
+++ b/libs/openchallenges/ui/src/lib/user-button/_user-button-theme.scss
@@ -9,27 +9,27 @@
   $warn: map.get($config, 'warn');
 
   .user-button {
-    background-color: mat.get-color-from-palette($accent, 300);
+    background-color: mat.get-color-from-palette($accent, 300) !important;
+    color: white !important;
   }
 
   .user-dropdown {
-    background-color: #fff;
+    background-color: #fff !important;
   }
 
-  button.mat-menu-item{
-    background-color: #fff;
-    transition: 0.3s;
+  button.mat-mdc-menu-item{
+    background-color: #fff !important;
+    transition: 0.3s !important;
   }
 
-  button.mat-menu-item:hover {
-    background-color: mat.get-color-from-palette($primary, 100);;
+  button.mat-mdc-menu-item:hover {
+    background-color: mat.get-color-from-palette($primary, 100) !important;
   }
 }
 
 @mixin typography($theme) {
-  button.mat-menu-item{
-    font-size: 15px;
-    font-family: 'Lato';
+  button.mat-mdc-menu-item{
+    font-size: 15px !important;
   }
 }
 
diff --git a/libs/openchallenges/ui/src/lib/user-button/user-button.component.scss b/libs/openchallenges/ui/src/lib/user-button/user-button.component.scss
index 6c242f2872..34da2e7df9 100644
--- a/libs/openchallenges/ui/src/lib/user-button/user-button.component.scss
+++ b/libs/openchallenges/ui/src/lib/user-button/user-button.component.scss
@@ -1,6 +1,6 @@
 .user-button {
   height: 100%;
-  width:200px;
+  width: 200px;
   margin: 3px;
   padding: 5px 3px;
 
@@ -17,16 +17,16 @@
   width: 100%
 }
 
-button.mat-menu-item {
+button.mat-mdc-menu-item {
   padding-right: 122px;
 }
 
 @media only screen and (max-width: 855px) {
   .user-button {
-    width:100%;
+    width: 100%;
     div {
       justify-content: center;
-      span{
+      span {
         padding-left: 8px;
       }
     }
diff --git a/libs/openchallenges/ui/src/lib/user-button/user-button.component.ts b/libs/openchallenges/ui/src/lib/user-button/user-button.component.ts
index 466e6eab12..f97ead456f 100644
--- a/libs/openchallenges/ui/src/lib/user-button/user-button.component.ts
+++ b/libs/openchallenges/ui/src/lib/user-button/user-button.component.ts
@@ -3,10 +3,10 @@ import { Avatar } from '../avatar/avatar';
 import { EMPTY_AVATAR } from '../avatar/mock-avatars';
 import { MenuItem } from './menu-item';
 import { CommonModule } from '@angular/common';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatButtonModule } from '@angular/material/button';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatMenuModule } from '@angular/material/menu';
 import { RouterModule } from '@angular/router';
 import { AvatarComponent } from '../avatar/avatar.component';
 
diff --git a/libs/openchallenges/user-profile/src/lib/user-profile.component.ts b/libs/openchallenges/user-profile/src/lib/user-profile.component.ts
index 6ccddbad68..da28d4b2f5 100644
--- a/libs/openchallenges/user-profile/src/lib/user-profile.component.ts
+++ b/libs/openchallenges/user-profile/src/lib/user-profile.component.ts
@@ -41,7 +41,7 @@
 // import { CommonModule } from '@angular/common';
 // import { MatIconModule } from '@angular/material/icon';
 // // import { MatTabsModule } from '@angular/material/tabs';
-// import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-tabs';
+// import {  MatTabsModule } from '@angular/material/tabs';
 // import { UserProfileChallengesComponent } from './user-profile-challenges/user-profile-challenges.component';
 // import { UserProfileOverviewComponent } from './user-profile-overview/user-profile-overview.component';
 // import { UserProfileStarredComponent } from './user-profile-starred/user-profile-starred.component';

From 282191d5c223c6b5950fb06e8d8e1343f05730ac Mon Sep 17 00:00:00 2001
From: Verena Chung <9377970+vpchung@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:21:40 -0700
Subject: [PATCH 10/19] fix(openchallenges): remove Sage from sponsor list
 (#2287)

* remove Sage from sponsor list

* apply section-title styling

* link out to ITCR website

* use more descriptive variable name
---
 .../sponsor-list/sponsor-list.component.html  | 29 +++++++++----------
 .../sponsor-list/sponsor-list.component.ts    | 10 ++-----
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.html b/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.html
index 500053b9b7..79f436c0c9 100644
--- a/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.html
+++ b/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.html
@@ -1,22 +1,21 @@
 <section id="acknowledgements" class="mat-typography">
   <div class="container">
-    <p class="mat-body-strong text-center">OpenChallenges is made possible by...</p>
+    <h3 class="section-title">OpenChallenges is made possible by...</h3>
     <div class="sponsors-group row">
       <div class="col text-center sponsor-item">
-        <img
-          [src]="(itcr$ | async)?.url"
-          height="70px"
-          alt="Informatics Technology for Cancer Research (ITCR)"
-          title="Informatics Technology for Cancer Research"
-        />
-      </div>
-      <div class="col text-center sponsor-item">
-        <img
-          [src]="(sage$ | async)?.url"
-          height="80px"
-          alt="Sage Bionetworks"
-          title="Sage Bionetworks"
-        />
+        <a
+          href="https://itcr.cancer.gov/"
+          title="NCI Informatics Technology for Cancer Research"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          <img
+            [src]="(itcrImage$ | async)?.url"
+            height="70px"
+            alt="Informatics Technology for Cancer Research (ITCR)"
+            title="Informatics Technology for Cancer Research"
+          />
+        </a>
       </div>
     </div>
   </div>
diff --git a/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.ts b/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.ts
index 27ca478cb8..59d3494928 100644
--- a/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.ts
+++ b/libs/openchallenges/home/src/lib/sponsor-list/sponsor-list.component.ts
@@ -15,21 +15,15 @@ import { Observable } from 'rxjs';
   styleUrls: ['./sponsor-list.component.scss'],
 })
 export class SponsorListComponent implements OnInit {
-  itcr$: Observable<Image> | undefined;
-  aws$: Observable<Image> | undefined;
-  sage$: Observable<Image> | undefined;
+  itcrImage$: Observable<Image> | undefined;
   readonly height = ImageHeight._140px;
 
   constructor(private imageService: ImageService) {}
 
   ngOnInit() {
-    this.itcr$ = this.imageService.getImage({
+    this.itcrImage$ = this.imageService.getImage({
       objectKey: 'logo/nci-itcr-alt.svg',
       height: this.height,
     });
-    this.sage$ = this.imageService.getImage({
-      objectKey: 'logo/sage-bionetworks-alt.svg',
-      height: this.height,
-    });
   }
 }

From 9e7baefaba54c6890fdab190b4c67e4d67b31cd0 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Tue, 31 Oct 2023 11:41:23 -0700
Subject: [PATCH 11/19] chore(schematic): remove `schematic-app` and
 `schematic-api-client-angular` (#2293)

* Remove schematic-app and schematic-api-client-angular

* Update `tsconfig.base.json`
---
 apps/schematic/app/.eslintrc.json             |  33 -
 apps/schematic/app/jest.config.ts             |  23 -
 apps/schematic/app/project.json               |  96 --
 apps/schematic/app/src/_app-theme.scss        |  36 -
 apps/schematic/app/src/app/app.component.html |  17 -
 apps/schematic/app/src/app/app.component.scss |   0
 .../app/src/app/app.component.spec.ts.off     |  32 -
 apps/schematic/app/src/app/app.component.ts   |  26 -
 apps/schematic/app/src/app/app.module.ts      |  34 -
 apps/schematic/app/src/app/app.routes.ts      |   3 -
 .../app/src/app/nx-welcome.component.ts       | 828 ------------------
 apps/schematic/app/src/assets/.gitkeep        |   0
 apps/schematic/app/src/favicon.ico            | Bin 15086 -> 0 bytes
 apps/schematic/app/src/index.html             |  19 -
 apps/schematic/app/src/main.ts                |   7 -
 apps/schematic/app/src/proxy.conf.json        |  11 -
 apps/schematic/app/src/styles.scss            |   1 -
 apps/schematic/app/src/test-setup.ts          |   1 -
 apps/schematic/app/tsconfig.app.json          |  10 -
 apps/schematic/app/tsconfig.editor.json       |   7 -
 apps/schematic/app/tsconfig.json              |  32 -
 apps/schematic/app/tsconfig.spec.json         |  10 -
 .../api-client-angular/.eslintrc.json         |  33 -
 libs/schematic/api-client-angular/README.md   |   7 -
 .../api-client-angular/jest.config.ts         |  23 -
 .../api-client-angular/ng-package.json        |   7 -
 .../api-client-angular/openapitools.json      |  19 -
 .../schematic/api-client-angular/package.json |  11 -
 .../schematic/api-client-angular/project.json |  62 --
 .../schematic/api-client-angular/src/index.ts |   1 -
 .../api-client-angular/src/lib/.gitignore     |   4 -
 .../src/lib/.openapi-generator-ignore         |  23 -
 .../src/lib/.openapi-generator/FILES          |  17 -
 .../src/lib/.openapi-generator/VERSION        |   1 -
 .../api-client-angular/src/lib/README.md      | 226 -----
 .../api-client-angular/src/lib/api.module.ts  |  31 -
 .../api-client-angular/src/lib/api/api.ts     |   3 -
 .../src/lib/api/storage.service.ts            | 156 ----
 .../src/lib/configuration.ts                  | 166 ----
 .../api-client-angular/src/lib/encoder.ts     |  20 -
 .../api-client-angular/src/lib/git_push.sh    |  57 --
 .../api-client-angular/src/lib/index.ts       |   6 -
 .../src/lib/model/basicError.ts               |  35 -
 .../src/lib/model/dataset.ts                  |  23 -
 .../src/lib/model/datasetsPage.ts             |  48 -
 .../src/lib/model/datasetsPageAllOf.ts        |  21 -
 .../src/lib/model/models.ts                   |   5 -
 .../src/lib/model/pageMetadata.ts             |  43 -
 .../api-client-angular/src/lib/param.ts       |  69 --
 .../api-client-angular/src/lib/variables.ts   |   9 -
 .../api-client-angular/src/test-setup.ts      |   1 -
 .../templates/api.module.mustache             |  37 -
 .../api-client-angular/templates/config.yaml  |   3 -
 .../templates/v6.1.x/api.module.mustache      |  37 -
 .../tools/pull-templates.sh                   |   9 -
 .../api-client-angular/tsconfig.json          |  27 -
 .../api-client-angular/tsconfig.lib.json      |  14 -
 .../api-client-angular/tsconfig.lib.prod.json |   9 -
 .../api-client-angular/tsconfig.spec.json     |  10 -
 tsconfig.base.json                            |   3 -
 60 files changed, 2502 deletions(-)
 delete mode 100644 apps/schematic/app/.eslintrc.json
 delete mode 100644 apps/schematic/app/jest.config.ts
 delete mode 100644 apps/schematic/app/project.json
 delete mode 100644 apps/schematic/app/src/_app-theme.scss
 delete mode 100644 apps/schematic/app/src/app/app.component.html
 delete mode 100644 apps/schematic/app/src/app/app.component.scss
 delete mode 100644 apps/schematic/app/src/app/app.component.spec.ts.off
 delete mode 100644 apps/schematic/app/src/app/app.component.ts
 delete mode 100644 apps/schematic/app/src/app/app.module.ts
 delete mode 100644 apps/schematic/app/src/app/app.routes.ts
 delete mode 100644 apps/schematic/app/src/app/nx-welcome.component.ts
 delete mode 100644 apps/schematic/app/src/assets/.gitkeep
 delete mode 100644 apps/schematic/app/src/favicon.ico
 delete mode 100644 apps/schematic/app/src/index.html
 delete mode 100644 apps/schematic/app/src/main.ts
 delete mode 100644 apps/schematic/app/src/proxy.conf.json
 delete mode 100644 apps/schematic/app/src/styles.scss
 delete mode 100644 apps/schematic/app/src/test-setup.ts
 delete mode 100644 apps/schematic/app/tsconfig.app.json
 delete mode 100644 apps/schematic/app/tsconfig.editor.json
 delete mode 100644 apps/schematic/app/tsconfig.json
 delete mode 100644 apps/schematic/app/tsconfig.spec.json
 delete mode 100644 libs/schematic/api-client-angular/.eslintrc.json
 delete mode 100644 libs/schematic/api-client-angular/README.md
 delete mode 100644 libs/schematic/api-client-angular/jest.config.ts
 delete mode 100644 libs/schematic/api-client-angular/ng-package.json
 delete mode 100644 libs/schematic/api-client-angular/openapitools.json
 delete mode 100644 libs/schematic/api-client-angular/package.json
 delete mode 100644 libs/schematic/api-client-angular/project.json
 delete mode 100644 libs/schematic/api-client-angular/src/index.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/.gitignore
 delete mode 100644 libs/schematic/api-client-angular/src/lib/.openapi-generator-ignore
 delete mode 100644 libs/schematic/api-client-angular/src/lib/.openapi-generator/FILES
 delete mode 100644 libs/schematic/api-client-angular/src/lib/.openapi-generator/VERSION
 delete mode 100644 libs/schematic/api-client-angular/src/lib/README.md
 delete mode 100644 libs/schematic/api-client-angular/src/lib/api.module.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/api/api.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/api/storage.service.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/configuration.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/encoder.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/git_push.sh
 delete mode 100644 libs/schematic/api-client-angular/src/lib/index.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/model/basicError.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/model/dataset.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/model/datasetsPage.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/model/datasetsPageAllOf.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/model/models.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/model/pageMetadata.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/param.ts
 delete mode 100644 libs/schematic/api-client-angular/src/lib/variables.ts
 delete mode 100644 libs/schematic/api-client-angular/src/test-setup.ts
 delete mode 100644 libs/schematic/api-client-angular/templates/api.module.mustache
 delete mode 100644 libs/schematic/api-client-angular/templates/config.yaml
 delete mode 100644 libs/schematic/api-client-angular/templates/v6.1.x/api.module.mustache
 delete mode 100755 libs/schematic/api-client-angular/tools/pull-templates.sh
 delete mode 100644 libs/schematic/api-client-angular/tsconfig.json
 delete mode 100644 libs/schematic/api-client-angular/tsconfig.lib.json
 delete mode 100644 libs/schematic/api-client-angular/tsconfig.lib.prod.json
 delete mode 100644 libs/schematic/api-client-angular/tsconfig.spec.json

diff --git a/apps/schematic/app/.eslintrc.json b/apps/schematic/app/.eslintrc.json
deleted file mode 100644
index 3ba81239d1..0000000000
--- a/apps/schematic/app/.eslintrc.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "extends": ["../../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "rules": {
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "sagebionetworks",
-            "style": "camelCase"
-          }
-        ],
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "sagebionetworks",
-            "style": "kebab-case"
-          }
-        ]
-      },
-      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]
-    },
-    {
-      "files": ["*.html"],
-      "extends": ["plugin:@nx/angular-template"],
-      "rules": {}
-    }
-  ]
-}
diff --git a/apps/schematic/app/jest.config.ts b/apps/schematic/app/jest.config.ts
deleted file mode 100644
index 8f8b4caa34..0000000000
--- a/apps/schematic/app/jest.config.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'schematic-app',
-  preset: '../../../jest.preset.js',
-  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {},
-  coverageDirectory: '../../../coverage/apps/schematic/app',
-  transform: {
-    '^.+\\.(ts|mjs|js|html)$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.(html|svg)$',
-      },
-    ],
-  },
-  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
-  snapshotSerializers: [
-    'jest-preset-angular/build/serializers/no-ng-attributes',
-    'jest-preset-angular/build/serializers/ng-snapshot',
-    'jest-preset-angular/build/serializers/html-comment',
-  ],
-};
diff --git a/apps/schematic/app/project.json b/apps/schematic/app/project.json
deleted file mode 100644
index 0e7e073d6b..0000000000
--- a/apps/schematic/app/project.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "name": "schematic-app",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "sourceRoot": "apps/schematic/app/src",
-  "prefix": "sagebionetworks",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:browser",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/apps/schematic/app",
-        "index": "apps/schematic/app/src/index.html",
-        "main": "apps/schematic/app/src/main.ts",
-        "polyfills": ["zone.js"],
-        "tsConfig": "apps/schematic/app/tsconfig.app.json",
-        "inlineStyleLanguage": "scss",
-        "assets": ["apps/schematic/app/src/favicon.ico", "apps/schematic/app/src/assets"],
-        "styles": ["apps/schematic/app/src/styles.scss"],
-        "scripts": []
-      },
-      "configurations": {
-        "production": {
-          "budgets": [
-            {
-              "type": "initial",
-              "maximumWarning": "500kb",
-              "maximumError": "1mb"
-            },
-            {
-              "type": "anyComponentStyle",
-              "maximumWarning": "2kb",
-              "maximumError": "4kb"
-            }
-          ],
-          "outputHashing": "all"
-        },
-        "development": {
-          "buildOptimizer": false,
-          "optimization": false,
-          "vendorChunk": true,
-          "extractLicenses": false,
-          "sourceMap": true,
-          "namedChunks": true
-        }
-      },
-      "defaultConfiguration": "production"
-    },
-    "serve": {
-      "executor": "@angular-devkit/build-angular:dev-server",
-      "configurations": {
-        "production": {
-          "browserTarget": "schematic-app:build:production",
-          "port": 7200
-        },
-        "development": {
-          "browserTarget": "schematic-app:build:development",
-          "port": 7200
-        }
-      },
-      "defaultConfiguration": "development",
-      "options": {
-        "publicHost": "http://localhost:7200",
-        "proxyConfig": "apps/schematic/app/src/proxy.conf.json"
-      },
-      "dependsOn": []
-    },
-    "extract-i18n": {
-      "executor": "@angular-devkit/build-angular:extract-i18n",
-      "options": {
-        "browserTarget": "schematic-app:build"
-      }
-    },
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/schematic/app/**/*.ts", "apps/schematic/app/**/*.html"]
-      }
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "apps/schematic/app/jest.config.ts",
-        "passWithNoTests": true
-      }
-    }
-  },
-  "tags": ["type:app", "scope:client"],
-  "implicitDependencies": [
-    "schematic-api-client-angular",
-    "schematic-api",
-    "shared-typescript-assets"
-  ]
-}
diff --git a/apps/schematic/app/src/_app-theme.scss b/apps/schematic/app/src/_app-theme.scss
deleted file mode 100644
index d589a8c004..0000000000
--- a/apps/schematic/app/src/_app-theme.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@use 'sass:map';
-@use '@angular/material' as mat;
-@use 'libs/openchallenges/themes/src/palettes' as palettes;
-@use 'libs/openchallenges/themes/src/index' as openchallenges;
-
-@include mat.core();
-
-$primary: mat.define-palette(palettes.$dark-blue-palette, 600);
-$accent: mat.define-palette(palettes.$accent-purple-palette, 400);
-
-$theme: mat.define-light-theme(
-  (
-    color: (
-      primary: $primary,
-      accent: $accent,
-    ),
-  )
-);
-
-// Add custom palettes used in figma to the theme
-$theme: map.deep-merge(
-  $theme,
-  (
-    color: (
-      figma: palettes.$figma-collection,
-    ),
-    density: 0,
-  )
-);
-
-// Emit theme-dependent styles for common features used across multiple
-// components.
-@include mat.core-theme($theme);
-
-// Include the theme mixins for other components you use here.
-// @include openchallenges.theme($theme);
diff --git a/apps/schematic/app/src/app/app.component.html b/apps/schematic/app/src/app/app.component.html
deleted file mode 100644
index bd7aef3b8a..0000000000
--- a/apps/schematic/app/src/app/app.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div *ngIf="datasets$ | async as datasets">
-  <table mat-table [dataSource]="datasets" class="mat-elevation-z8">
-    <!--- Note that these columns can be defined in any order.
-          The actual rendered columns are set as a property on the row definition" -->
-
-    <!-- Name Column -->
-    <ng-container matColumnDef="name">
-      <th mat-header-cell *matHeaderCellDef>Name</th>
-      <td mat-cell *matCellDef="let element">{{ element.name }}</td>
-    </ng-container>
-
-    <tr mat-header-row *matHeaderRowDef="columnNames"></tr>
-    <tr mat-row *matRowDef="let row; columns: columnNames"></tr>
-  </table>
-</div>
-<sagebionetworks-nx-welcome></sagebionetworks-nx-welcome>
-<router-outlet></router-outlet>
diff --git a/apps/schematic/app/src/app/app.component.scss b/apps/schematic/app/src/app/app.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/schematic/app/src/app/app.component.spec.ts.off b/apps/schematic/app/src/app/app.component.spec.ts.off
deleted file mode 100644
index 76252ef9ce..0000000000
--- a/apps/schematic/app/src/app/app.component.spec.ts.off
+++ /dev/null
@@ -1,32 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-import { NxWelcomeComponent } from './nx-welcome.component';
-import { RouterTestingModule } from '@angular/router/testing';
-
-describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
-      declarations: [AppComponent, NxWelcomeComponent],
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have as title 'schematic-app'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.componentInstance;
-    expect(app.title).toEqual('schematic-app');
-  });
-
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('h1')?.textContent).toContain('Welcome schematic-app');
-  });
-});
diff --git a/apps/schematic/app/src/app/app.component.ts b/apps/schematic/app/src/app/app.component.ts
deleted file mode 100644
index fd0aba8e42..0000000000
--- a/apps/schematic/app/src/app/app.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import {
-  Dataset,
-  StorageService,
-} from '@sagebionetworks/schematic/api-client-angular';
-import { map, Observable } from 'rxjs';
-
-@Component({
-  selector: 'sagebionetworks-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
-})
-export class AppComponent implements OnInit {
-  title = 'schematic-app';
-
-  datasets$!: Observable<Dataset[]>;
-  columnNames: string[] = ['name'];
-
-  constructor(private storageService: StorageService) {}
-
-  ngOnInit(): void {
-    this.datasets$ = this.storageService
-      .listStorageProjectDatasets('syn26251192')
-      .pipe(map((page) => page.datasets));
-  }
-}
diff --git a/apps/schematic/app/src/app/app.module.ts b/apps/schematic/app/src/app/app.module.ts
deleted file mode 100644
index 43716aa62a..0000000000
--- a/apps/schematic/app/src/app/app.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { HttpClientModule } from '@angular/common/http';
-import { MatTableModule } from '@angular/material/table';
-
-import {
-  ApiModule as SchematicApiModule,
-  BASE_PATH as SCHEMATIC_API_CLIENT_BASE_PATH,
-} from '@sagebionetworks/schematic/api-client-angular';
-import { AppComponent } from './app.component';
-import { NxWelcomeComponent } from './nx-welcome.component';
-import { RouterModule } from '@angular/router';
-import { appRoutes } from './app.routes';
-
-@NgModule({
-  declarations: [AppComponent],
-  imports: [
-    BrowserModule,
-    RouterModule.forRoot(appRoutes, { initialNavigation: 'enabledBlocking' }),
-    HttpClientModule,
-    MatTableModule,
-    SchematicApiModule,
-    NxWelcomeComponent,
-  ],
-  providers: [
-    {
-      provide: SCHEMATIC_API_CLIENT_BASE_PATH,
-      useFactory: () => 'http://localhost:7200/api',
-      deps: [],
-    },
-  ],
-  bootstrap: [AppComponent],
-})
-export class AppModule {}
diff --git a/apps/schematic/app/src/app/app.routes.ts b/apps/schematic/app/src/app/app.routes.ts
deleted file mode 100644
index 8762dfe2c6..0000000000
--- a/apps/schematic/app/src/app/app.routes.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Route } from '@angular/router';
-
-export const appRoutes: Route[] = [];
diff --git a/apps/schematic/app/src/app/nx-welcome.component.ts b/apps/schematic/app/src/app/nx-welcome.component.ts
deleted file mode 100644
index f89da3cf60..0000000000
--- a/apps/schematic/app/src/app/nx-welcome.component.ts
+++ /dev/null
@@ -1,828 +0,0 @@
-import { Component, ViewEncapsulation } from '@angular/core';
-
-/* eslint-disable */
-
-@Component({
-    selector: 'sagebionetworks-nx-welcome',
-    template: `
-    <!--
-     * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-     This is a starter component and can be deleted.
-     * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-     Delete this file and get started with your project!
-     * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-     -->
-    <style>
-      html {
-        -webkit-text-size-adjust: 100%;
-        font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-          'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-          'Segoe UI Symbol', 'Noto Color Emoji';
-        line-height: 1.5;
-        tab-size: 4;
-        scroll-behavior: smooth;
-      }
-      body {
-        font-family: inherit;
-        line-height: inherit;
-        margin: 0;
-      }
-      h1,
-      h2,
-      p,
-      pre {
-        margin: 0;
-      }
-      *,
-      ::before,
-      ::after {
-        box-sizing: border-box;
-        border-width: 0;
-        border-style: solid;
-        border-color: currentColor;
-      }
-      h1,
-      h2 {
-        font-size: inherit;
-        font-weight: inherit;
-      }
-      a {
-        color: inherit;
-        text-decoration: inherit;
-      }
-      pre {
-        font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono',
-          'Courier New', monospace;
-      }
-      svg {
-        display: block;
-        vertical-align: middle;
-      }
-
-      svg {
-        shape-rendering: auto;
-        text-rendering: optimizeLegibility;
-      }
-      pre {
-        background-color: rgba(55, 65, 81, 1);
-        border-radius: 0.25rem;
-        color: rgba(229, 231, 235, 1);
-        font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono',
-          'Courier New', monospace;
-        overflow: scroll;
-        padding: 0.5rem 0.75rem;
-      }
-
-      .shadow {
-        box-shadow: 0 0 #0000, 0 0 #0000, 0 10px 15px -3px rgba(0, 0, 0, 0.1),
-          0 4px 6px -2px rgba(0, 0, 0, 0.05);
-      }
-      .rounded {
-        border-radius: 1.5rem;
-      }
-
-      .wrapper {
-        width: 100%;
-      }
-      .container {
-        margin-left: auto;
-        margin-right: auto;
-        max-width: 768px;
-        padding-bottom: 3rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-        color: rgba(55, 65, 81, 1);
-        width: 100%;
-      }
-      #welcome {
-        margin-top: 2.5rem;
-      }
-      #welcome h1 {
-        font-size: 3rem;
-        font-weight: 500;
-        letter-spacing: -0.025em;
-        line-height: 1;
-      }
-      #welcome span {
-        display: block;
-        font-size: 1.875rem;
-        font-weight: 300;
-        line-height: 2.25rem;
-        margin-bottom: 0.5rem;
-      }
-      #hero {
-        align-items: center;
-        background-color: hsla(214, 62%, 21%, 1);
-        border: none;
-        box-sizing: border-box;
-        color: rgba(55, 65, 81, 1);
-        display: grid;
-        grid-template-columns: 1fr;
-        margin-top: 3.5rem;
-      }
-      #hero .text-container {
-        color: rgba(255, 255, 255, 1);
-        padding: 3rem 2rem;
-      }
-      #hero .text-container h2 {
-        font-size: 1.5rem;
-        line-height: 2rem;
-        position: relative;
-      }
-      #hero .text-container h2 svg {
-        color: hsla(162, 47%, 50%, 1);
-        height: 2rem;
-        left: -0.25rem;
-        position: absolute;
-        top: 0;
-        width: 2rem;
-      }
-      #hero .text-container h2 span {
-        margin-left: 2.5rem;
-      }
-      #hero .text-container a {
-        background-color: rgba(255, 255, 255, 1);
-        border-radius: 0.75rem;
-        color: rgba(55, 65, 81, 1);
-        display: inline-block;
-        margin-top: 1.5rem;
-        padding: 1rem 2rem;
-        text-decoration: inherit;
-      }
-      #hero .logo-container {
-        display: none;
-        justify-content: center;
-        padding-left: 2rem;
-        padding-right: 2rem;
-      }
-      #hero .logo-container svg {
-        color: rgba(255, 255, 255, 1);
-        width: 66.666667%;
-      }
-
-      #middle-content {
-        align-items: flex-start;
-        display: grid;
-        gap: 4rem;
-        grid-template-columns: 1fr;
-        margin-top: 3.5rem;
-      }
-
-      #learning-materials {
-        padding: 2.5rem 2rem;
-      }
-      #learning-materials h2 {
-        font-weight: 500;
-        font-size: 1.25rem;
-        letter-spacing: -0.025em;
-        line-height: 1.75rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-      }
-      .list-item-link {
-        align-items: center;
-        border-radius: 0.75rem;
-        display: flex;
-        margin-top: 1rem;
-        padding: 1rem;
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-        width: 100%;
-      }
-      .list-item-link svg:first-child {
-        margin-right: 1rem;
-        height: 1.5rem;
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-        width: 1.5rem;
-      }
-      .list-item-link > span {
-        flex-grow: 1;
-        font-weight: 400;
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-      }
-      .list-item-link > span > span {
-        color: rgba(107, 114, 128, 1);
-        display: block;
-        flex-grow: 1;
-        font-size: 0.75rem;
-        font-weight: 300;
-        line-height: 1rem;
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-      }
-      .list-item-link svg:last-child {
-        height: 1rem;
-        transition-property: all;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-        width: 1rem;
-      }
-      .list-item-link:hover {
-        color: rgba(255, 255, 255, 1);
-        background-color: hsla(162, 47%, 50%, 1);
-      }
-      .list-item-link:hover > span {
-      }
-      .list-item-link:hover > span > span {
-        color: rgba(243, 244, 246, 1);
-      }
-      .list-item-link:hover svg:last-child {
-        transform: translateX(0.25rem);
-      }
-
-      #other-links {
-      }
-      .button-pill {
-        padding: 1.5rem 2rem;
-        transition-duration: 300ms;
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        align-items: center;
-        display: flex;
-      }
-      .button-pill svg {
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-        flex-shrink: 0;
-        width: 3rem;
-      }
-      .button-pill > span {
-        letter-spacing: -0.025em;
-        font-weight: 400;
-        font-size: 1.125rem;
-        line-height: 1.75rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-      }
-      .button-pill span span {
-        display: block;
-        font-size: 0.875rem;
-        font-weight: 300;
-        line-height: 1.25rem;
-      }
-      .button-pill:hover svg,
-      .button-pill:hover {
-        color: rgba(255, 255, 255, 1) !important;
-      }
-      #nx-console:hover {
-        background-color: rgba(0, 122, 204, 1);
-      }
-      #nx-console svg {
-        color: rgba(0, 122, 204, 1);
-      }
-
-      #nx-repo:hover {
-        background-color: rgba(24, 23, 23, 1);
-      }
-      #nx-repo svg {
-        color: rgba(24, 23, 23, 1);
-      }
-
-      #nx-cloud {
-        margin-bottom: 2rem;
-        margin-top: 2rem;
-        padding: 2.5rem 2rem;
-      }
-      #nx-cloud > div {
-        align-items: center;
-        display: flex;
-      }
-      #nx-cloud > div svg {
-        border-radius: 0.375rem;
-        flex-shrink: 0;
-        width: 3rem;
-      }
-      #nx-cloud > div h2 {
-        font-size: 1.125rem;
-        font-weight: 400;
-        letter-spacing: -0.025em;
-        line-height: 1.75rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-      }
-      #nx-cloud > div h2 span {
-        display: block;
-        font-size: 0.875rem;
-        font-weight: 300;
-        line-height: 1.25rem;
-      }
-      #nx-cloud p {
-        font-size: 1rem;
-        line-height: 1.5rem;
-        margin-top: 1rem;
-      }
-      #nx-cloud pre {
-        margin-top: 1rem;
-      }
-      #nx-cloud a {
-        color: rgba(107, 114, 128, 1);
-        display: block;
-        font-size: 0.875rem;
-        line-height: 1.25rem;
-        margin-top: 1.5rem;
-        text-align: right;
-      }
-      #nx-cloud a:hover {
-        text-decoration: underline;
-      }
-
-      #commands {
-        padding: 2.5rem 2rem;
-
-        margin-top: 3.5rem;
-      }
-      #commands h2 {
-        font-size: 1.25rem;
-        font-weight: 400;
-        letter-spacing: -0.025em;
-        line-height: 1.75rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-      }
-      #commands p {
-        font-size: 1rem;
-        font-weight: 300;
-        line-height: 1.5rem;
-        margin-top: 1rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-      }
-      details {
-        align-items: center;
-        display: flex;
-        margin-top: 1rem;
-        padding-left: 1rem;
-        padding-right: 1rem;
-        width: 100%;
-      }
-      details pre > span {
-        color: rgba(181, 181, 181, 1);
-      }
-      summary {
-        border-radius: 0.5rem;
-        display: flex;
-        font-weight: 400;
-        padding: 0.5rem;
-        cursor: pointer;
-        transition-property: background-color, border-color, color, fill, stroke, opacity,
-          box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
-        transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-        transition-duration: 150ms;
-      }
-      summary:hover {
-        background-color: rgba(243, 244, 246, 1);
-      }
-      summary svg {
-        height: 1.5rem;
-        margin-right: 1rem;
-        width: 1.5rem;
-      }
-
-      #love {
-        color: rgba(107, 114, 128, 1);
-        font-size: 0.875rem;
-        line-height: 1.25rem;
-        margin-top: 3.5rem;
-        opacity: 0.6;
-        text-align: center;
-      }
-      #love svg {
-        color: rgba(252, 165, 165, 1);
-        width: 1.25rem;
-        height: 1.25rem;
-        display: inline;
-        margin-top: -0.25rem;
-      }
-
-      @media screen and (min-width: 768px) {
-        #hero {
-          grid-template-columns: repeat(2, minmax(0, 1fr));
-        }
-        #hero .logo-container {
-          display: flex;
-        }
-        #middle-content {
-          grid-template-columns: repeat(2, minmax(0, 1fr));
-        }
-      }
-    </style>
-    <div class="wrapper">
-      <div class="container">
-        <!--  WELCOME  -->
-        <div id="welcome">
-          <h1>
-            <span> Hello there, </span>
-            Welcome schematic-app 👋
-          </h1>
-        </div>
-
-        <!--  HERO  -->
-        <div id="hero" class="rounded">
-          <div class="text-container">
-            <h2>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
-                />
-              </svg>
-              <span>You&apos;re up and running</span>
-            </h2>
-            <a href="#commands"> What&apos;s next? </a>
-          </div>
-          <div class="logo-container">
-            <svg
-              fill="currentColor"
-              role="img"
-              viewBox="0 0 24 24"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M11.987 14.138l-3.132 4.923-5.193-8.427-.012 8.822H0V4.544h3.691l5.247 8.833.005-3.998 3.044 4.759zm.601-5.761c.024-.048 0-3.784.008-3.833h-3.65c.002.059-.005 3.776-.003 3.833h3.645zm5.634 4.134a2.061 2.061 0 0 0-1.969 1.336 1.963 1.963 0 0 1 2.343-.739c.396.161.917.422 1.33.283a2.1 2.1 0 0 0-1.704-.88zm3.39 1.061c-.375-.13-.8-.277-1.109-.681-.06-.08-.116-.17-.176-.265a2.143 2.143 0 0 0-.533-.642c-.294-.216-.68-.322-1.18-.322a2.482 2.482 0 0 0-2.294 1.536 2.325 2.325 0 0 1 4.002.388.75.75 0 0 0 .836.334c.493-.105.46.36 1.203.518v-.133c-.003-.446-.246-.55-.75-.733zm2.024 1.266a.723.723 0 0 0 .347-.638c-.01-2.957-2.41-5.487-5.37-5.487a5.364 5.364 0 0 0-4.487 2.418c-.01-.026-1.522-2.39-1.538-2.418H8.943l3.463 5.423-3.379 5.32h3.54l1.54-2.366 1.568 2.366h3.541l-3.21-5.052a.7.7 0 0 1-.084-.32 2.69 2.69 0 0 1 2.69-2.691h.001c1.488 0 1.736.89 2.057 1.308.634.826 1.9.464 1.9 1.541a.707.707 0 0 0 1.066.596zm.35.133c-.173.372-.56.338-.755.639-.176.271.114.412.114.412s.337.156.538-.311c.104-.231.14-.488.103-.74z"
-              />
-            </svg>
-          </div>
-        </div>
-
-        <!--  MIDDLE CONTENT  -->
-        <div id="middle-content">
-          <div id="learning-materials" class="rounded shadow">
-            <h2>Learning materials</h2>
-            <a
-              href="https://nx.dev/getting-started/intro?utm_source=nx-project"
-              target="_blank"
-              rel="noreferrer"
-              class="list-item-link"
-            >
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
-                />
-              </svg>
-              <span>
-                Documentation
-                <span> Everything is in there </span>
-              </span>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 5l7 7-7 7"
-                />
-              </svg>
-            </a>
-            <a
-              href="https://blog.nrwl.io/?utm_source=nx-project"
-              target="_blank"
-              rel="noreferrer"
-              class="list-item-link"
-            >
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"
-                />
-              </svg>
-              <span>
-                Blog
-                <span> Changelog, features & events </span>
-              </span>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 5l7 7-7 7"
-                />
-              </svg>
-            </a>
-            <a
-              href="https://www.youtube.com/c/Nrwl_io/videos?utm_source=nx-project&sub_confirmation=1"
-              target="_blank"
-              rel="noreferrer"
-              class="list-item-link"
-            >
-              <svg
-                role="img"
-                viewBox="0 0 24 24"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <title>YouTube</title>
-                <path
-                  d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z"
-                />
-              </svg>
-              <span>
-                YouTube channel
-                <span> Nx Show, talks & tutorials </span>
-              </span>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 5l7 7-7 7"
-                />
-              </svg>
-            </a>
-            <a
-              href="https://nx.dev/angular-tutorial/1-code-generation?utm_source=nx-project"
-              target="_blank"
-              rel="noreferrer"
-              class="list-item-link"
-            >
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
-                />
-              </svg>
-              <span>
-                Interactive tutorials
-                <span> Create an app, step-by-step </span>
-              </span>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 5l7 7-7 7"
-                />
-              </svg>
-            </a>
-            <a
-              href="https://nxplaybook.com/?utm_source=nx-project"
-              target="_blank"
-              rel="noreferrer"
-              class="list-item-link"
-            >
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path d="M12 14l9-5-9-5-9 5 9 5z" />
-                <path
-                  d="M12 14l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14z"
-                />
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M12 14l9-5-9-5-9 5 9 5zm0 0l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14zm-4 6v-7.5l4-2.222"
-                />
-              </svg>
-              <span>
-                Video courses
-                <span> Nx custom courses </span>
-              </span>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M9 5l7 7-7 7"
-                />
-              </svg>
-            </a>
-          </div>
-          <div id="other-links">
-            <a
-              id="nx-console"
-              class="button-pill rounded shadow"
-              href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project"
-              target="_blank"
-              rel="noreferrer"
-            >
-              <svg
-                fill="currentColor"
-                role="img"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <title>Visual Studio Code</title>
-                <path
-                  d="M23.15 2.587L18.21.21a1.494 1.494 0 0 0-1.705.29l-9.46 8.63-4.12-3.128a.999.999 0 0 0-1.276.057L.327 7.261A1 1 0 0 0 .326 8.74L3.899 12 .326 15.26a1 1 0 0 0 .001 1.479L1.65 17.94a.999.999 0 0 0 1.276.057l4.12-3.128 9.46 8.63a1.492 1.492 0 0 0 1.704.29l4.942-2.377A1.5 1.5 0 0 0 24 20.06V3.939a1.5 1.5 0 0 0-.85-1.352zm-5.146 14.861L10.826 12l7.178-5.448v10.896z"
-                />
-              </svg>
-              <span>
-                Install Nx Console
-                <span>Plugin for VSCode</span>
-              </span>
-            </a>
-            <div id="nx-cloud" class="rounded shadow">
-              <div>
-                <svg viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-                  <path
-                    d="M120 15V30C103.44 30 90 43.44 90 60C90 76.56 76.56 90 60 90C43.44 90 30 103.44 30 120H15C6.72 120 0 113.28 0 105V15C0 6.72 6.72 0 15 0H105C113.28 0 120 6.72 120 15Z"
-                    fill="#0E2039"
-                  />
-                  <path
-                    d="M120 30V105C120 113.28 113.28 120 105 120H30C30 103.44 43.44 90 60 90C76.56 90 90 76.56 90 60C90 43.44 103.44 30 120 30Z"
-                    fill="white"
-                  />
-                </svg>
-                <h2>
-                  NxCloud
-                  <span> Enable faster CI & better DX </span>
-                </h2>
-              </div>
-              <p>You can activate distributed tasks executions and caching by running:</p>
-              <pre>nx connect-to-nx-cloud</pre>
-              <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer">
-                What is Nx Cloud?
-              </a>
-            </div>
-            <a
-              id="nx-repo"
-              class="button-pill rounded shadow"
-              href="https://github.com/nrwl/nx?utm_source=nx-project"
-              target="_blank"
-              rel="noreferrer"
-            >
-              <svg
-                fill="currentColor"
-                role="img"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
-                />
-              </svg>
-              <span>
-                Nx is open source
-                <span> Love Nx? Give us a star! </span>
-              </span>
-            </a>
-          </div>
-        </div>
-
-        <!--  COMMANDS  -->
-        <div id="commands" class="rounded shadow">
-          <h2>Next steps</h2>
-          <p>Here are some things you can do with Nx:</p>
-          <details>
-            <summary>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-                />
-              </svg>
-              Add UI library
-            </summary>
-            <pre><span># Generate UI lib</span>
-nx g @nx/angular:lib ui
-
-<span># Add a component</span>
-nx g @nx/angular:component button --project ui</pre>
-          </details>
-          <details>
-            <summary>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-                />
-              </svg>
-              View interactive project graph
-            </summary>
-            <pre>nx graph</pre>
-          </details>
-          <details>
-            <summary>
-              <svg
-                fill="none"
-                stroke="currentColor"
-                viewBox="0 0 24 24"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-                />
-              </svg>
-              Run affected commands
-            </summary>
-            <pre><span># see what&apos;s been affected by changes</span>
-nx affected:graph
-
-<span># run tests for current changes</span>
-nx affected:test
-
-<span># run e2e tests for current changes</span>
-nx affected:e2e</pre>
-          </details>
-        </div>
-
-        <p id="love">
-          Carefully crafted with
-          <svg
-            fill="currentColor"
-            stroke="none"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
-              d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"
-            />
-          </svg>
-        </p>
-      </div>
-    </div>
-  `,
-    styles: [],
-    encapsulation: ViewEncapsulation.None,
-    standalone: true,
-})
-export class NxWelcomeComponent {}
diff --git a/apps/schematic/app/src/assets/.gitkeep b/apps/schematic/app/src/assets/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/schematic/app/src/favicon.ico b/apps/schematic/app/src/favicon.ico
deleted file mode 100644
index 317ebcb2336e0833a22dddf0ab287849f26fda57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15086
zcmeI332;<p632UzfWZqabw#Bx7P_!_0dhki0VLs6ku&5D2}uYcfO5%@G2s;D7LY@f
zc(GokAnWR)DHUDuUROCpjmsH4pjZ`wkZ*te^4>U^%p|z7g|#(P)qFEA@4f!_@qOK2
z_lJl}!lhL!VT_U|uN7%8B2iKH??xhDa;*`g{yjTFWHvXn;2s{4R7kH|pKGdy(7z!K
zgftM+Ku7~24TLlh(!g)gz|foI94G^t2^IO$uvX$3(OR0<_5L2sB)lMAMy|+`xodJ{
z_Uh_1m)~h?a;2W{dmhM;u!YGo=)OdmId_B<%^V^{o<UMHeV`Og=_iGE^^rgN-XH8c
zcrSonhm1cBZ!ITAw2}V7o^`H|ik40(UF5*b;bPY1iFs&D4f>vI@y`7^g1_V9G}*f#
zNzA<oVrCB$Q*?(I_ibXP4UktS^^r?_?+^Ap7=Cnb(EW*on`_5Eu9uvb8!Jzxb`g^j
zEoNy(P#NAphQ^8mTQpjkC7Y1JEKU`3KQhc4A!g=KG1%Z+_pQ=17+(MDwc$@_BPT}I
zjelf*FFBSID`t2HG2{A(S({r!|7w#;sOaIb;$obLPn|>tvou}I!W1#{M^@ROc(BZ!
z+F!!_aR&Px3_reO(EW+TwlW~tv*2zr?iP7(d~a~yA|@*a89IUke+c472NXM0wiX{-
zl`UrZC^1XYyf%1u)-Y)jj9;MZ!SLfd2Hl?o|80Su%Z?To_=^g_Jt0oa#CT*tjx>BI
z16wec&AOWNK<#i0Qd=1O$fymLRoUR*%;h@*@v7}wApDl^w*h}!sYq%kw+DKDY)@&A
z@9$ULEB3qkR#85`lb8#WZw=@})#kQig9oqy^I$dj&k4jU&^2(M3q{n1AKeGUKPFbr
z1^<)aH;VsG@J|B&l>UtU#Ejv3GIqERzYgL@UOAWtW<{p#zy`WyJgpCy8$c_e%wYJL
zyGHRRx38)HyjU3y{-4z6)pzb>&Q1pR)B&u01F-|&Gx4EZWK$nkUkOI|(D4UHOXg_-
zw{OBf!oWQUn)Pe(=f=nt=zkmdjpO^o8ZZ9o_|4tW1ni+Un9iCW47*-ut$KQOww!;u
z`0q)$s6IZO!~9$e_P9X!hqLxu`fpcL|2f^I5d4*a@Dq28;@2271v_N+5HqYZ>x;&O
z05*7JT)mUe&%S0@UD)@&8SmQrMtsDfZT;fkdA!r(S=}Oz>iP)w=W508=Rc#nNn7ym
z1;42c|8($ALY8#a({%1#IXbWn9-Y|0eDY$_L&j{63?{?AH{);Ezcqf<!MFQ9x99b^
z@1DK4rAh7R(%7o_Ukrp_*B^iXAJs(~WJSwk+1;6+e)#eKWB7lW`oH?lRCGTU-%svF
zZa{1eHiz~4`%lFm`)1d&`Q<xTH!a_>ydD$@-B`Y3<%IIj7S7rK_N}je^=dEk%JQ4c
z!tBdTPE3Tse;oYF>cnrapWq*o)m47X1`~6@(!Y29#>-#8zm&LXrXa(3=7Z)ElaQqj
z-#0JJy3Fi(C#Rx(`=VXtJ63E2_bZGCz+QRa{W0e2(m3<b<R<WQnM~H@G~%P;$A5kX
zdr~m`<Zaga!@akqca}>sI?LOcUBx)~^YCqZ{XEPX)C>G>U4tfqeH8L(3|pQR*zbL1
zT9e~4Tb5p9_G}$y4t`i*4t_Mr9QYvL9C&Ah*}t`q*}S+VYh0M6GxTTSXI)hMpMpIq
zD1ImYqJLzbj0}~EpE-aH#VCH_udYEW#`P2zYmi&xSPs_{n6tBj=MY|-XrA;SGA_>y
zGtU$?HXm$gYj*!N)_nQ59%lQdXtQZS3*#PC-{iB_sm+ytD*7j`D*k(P&IH2GHT}Eh
z5697eQECVIGQAUe#eU2I!yI<zz;0~NQr|N^PTU%|61cC99Bv=_KdCmbW0yDoS&$NL
zmX1EpEE#=)nKLrdOzGz`6PQPeUwJD36mmpxeE`0zYQ<kQhbyqvzLfS-seXqK8MUG9
zLlxLyyuL#}xjn?4!rv0%QA-Z}Ik<a5n=IY4E@=+ED3w^9C}z%Zdk>&%0CP#>%6MWV
z@zS!p@+Y1i1b^QuuEF*1<Us0cJY(4nAF}4q=qekOvJQFo807!%A>3CuB<Ol`0^E7Z
zm%Qg1;_@p_?ztejY7aAu{Qn-^!+@VXn3b3498=%1e7}?I2TQ^o*He<VKf(OR$A_%>
zu69dve5k7&Wgb+^s|UB08Dr3u`h@yM0NTj4h7MnHo-4@xmyr7(*4$rpPwsCDZ@2be
zRz9V^GnV;;?^Lk%ynzq&K(Aix`mWmW`^152Hoy<pVuSh)79DeX%8W&6LDw72`#byI
zuiwcz>$CTYVehpD-S1-W^#k#{0^L`V6CN+<CFS_e7W_3E{FnMaufOZUZ|?(su|Y>E
z!w+xte;2vu4AmVNEFUOBmrBL>6MK@!O2*N|2=d|Y;oN&A&qv=qKn73lD<dYxNnd>D
zI(+oJAdgv>Yr}8(&@ZuAZE%XUXmX(U!N+Z_sjL<1vjy1R+1IeHt`79fnYdOL{$ci7
z%3f0A*;Zt@ED&Gjm|OFTYBDe%bbo*xXAQsFz+Q`fVBH!N2)kaxN8P$c>sp~QXnv>b
zwq=W3&Mtmih7xkR$YA)1Yi?avHNR6C99!u6fh=cL|KQ&PwF!n@ud^n(HNI<nwsH(x
z4qKM9iN6x;Git-Ge<QzeYkbrg?<<GKYW(VK;@<}TE9%0}y5!azL-V9+a#Y#me~G_7
z_y$7-P`)3H<9Cg?6G#?vr1r=#4jJ;1As-p?v4v7WW|z~i2L^g~=vqhvAq|8y5YoVz
z*MPA;B4>ImHD!h87!i*t?G|p0o+eelJ?B@A64_9%SBhNaJ64EvKgD&%LjLCYnNfc;
znj?%*p@*?dq#NqcQFmmX($wms@CSAr9#>hUR^=I+=<d%GUe;81{*2u{g^cHvbvMet
zq2G9w{o5J4+rJB|kH1xKEr1^d#X#P3T8;P-`h+wP(!lRV1LVP1Lc^g%o06y@-V_L6
z|LdjRj60+cXBkqdN2S;_lHZp*_b*D3i|<dAq12rcshK6-Jy4RVdtC4Q-G78<Kj;TY
z`wo@Xp1QRZ`QN9%Igij|bgX>0B)vvGX%T&#h$kmX*s=^M2E!@N9#m?LhMvz}YB+kd
zG~mbP|D(;{s_#;hsKK9lbVK&Lo734x7SIFJ9<NU=?g-!eQa_AcHCny_gVFO3=-?Ff
zpQ!;E+ZX-$+jXg8|7WNdWKr`tkx%U-6%4aR)Tn2E2!?mH{;IuaYG~T~e~tQ?w-)OE
zPW|o6Uu!aUe`l8Oy~y1R{-0{yNNcxwV92JHv^=wh9W0$_ZxbDS$2peXzVGq<4qx4$
zomY*&*0iVxQCs)&XP+Am{{`BU)INarGA2_)&ZdSk^|op@@Y(}^)ZXuX$RD&e2j7;^
zG=Kioa;ovC-VsBs;~V9#{ao!u<I@&~EHDJ>V_}2$@q?zm^7?*XH94w5Qae{7zOMUF
z^?%F%)c1Y)Q?Iy?I>kn<wOIXdo4@ulwHK&57|S*7*E_zrF3)A2E52%lFF*bMb!l%G
zy}qa;9}evE=KA)}jOrS348HHx%0F5%s4*N@{+9gIUXlNZB|rTz?W4}2#$2t3ivPX3
z;^uwd?pi$L&=(snEZ?=}lJcEvdLR7wt}*oM{;}o3)<4b5xYVk<BCnoLswTf}|6=yn
zO{sT$qO~)vo7wi?jQuw`_Me0u)ZZQ1b=2P*rZqIXUrRoE=(D-o%D3PDQTacMe%kl<
zgvuv8S5vbJvwBt9>w*8gYW#ok|2gdS=YYZLiD=CW|Nj;n^x!<jBV+M}EHEt_<tMvs
z2W)RP+<me6;Lp)!_m%->=S#iJ#`~Ld79+xXpVmUK^B(xO_vO!btA9y7w3L3-0j-y4
z?M-V{%z;JI`bk7yFDcP}OcCd*{Q9S5$iGA7*E1@tfkyjAi!;wP^O71cZ^Ep)qrQ)N
z#wqw0_HS;T7x3y|`P==i3hEwK%|>fZ)c&@kgKO1~5<5xBSk?iZV?KI6&i72H6S9A*
z=U(*e)EqEs?Oc04)V-~K5AUmh|62H4*`UAtItO$O(q5?6jj+K<YInKHn~#h06D6E4
zGY{ug$#47Kv+%ag8gORiMr412_5ZN7{xetf3<>^oD!04r=6#dsxp?~}{`?&sXn#q2
zGuY~7>O2=!u@@Kfu7q=W*4egu@qPMRM>(eyYyaIE<|j%d=iWNdGsx%c!902v#ngNg
z@#U-O_4xN$s_9?(`{>{>7~-6FgWpBpqXb`Ydc3OFL#&I}Irse9F_8R@4zSS*Y*o*B
zXL?6*Aw!AfkNCgcr#*yj&p3ZDe2y>v$>FUdKIy_2N~}6AbHc7gA3`6$g@1o|dE>vz
z4pl(j9;kyMsjaw}lO?(?Xg%4k!5%^<zlDDcygq_<+VnZ&Gf<7VJ+h6sSQqBwlV5;i
zCw{q${^Q$V`LF*641DyQ>t#@5n=WVc&JRa+XT$~#@rldv<HlfUj4u8F@xOCIpO6NA
zy#}i448i{`KGLeNxU7{aE~DpK>N3S1rEpU$;XgxVny7mki3<w%v}zUZDd^bHQ&8C5
zbEMEH-2)Zd6o`w~DKrp8LEbvW|DiWCr<+4vh%GJ2v8))B+*#`1mn3b-AEVjNSn-{>
z-Hh|jUCHrUXuLr!)`w>wgO0N%KTB-1di>cj(x3Ba<?I9X?CUltmc0Kh`u0bO`)SUz
zI`Zt(kjD0x$i3<j4=*8~D%HKjoCGVDSMdD5bnn34<pnTY=seGJdM@*6jf=!2>v`7v
z3G7EIbU$z>`Nad7Rk_&OT-W{;qg)-GXV-aJT#(o<Y^cxkn^`Yg6Fa`(`BTK_6MC*|
zK4(2Nm)J1vqV0R$o7U>zdmnA~Rq3GQ_3mby(>q6Ocb-RgTUhTN)))x>m&eD;$J5Bg
zo&DhY36Yg=J=$Z>t}RJ>o|@hAcwWzN#r(WJ52^g$lh^!63@hh+dR$&_dEGu&^CR*<
z!oFqSqO@>xZ*nC2oiOd0eS*F^IL~W-rsrO`J`ej{=ou_q^_(<$&-3f^<pOjU!=7&~
zXC+=DZ(jt~8+`R|WB7!1Jc_^TdE2d4ZXGA{9G&SoadMXW<Ql&A*O;WS@i_a$QF<>J
z&L^MSYWIe{&pYq&9eGaArA~*kA<MSpHuZ@k$zXI7$6|f&|Gj<JTB<KKxmBbwQL-^L
X*GBfq^a!*Sks)$E_17kl@BRM)`^nwN

diff --git a/apps/schematic/app/src/index.html b/apps/schematic/app/src/index.html
deleted file mode 100644
index 1de11a7ee8..0000000000
--- a/apps/schematic/app/src/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>Schematic App</title>
-    <base href="/" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"
-      rel="stylesheet"
-    />
-  </head>
-  <body>
-    <sagebionetworks-root></sagebionetworks-root>
-  </body>
-</html>
diff --git a/apps/schematic/app/src/main.ts b/apps/schematic/app/src/main.ts
deleted file mode 100644
index 17a5cd4e0a..0000000000
--- a/apps/schematic/app/src/main.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-
-platformBrowserDynamic()
-  .bootstrapModule(AppModule)
-  .catch((err) => console.error(err));
diff --git a/apps/schematic/app/src/proxy.conf.json b/apps/schematic/app/src/proxy.conf.json
deleted file mode 100644
index ff8f8401e4..0000000000
--- a/apps/schematic/app/src/proxy.conf.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "/api": {
-    "target": "http://localhost:7080/api/v1",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/api": ""
-    },
-    "logLevel": "debug"
-  }
-}
\ No newline at end of file
diff --git a/apps/schematic/app/src/styles.scss b/apps/schematic/app/src/styles.scss
deleted file mode 100644
index d597df74ce..0000000000
--- a/apps/schematic/app/src/styles.scss
+++ /dev/null
@@ -1 +0,0 @@
-@use 'app-theme';
diff --git a/apps/schematic/app/src/test-setup.ts b/apps/schematic/app/src/test-setup.ts
deleted file mode 100644
index 1100b3e8a6..0000000000
--- a/apps/schematic/app/src/test-setup.ts
+++ /dev/null
@@ -1 +0,0 @@
-import 'jest-preset-angular/setup-jest';
diff --git a/apps/schematic/app/tsconfig.app.json b/apps/schematic/app/tsconfig.app.json
deleted file mode 100644
index 58220429a4..0000000000
--- a/apps/schematic/app/tsconfig.app.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "types": []
-  },
-  "files": ["src/main.ts"],
-  "include": ["src/**/*.d.ts"],
-  "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
-}
diff --git a/apps/schematic/app/tsconfig.editor.json b/apps/schematic/app/tsconfig.editor.json
deleted file mode 100644
index 8ae117d962..0000000000
--- a/apps/schematic/app/tsconfig.editor.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["src/**/*.ts"],
-  "compilerOptions": {
-    "types": ["jest", "node"]
-  }
-}
diff --git a/apps/schematic/app/tsconfig.json b/apps/schematic/app/tsconfig.json
deleted file mode 100644
index e85865cf5b..0000000000
--- a/apps/schematic/app/tsconfig.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2022",
-    "useDefineForClassFields": false,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./tsconfig.editor.json"
-    }
-  ],
-  "extends": "../../../tsconfig.base.json",
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
-}
diff --git a/apps/schematic/app/tsconfig.spec.json b/apps/schematic/app/tsconfig.spec.json
deleted file mode 100644
index 875b121e84..0000000000
--- a/apps/schematic/app/tsconfig.spec.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "files": ["src/test-setup.ts"],
-  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
-}
diff --git a/libs/schematic/api-client-angular/.eslintrc.json b/libs/schematic/api-client-angular/.eslintrc.json
deleted file mode 100644
index eff08ecbe7..0000000000
--- a/libs/schematic/api-client-angular/.eslintrc.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "extends": ["../../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts"],
-      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-      "rules": {
-        "@angular-eslint/directive-selector": [
-          "error",
-          {
-            "type": "attribute",
-            "prefix": "schematic",
-            "style": "camelCase"
-          }
-        ],
-        "@angular-eslint/component-selector": [
-          "error",
-          {
-            "type": "element",
-            "prefix": "schematic",
-            "style": "kebab-case"
-          }
-        ]
-      }
-    },
-    {
-      "files": ["*.html"],
-      "extends": ["plugin:@nx/angular-template"],
-      "rules": {}
-    }
-  ]
-}
diff --git a/libs/schematic/api-client-angular/README.md b/libs/schematic/api-client-angular/README.md
deleted file mode 100644
index 15c128e5c2..0000000000
--- a/libs/schematic/api-client-angular/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# api-client-angular
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test api-client-angular` to execute the unit tests.
diff --git a/libs/schematic/api-client-angular/jest.config.ts b/libs/schematic/api-client-angular/jest.config.ts
deleted file mode 100644
index ef45fc4725..0000000000
--- a/libs/schematic/api-client-angular/jest.config.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'schematic-api-client-angular',
-  preset: '../../../jest.preset.js',
-  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {},
-  coverageDirectory: '../../../coverage/libs/schematic/api-client-angular',
-  transform: {
-    '^.+\\.(ts|mjs|js|html)$': [
-      'jest-preset-angular',
-      {
-        tsconfig: '<rootDir>/tsconfig.spec.json',
-        stringifyContentPathRegex: '\\.(html|svg)$',
-      },
-    ],
-  },
-  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
-  snapshotSerializers: [
-    'jest-preset-angular/build/serializers/no-ng-attributes',
-    'jest-preset-angular/build/serializers/ng-snapshot',
-    'jest-preset-angular/build/serializers/html-comment',
-  ],
-};
diff --git a/libs/schematic/api-client-angular/ng-package.json b/libs/schematic/api-client-angular/ng-package.json
deleted file mode 100644
index ec2a5998c3..0000000000
--- a/libs/schematic/api-client-angular/ng-package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../../dist/libs/schematic/api-client-angular",
-  "lib": {
-    "entryFile": "src/index.ts"
-  }
-}
diff --git a/libs/schematic/api-client-angular/openapitools.json b/libs/schematic/api-client-angular/openapitools.json
deleted file mode 100644
index 379204f1c4..0000000000
--- a/libs/schematic/api-client-angular/openapitools.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$schema": "../../../node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "6.1.0",
-    "generators": {
-      "api-client-angular": {
-        "config": "templates/config.yaml",
-        "generatorName": "typescript-angular",
-        "inputSpec": "#{cwd}/../api-description/build/openapi.yaml",
-        "output": "#{cwd}/src/lib/",
-        "templateDir": "templates",
-        "additionalProperties": {
-          "ngVersion": "14.2.11"
-        }
-      }
-    }
-  }
-}
diff --git a/libs/schematic/api-client-angular/package.json b/libs/schematic/api-client-angular/package.json
deleted file mode 100644
index 9df405cc19..0000000000
--- a/libs/schematic/api-client-angular/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "@sagebionetworks/schematic-api-client-angular",
-  "version": "0.0.1",
-  "peerDependencies": {
-    "@angular/common": "^13.2.0",
-    "@angular/core": "^13.2.0"
-  },
-  "dependencies": {
-    "tslib": "2.4.1"
-  }
-}
diff --git a/libs/schematic/api-client-angular/project.json b/libs/schematic/api-client-angular/project.json
deleted file mode 100644
index 595cb5043f..0000000000
--- a/libs/schematic/api-client-angular/project.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "schematic-api-client-angular",
-  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/schematic/api-client-angular/src",
-  "projectType": "library",
-  "prefix": "schematic",
-  "targets": {
-    "build": {
-      "executor": "@nx/angular:ng-packagr-lite",
-      "outputs": ["{workspaceRoot}/dist/libs/schematic/api-client-angular"],
-      "options": {
-        "project": "libs/schematic/api-client-angular/ng-package.json",
-        "updateBuildableProjectDepsInPackageJson": true
-      },
-      "configurations": {
-        "production": {
-          "tsConfig": "libs/schematic/api-client-angular/tsconfig.lib.prod.json"
-        },
-        "development": {
-          "tsConfig": "libs/schematic/api-client-angular/tsconfig.lib.json"
-        }
-      },
-      "defaultConfiguration": "production"
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/libs/schematic/api-client-angular"],
-      "options": {
-        "jestConfig": "libs/schematic/api-client-angular/jest.config.ts",
-        "passWithNoTests": true
-      }
-    },
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["libs/schematic/api-client-angular/src/index.ts"]
-      }
-    },
-    "lint-fix": {
-      "executor": "@nx/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["libs/schematic/api-client-angular/src/index.ts"],
-        "fix": true
-      }
-    },
-    "generate": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "rm -fr src/lib/*",
-          "openapi-generator-cli generate",
-          "echo 'TODO Format generated code'"
-        ],
-        "cwd": "{projectRoot}",
-        "parallel": false
-      },
-      "dependsOn": ["^build"]
-    }
-  },
-  "tags": ["language:typescript"],
-  "implicitDependencies": ["schematic-api-description"]
-}
diff --git a/libs/schematic/api-client-angular/src/index.ts b/libs/schematic/api-client-angular/src/index.ts
deleted file mode 100644
index f41a696fd2..0000000000
--- a/libs/schematic/api-client-angular/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './lib';
diff --git a/libs/schematic/api-client-angular/src/lib/.gitignore b/libs/schematic/api-client-angular/src/lib/.gitignore
deleted file mode 100644
index 149b576547..0000000000
--- a/libs/schematic/api-client-angular/src/lib/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-wwwroot/*.js
-node_modules
-typings
-dist
diff --git a/libs/schematic/api-client-angular/src/lib/.openapi-generator-ignore b/libs/schematic/api-client-angular/src/lib/.openapi-generator-ignore
deleted file mode 100644
index 7484ee590a..0000000000
--- a/libs/schematic/api-client-angular/src/lib/.openapi-generator-ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
diff --git a/libs/schematic/api-client-angular/src/lib/.openapi-generator/FILES b/libs/schematic/api-client-angular/src/lib/.openapi-generator/FILES
deleted file mode 100644
index 961c2c0e3b..0000000000
--- a/libs/schematic/api-client-angular/src/lib/.openapi-generator/FILES
+++ /dev/null
@@ -1,17 +0,0 @@
-.gitignore
-README.md
-api.module.ts
-api/api.ts
-api/storage.service.ts
-configuration.ts
-encoder.ts
-git_push.sh
-index.ts
-model/basicError.ts
-model/dataset.ts
-model/datasetsPage.ts
-model/datasetsPageAllOf.ts
-model/models.ts
-model/pageMetadata.ts
-param.ts
-variables.ts
diff --git a/libs/schematic/api-client-angular/src/lib/.openapi-generator/VERSION b/libs/schematic/api-client-angular/src/lib/.openapi-generator/VERSION
deleted file mode 100644
index 358e78e607..0000000000
--- a/libs/schematic/api-client-angular/src/lib/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-6.1.0
\ No newline at end of file
diff --git a/libs/schematic/api-client-angular/src/lib/README.md b/libs/schematic/api-client-angular/src/lib/README.md
deleted file mode 100644
index de16f95a8b..0000000000
--- a/libs/schematic/api-client-angular/src/lib/README.md
+++ /dev/null
@@ -1,226 +0,0 @@
-## @
-
-### Building
-
-To install the required dependencies and to build the typescript sources run:
-```
-npm install
-npm run build
-```
-
-### publishing
-
-First build the package then run ```npm publish dist``` (don't forget to specify the `dist` folder!)
-
-### consuming
-
-Navigate to the folder of your consuming project and run one of next commands.
-
-_published:_
-
-```
-npm install @ --save
-```
-
-_without publishing (not recommended):_
-
-```
-npm install PATH_TO_GENERATED_PACKAGE/dist.tgz --save
-```
-
-_It's important to take the tgz file, otherwise you'll get trouble with links on windows_
-
-_using `npm link`:_
-
-In PATH_TO_GENERATED_PACKAGE/dist:
-```
-npm link
-```
-
-In your project:
-```
-npm link 
-```
-
-__Note for Windows users:__ The Angular CLI has troubles to use linked npm packages.
-Please refer to this issue https://github.com/angular/angular-cli/issues/8284 for a solution / workaround.
-Published packages are not effected by this issue.
-
-
-#### General usage
-
-In your Angular project:
-
-
-```
-// without configuring providers
-import { ApiModule } from '';
-import { HttpClientModule } from '@angular/common/http';
-
-@NgModule({
-    imports: [
-        ApiModule,
-        // make sure to import the HttpClientModule in the AppModule only,
-        // see https://github.com/angular/angular/issues/20575
-        HttpClientModule
-    ],
-    declarations: [ AppComponent ],
-    providers: [],
-    bootstrap: [ AppComponent ]
-})
-export class AppModule {}
-```
-
-```
-// configuring providers
-import { ApiModule, Configuration, ConfigurationParameters } from '';
-
-export function apiConfigFactory (): Configuration {
-  const params: ConfigurationParameters = {
-    // set configuration parameters here.
-  }
-  return new Configuration(params);
-}
-
-@NgModule({
-    imports: [ ApiModule.forRoot(apiConfigFactory) ],
-    declarations: [ AppComponent ],
-    providers: [],
-    bootstrap: [ AppComponent ]
-})
-export class AppModule {}
-```
-
-```
-// configuring providers with an authentication service that manages your access tokens
-import { ApiModule, Configuration } from '';
-
-@NgModule({
-    imports: [ ApiModule ],
-    declarations: [ AppComponent ],
-    providers: [
-      {
-        provide: Configuration,
-        useFactory: (authService: AuthService) => new Configuration(
-          {
-            basePath: environment.apiUrl,
-            accessToken: authService.getAccessToken.bind(authService)
-          }
-        ),
-        deps: [AuthService],
-        multi: false
-      }
-    ],
-    bootstrap: [ AppComponent ]
-})
-export class AppModule {}
-```
-
-```
-import { DefaultApi } from '';
-
-export class AppComponent {
-    constructor(private apiGateway: DefaultApi) { }
-}
-```
-
-Note: The ApiModule is restricted to being instantiated once app wide.
-This is to ensure that all services are treated as singletons.
-
-#### Using multiple OpenAPI files / APIs / ApiModules
-In order to use multiple `ApiModules` generated from different OpenAPI files,
-you can create an alias name when importing the modules
-in order to avoid naming conflicts:
-```
-import { ApiModule } from 'my-api-path';
-import { ApiModule as OtherApiModule } from 'my-other-api-path';
-import { HttpClientModule } from '@angular/common/http';
-
-@NgModule({
-  imports: [
-    ApiModule,
-    OtherApiModule,
-    // make sure to import the HttpClientModule in the AppModule only,
-    // see https://github.com/angular/angular/issues/20575
-    HttpClientModule
-  ]
-})
-export class AppModule {
-
-}
-```
-
-
-### Set service base path
-If different than the generated base path, during app bootstrap, you can provide the base path to your service.
-
-```
-import { BASE_PATH } from '';
-
-bootstrap(AppComponent, [
-    { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
-]);
-```
-or
-
-```
-import { BASE_PATH } from '';
-
-@NgModule({
-    imports: [],
-    declarations: [ AppComponent ],
-    providers: [ provide: BASE_PATH, useValue: 'https://your-web-service.com' ],
-    bootstrap: [ AppComponent ]
-})
-export class AppModule {}
-```
-
-
-#### Using @angular/cli
-First extend your `src/environments/*.ts` files by adding the corresponding base path:
-
-```
-export const environment = {
-  production: false,
-  API_BASE_PATH: 'http://127.0.0.1:8080'
-};
-```
-
-In the src/app/app.module.ts:
-```
-import { BASE_PATH } from '';
-import { environment } from '../environments/environment';
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [ ],
-  providers: [{ provide: BASE_PATH, useValue: environment.API_BASE_PATH }],
-  bootstrap: [ AppComponent ]
-})
-export class AppModule { }
-```
-
-### Customizing path parameter encoding
-
-Without further customization, only [path-parameters][parameter-locations-url] of [style][style-values-url] 'simple'
-and Dates for format 'date-time' are encoded correctly.
-
-Other styles (e.g. "matrix") are not that easy to encode
-and thus are best delegated to other libraries (e.g.: [@honoluluhenk/http-param-expander]).
-
-To implement your own parameter encoding (or call another library),
-pass an arrow-function or method-reference to the `encodeParam` property of the Configuration-object
-(see [General Usage](#general-usage) above).
-
-Example value for use in your Configuration-Provider:
-```typescript
-new Configuration({
-    encodeParam: (param: Param) => myFancyParamEncoder(param),
-})
-```
-
-[parameter-locations-url]: https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#parameter-locations
-[style-values-url]: https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#style-values
-[@honoluluhenk/http-param-expander]: https://www.npmjs.com/package/@honoluluhenk/http-param-expander
diff --git a/libs/schematic/api-client-angular/src/lib/api.module.ts b/libs/schematic/api-client-angular/src/lib/api.module.ts
deleted file mode 100644
index 798cd969cd..0000000000
--- a/libs/schematic/api-client-angular/src/lib/api.module.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core';
-import { Configuration } from './configuration';
-import { HttpClient } from '@angular/common/http';
-
-import { StorageService } from './api/storage.service';
-
-@NgModule({
-  imports:      [],
-  declarations: [],
-  exports:      [],
-  providers: []
-})
-export class ApiModule {
-    public static forRoot(configurationFactory: () => Configuration): ModuleWithProviders<ApiModule> {
-        return {
-            ngModule: ApiModule,
-            providers: [ { provide: Configuration, useFactory: configurationFactory } ]
-        };
-    }
-
-    constructor( @Optional() @SkipSelf() parentModule: ApiModule,
-                 @Optional() http: HttpClient) {
-        if (parentModule) {
-            throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
-        }
-        if (!http) {
-            throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
-            'See also https://github.com/angular/angular/issues/20575');
-        }
-    }
-}
diff --git a/libs/schematic/api-client-angular/src/lib/api/api.ts b/libs/schematic/api-client-angular/src/lib/api/api.ts
deleted file mode 100644
index c8f50e8b33..0000000000
--- a/libs/schematic/api-client-angular/src/lib/api/api.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './storage.service';
-import { StorageService } from './storage.service';
-export const APIS = [StorageService];
diff --git a/libs/schematic/api-client-angular/src/lib/api/storage.service.ts b/libs/schematic/api-client-angular/src/lib/api/storage.service.ts
deleted file mode 100644
index d5d1241f93..0000000000
--- a/libs/schematic/api-client-angular/src/lib/api/storage.service.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Schematic REST API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.1.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-/* tslint:disable:no-unused-variable member-ordering */
-
-import { Inject, Injectable, Optional }                      from '@angular/core';
-import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
-        }       from '@angular/common/http';
-import { CustomHttpParameterCodec }                          from '../encoder';
-import { Observable }                                        from 'rxjs';
-
-// @ts-ignore
-import { BasicError } from '../model/basicError';
-// @ts-ignore
-import { DatasetsPage } from '../model/datasetsPage';
-
-// @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
-import { Configuration }                                     from '../configuration';
-
-
-
-@Injectable({
-  providedIn: 'root'
-})
-export class StorageService {
-
-    protected basePath = 'http://localhost/api/v1';
-    public defaultHeaders = new HttpHeaders();
-    public configuration = new Configuration();
-    public encoder: HttpParameterCodec;
-
-    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string|string[], @Optional() configuration: Configuration) {
-        if (configuration) {
-            this.configuration = configuration;
-        }
-        if (typeof this.configuration.basePath !== 'string') {
-            if (Array.isArray(basePath) && basePath.length > 0) {
-                basePath = basePath[0];
-            }
-
-            if (typeof basePath !== 'string') {
-                basePath = this.basePath;
-            }
-            this.configuration.basePath = basePath;
-        }
-        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
-    }
-
-
-    // @ts-ignore
-    private addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams {
-        if (typeof value === "object" && value instanceof Date === false) {
-            httpParams = this.addToHttpParamsRecursive(httpParams, value);
-        } else {
-            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
-        }
-        return httpParams;
-    }
-
-    private addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string): HttpParams {
-        if (value == null) {
-            return httpParams;
-        }
-
-        if (typeof value === "object") {
-            if (Array.isArray(value)) {
-                (value as any[]).forEach( elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
-            } else if (value instanceof Date) {
-                if (key != null) {
-                    httpParams = httpParams.append(key, (value as Date).toISOString().substr(0, 10));
-                } else {
-                   throw Error("key may not be null if value is Date");
-                }
-            } else {
-                Object.keys(value).forEach( k => httpParams = this.addToHttpParamsRecursive(
-                    httpParams, value[k], key != null ? `${key}[${k}]` : k));
-            }
-        } else if (key != null) {
-            httpParams = httpParams.append(key, value);
-        } else {
-            throw Error("key may not be null if value is not object or array");
-        }
-        return httpParams;
-    }
-
-    /**
-     * Gets all datasets in folder under a given storage project that the current user has access to.
-     * Gets all datasets in folder under a given storage project that the current user has access to.
-     * @param projectId The Synapse ID of a storage project.
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public listStorageProjectDatasets(projectId: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json' | 'application/problem+json', context?: HttpContext}): Observable<DatasetsPage>;
-    public listStorageProjectDatasets(projectId: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json' | 'application/problem+json', context?: HttpContext}): Observable<HttpResponse<DatasetsPage>>;
-    public listStorageProjectDatasets(projectId: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json' | 'application/problem+json', context?: HttpContext}): Observable<HttpEvent<DatasetsPage>>;
-    public listStorageProjectDatasets(projectId: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json' | 'application/problem+json', context?: HttpContext}): Observable<any> {
-        if (projectId === null || projectId === undefined) {
-            throw new Error('Required parameter projectId was null or undefined when calling listStorageProjectDatasets.');
-        }
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json',
-                'application/problem+json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/storages/projects/${this.configuration.encodeParam({name: "projectId", value: projectId, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}/datasets`;
-        return this.httpClient.get<DatasetsPage>(`${this.configuration.basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-}
diff --git a/libs/schematic/api-client-angular/src/lib/configuration.ts b/libs/schematic/api-client-angular/src/lib/configuration.ts
deleted file mode 100644
index d38a4c153f..0000000000
--- a/libs/schematic/api-client-angular/src/lib/configuration.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { HttpParameterCodec } from '@angular/common/http';
-import { Param } from './param';
-
-export interface ConfigurationParameters {
-    /**
-     *  @deprecated Since 5.0. Use credentials instead
-     */
-    apiKeys?: {[ key: string ]: string};
-    username?: string;
-    password?: string;
-    /**
-     *  @deprecated Since 5.0. Use credentials instead
-     */
-    accessToken?: string | (() => string);
-    basePath?: string;
-    withCredentials?: boolean;
-    /**
-     * Takes care of encoding query- and form-parameters.
-     */
-    encoder?: HttpParameterCodec;
-    /**
-     * Override the default method for encoding path parameters in various
-     * <a href="https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#style-values">styles</a>.
-     * <p>
-     * See {@link README.md} for more details
-     * </p>
-     */
-    encodeParam?: (param: Param) => string;
-    /**
-     * The keys are the names in the securitySchemes section of the OpenAPI
-     * document. They should map to the value used for authentication
-     * minus any standard prefixes such as 'Basic' or 'Bearer'.
-     */
-    credentials?: {[ key: string ]: string | (() => string | undefined)};
-}
-
-export class Configuration {
-    /**
-     *  @deprecated Since 5.0. Use credentials instead
-     */
-    apiKeys?: {[ key: string ]: string};
-    username?: string;
-    password?: string;
-    /**
-     *  @deprecated Since 5.0. Use credentials instead
-     */
-    accessToken?: string | (() => string);
-    basePath?: string;
-    withCredentials?: boolean;
-    /**
-     * Takes care of encoding query- and form-parameters.
-     */
-    encoder?: HttpParameterCodec;
-    /**
-     * Encoding of various path parameter
-     * <a href="https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#style-values">styles</a>.
-     * <p>
-     * See {@link README.md} for more details
-     * </p>
-     */
-    encodeParam: (param: Param) => string;
-    /**
-     * The keys are the names in the securitySchemes section of the OpenAPI
-     * document. They should map to the value used for authentication
-     * minus any standard prefixes such as 'Basic' or 'Bearer'.
-     */
-    credentials: {[ key: string ]: string | (() => string | undefined)};
-
-    constructor(configurationParameters: ConfigurationParameters = {}) {
-        this.apiKeys = configurationParameters.apiKeys;
-        this.username = configurationParameters.username;
-        this.password = configurationParameters.password;
-        this.accessToken = configurationParameters.accessToken;
-        this.basePath = configurationParameters.basePath;
-        this.withCredentials = configurationParameters.withCredentials;
-        this.encoder = configurationParameters.encoder;
-        if (configurationParameters.encodeParam) {
-            this.encodeParam = configurationParameters.encodeParam;
-        }
-        else {
-            this.encodeParam = param => this.defaultEncodeParam(param);
-        }
-        if (configurationParameters.credentials) {
-            this.credentials = configurationParameters.credentials;
-        }
-        else {
-            this.credentials = {};
-        }
-    }
-
-    /**
-     * Select the correct content-type to use for a request.
-     * Uses {@link Configuration#isJsonMime} to determine the correct content-type.
-     * If no content type is found return the first found type if the contentTypes is not empty
-     * @param contentTypes - the array of content types that are available for selection
-     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
-     */
-    public selectHeaderContentType (contentTypes: string[]): string | undefined {
-        if (contentTypes.length === 0) {
-            return undefined;
-        }
-
-        const type = contentTypes.find((x: string) => this.isJsonMime(x));
-        if (type === undefined) {
-            return contentTypes[0];
-        }
-        return type;
-    }
-
-    /**
-     * Select the correct accept content-type to use for a request.
-     * Uses {@link Configuration#isJsonMime} to determine the correct accept content-type.
-     * If no content type is found return the first found type if the contentTypes is not empty
-     * @param accepts - the array of content types that are available for selection.
-     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
-     */
-    public selectHeaderAccept(accepts: string[]): string | undefined {
-        if (accepts.length === 0) {
-            return undefined;
-        }
-
-        const type = accepts.find((x: string) => this.isJsonMime(x));
-        if (type === undefined) {
-            return accepts[0];
-        }
-        return type;
-    }
-
-    /**
-     * Check if the given MIME is a JSON MIME.
-     * JSON MIME examples:
-     *   application/json
-     *   application/json; charset=UTF8
-     *   APPLICATION/JSON
-     *   application/vnd.company+json
-     * @param mime - MIME (Multipurpose Internet Mail Extensions)
-     * @return True if the given MIME is JSON, false otherwise.
-     */
-    public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
-        return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
-    }
-
-    public lookupCredential(key: string): string | undefined {
-        const value = this.credentials[key];
-        return typeof value === 'function'
-            ? value()
-            : value;
-    }
-
-    private defaultEncodeParam(param: Param): string {
-        // This implementation exists as fallback for missing configuration
-        // and for backwards compatibility to older typescript-angular generator versions.
-        // It only works for the 'simple' parameter style.
-        // Date-handling only works for the 'date-time' format.
-        // All other styles and Date-formats are probably handled incorrectly.
-        //
-        // But: if that's all you need (i.e.: the most common use-case): no need for customization!
-
-        const value = param.dataFormat === 'date-time'
-            ? (param.value as Date).toISOString()
-            : param.value;
-
-        return encodeURIComponent(String(value));
-    }
-}
diff --git a/libs/schematic/api-client-angular/src/lib/encoder.ts b/libs/schematic/api-client-angular/src/lib/encoder.ts
deleted file mode 100644
index 138c4d5cf2..0000000000
--- a/libs/schematic/api-client-angular/src/lib/encoder.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { HttpParameterCodec } from '@angular/common/http';
-
-/**
- * Custom HttpParameterCodec
- * Workaround for https://github.com/angular/angular/issues/18261
- */
-export class CustomHttpParameterCodec implements HttpParameterCodec {
-    encodeKey(k: string): string {
-        return encodeURIComponent(k);
-    }
-    encodeValue(v: string): string {
-        return encodeURIComponent(v);
-    }
-    decodeKey(k: string): string {
-        return decodeURIComponent(k);
-    }
-    decodeValue(v: string): string {
-        return decodeURIComponent(v);
-    }
-}
diff --git a/libs/schematic/api-client-angular/src/lib/git_push.sh b/libs/schematic/api-client-angular/src/lib/git_push.sh
deleted file mode 100644
index f53a75d4fa..0000000000
--- a/libs/schematic/api-client-angular/src/lib/git_push.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
-#
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
-
-git_user_id=$1
-git_repo_id=$2
-release_note=$3
-git_host=$4
-
-if [ "$git_host" = "" ]; then
-    git_host="github.com"
-    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
-fi
-
-if [ "$git_user_id" = "" ]; then
-    git_user_id="GIT_USER_ID"
-    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
-fi
-
-if [ "$git_repo_id" = "" ]; then
-    git_repo_id="GIT_REPO_ID"
-    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
-fi
-
-if [ "$release_note" = "" ]; then
-    release_note="Minor update"
-    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
-fi
-
-# Initialize the local directory as a Git repository
-git init
-
-# Adds the files in the local repository and stages them for commit.
-git add .
-
-# Commits the tracked changes and prepares them to be pushed to a remote repository.
-git commit -m "$release_note"
-
-# Sets the new remote
-git_remote=$(git remote)
-if [ "$git_remote" = "" ]; then # git remote not defined
-
-    if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
-    else
-        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
-    fi
-
-fi
-
-git pull origin master
-
-# Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
-git push origin master 2>&1 | grep -v 'To https'
diff --git a/libs/schematic/api-client-angular/src/lib/index.ts b/libs/schematic/api-client-angular/src/lib/index.ts
deleted file mode 100644
index 104dd3d21e..0000000000
--- a/libs/schematic/api-client-angular/src/lib/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './api/api';
-export * from './model/models';
-export * from './variables';
-export * from './configuration';
-export * from './api.module';
-export * from './param';
diff --git a/libs/schematic/api-client-angular/src/lib/model/basicError.ts b/libs/schematic/api-client-angular/src/lib/model/basicError.ts
deleted file mode 100644
index 02644e26f0..0000000000
--- a/libs/schematic/api-client-angular/src/lib/model/basicError.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Schematic REST API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.1.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-/**
- * Problem details (tools.ietf.org/html/rfc7807)
- */
-export interface BasicError { 
-    /**
-     * A human readable documentation for the problem type
-     */
-    title: string;
-    /**
-     * The HTTP status code
-     */
-    status: number;
-    /**
-     * A human readable explanation specific to this occurrence of the problem
-     */
-    detail?: string;
-    /**
-     * An absolute URI that identifies the problem type
-     */
-    type?: string;
-}
-
diff --git a/libs/schematic/api-client-angular/src/lib/model/dataset.ts b/libs/schematic/api-client-angular/src/lib/model/dataset.ts
deleted file mode 100644
index ab8a86fd8b..0000000000
--- a/libs/schematic/api-client-angular/src/lib/model/dataset.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Schematic REST API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.1.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-/**
- * A dataset.
- */
-export interface Dataset { 
-    /**
-     * The name of the dataset.
-     */
-    name: string;
-}
-
diff --git a/libs/schematic/api-client-angular/src/lib/model/datasetsPage.ts b/libs/schematic/api-client-angular/src/lib/model/datasetsPage.ts
deleted file mode 100644
index 6e0bc64151..0000000000
--- a/libs/schematic/api-client-angular/src/lib/model/datasetsPage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Schematic REST API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.1.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import { Dataset } from './dataset';
-
-
-/**
- * A page of datasets.
- */
-export interface DatasetsPage { 
-    /**
-     * The page number.
-     */
-    number: number;
-    /**
-     * The number of items in a single page.
-     */
-    size: number;
-    /**
-     * Total number of elements in the result set.
-     */
-    totalElements: number;
-    /**
-     * Total number of pages in the result set.
-     */
-    totalPages: number;
-    /**
-     * Returns if there is a next page.
-     */
-    hasNext: boolean;
-    /**
-     * Returns if there is a previous page.
-     */
-    hasPrevious: boolean;
-    /**
-     * A list of datasets.
-     */
-    datasets: Array<Dataset>;
-}
-
diff --git a/libs/schematic/api-client-angular/src/lib/model/datasetsPageAllOf.ts b/libs/schematic/api-client-angular/src/lib/model/datasetsPageAllOf.ts
deleted file mode 100644
index 8b3b08b03a..0000000000
--- a/libs/schematic/api-client-angular/src/lib/model/datasetsPageAllOf.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Schematic REST API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.1.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-import { Dataset } from './dataset';
-
-
-export interface DatasetsPageAllOf { 
-    /**
-     * A list of datasets.
-     */
-    datasets: Array<Dataset>;
-}
-
diff --git a/libs/schematic/api-client-angular/src/lib/model/models.ts b/libs/schematic/api-client-angular/src/lib/model/models.ts
deleted file mode 100644
index 746dc1c2b9..0000000000
--- a/libs/schematic/api-client-angular/src/lib/model/models.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './basicError';
-export * from './dataset';
-export * from './datasetsPage';
-export * from './datasetsPageAllOf';
-export * from './pageMetadata';
diff --git a/libs/schematic/api-client-angular/src/lib/model/pageMetadata.ts b/libs/schematic/api-client-angular/src/lib/model/pageMetadata.ts
deleted file mode 100644
index 10a2eb8701..0000000000
--- a/libs/schematic/api-client-angular/src/lib/model/pageMetadata.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Schematic REST API
- * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
- *
- * The version of the OpenAPI document: 0.1.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-/**
- * The metadata of a page.
- */
-export interface PageMetadata { 
-    /**
-     * The page number.
-     */
-    number: number;
-    /**
-     * The number of items in a single page.
-     */
-    size: number;
-    /**
-     * Total number of elements in the result set.
-     */
-    totalElements: number;
-    /**
-     * Total number of pages in the result set.
-     */
-    totalPages: number;
-    /**
-     * Returns if there is a next page.
-     */
-    hasNext: boolean;
-    /**
-     * Returns if there is a previous page.
-     */
-    hasPrevious: boolean;
-}
-
diff --git a/libs/schematic/api-client-angular/src/lib/param.ts b/libs/schematic/api-client-angular/src/lib/param.ts
deleted file mode 100644
index 78a2d20a64..0000000000
--- a/libs/schematic/api-client-angular/src/lib/param.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Standard parameter styles defined by OpenAPI spec
- */
-export type StandardParamStyle =
-  | 'matrix'
-  | 'label'
-  | 'form'
-  | 'simple'
-  | 'spaceDelimited'
-  | 'pipeDelimited'
-  | 'deepObject'
-  ;
-
-/**
- * The OpenAPI standard {@link StandardParamStyle}s may be extended by custom styles by the user.
- */
-export type ParamStyle = StandardParamStyle | string;
-
-/**
- * Standard parameter locations defined by OpenAPI spec
- */
-export type ParamLocation = 'query' | 'header' | 'path' | 'cookie';
-
-/**
- * Standard types as defined in <a href="https://swagger.io/specification/#data-types">OpenAPI Specification: Data Types</a>
- */
-export type StandardDataType =
-  | "integer"
-  | "number"
-  | "boolean"
-  | "string"
-  | "object"
-  | "array"
-  ;
-
-/**
- * Standard {@link DataType}s plus your own types/classes.
- */
-export type DataType = StandardDataType | string;
-
-/**
- * Standard formats as defined in <a href="https://swagger.io/specification/#data-types">OpenAPI Specification: Data Types</a>
- */
-export type StandardDataFormat =
-  | "int32"
-  | "int64"
-  | "float"
-  | "double"
-  | "byte"
-  | "binary"
-  | "date"
-  | "date-time"
-  | "password"
-  ;
-
-export type DataFormat = StandardDataFormat | string;
-
-/**
- * The parameter to encode.
- */
-export interface Param {
-  name: string;
-  value: unknown;
-  in: ParamLocation;
-  style: ParamStyle,
-  explode: boolean;
-  dataType: DataType;
-  dataFormat: DataFormat | undefined;
-}
diff --git a/libs/schematic/api-client-angular/src/lib/variables.ts b/libs/schematic/api-client-angular/src/lib/variables.ts
deleted file mode 100644
index 6fe58549f3..0000000000
--- a/libs/schematic/api-client-angular/src/lib/variables.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { InjectionToken } from '@angular/core';
-
-export const BASE_PATH = new InjectionToken<string>('basePath');
-export const COLLECTION_FORMATS = {
-    'csv': ',',
-    'tsv': '   ',
-    'ssv': ' ',
-    'pipes': '|'
-}
diff --git a/libs/schematic/api-client-angular/src/test-setup.ts b/libs/schematic/api-client-angular/src/test-setup.ts
deleted file mode 100644
index 1100b3e8a6..0000000000
--- a/libs/schematic/api-client-angular/src/test-setup.ts
+++ /dev/null
@@ -1 +0,0 @@
-import 'jest-preset-angular/setup-jest';
diff --git a/libs/schematic/api-client-angular/templates/api.module.mustache b/libs/schematic/api-client-angular/templates/api.module.mustache
deleted file mode 100644
index 428af5e48b..0000000000
--- a/libs/schematic/api-client-angular/templates/api.module.mustache
+++ /dev/null
@@ -1,37 +0,0 @@
-import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core';
-import { {{configurationClassName}} } from './configuration';
-import { HttpClient } from '@angular/common/http';
-
-{{#apiInfo}}
-{{#apis}}
-import { {{classname}} } from './{{importPath}}';
-{{/apis}}
-{{/apiInfo}}
-
-@NgModule({
-  imports:      [],
-  declarations: [],
-  exports:      [],
-  providers: [{{#isProvidedInNone}}
-    {{#apiInfo}}{{#apis}}{{classname}}{{^-last}},
-    {{/-last}}{{/apis}}{{/apiInfo}} {{/isProvidedInNone}}]
-})
-export class {{apiModuleClassName}} {
-    public static forRoot(configurationFactory: () => {{configurationClassName}}): ModuleWithProviders{{#enforceGenericModuleWithProviders}}<{{apiModuleClassName}}>{{/enforceGenericModuleWithProviders}} {
-        return {
-            ngModule: {{apiModuleClassName}},
-            providers: [ { provide: {{configurationClassName}}, useFactory: configurationFactory } ]
-        };
-    }
-
-    constructor( @Optional() @SkipSelf() parentModule: {{apiModuleClassName}},
-                 @Optional() http: HttpClient) {
-        if (parentModule) {
-            throw new Error('{{apiModuleClassName}} is already loaded. Import in your base AppModule only.');
-        }
-        if (!http) {
-            throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
-            'See also https://github.com/angular/angular/issues/20575');
-        }
-    }
-}
diff --git a/libs/schematic/api-client-angular/templates/config.yaml b/libs/schematic/api-client-angular/templates/config.yaml
deleted file mode 100644
index 756c6c3f01..0000000000
--- a/libs/schematic/api-client-angular/templates/config.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-templateDir: templates
-additionalProperties:
-  queryParamObjectFormat: key
diff --git a/libs/schematic/api-client-angular/templates/v6.1.x/api.module.mustache b/libs/schematic/api-client-angular/templates/v6.1.x/api.module.mustache
deleted file mode 100644
index 428af5e48b..0000000000
--- a/libs/schematic/api-client-angular/templates/v6.1.x/api.module.mustache
+++ /dev/null
@@ -1,37 +0,0 @@
-import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core';
-import { {{configurationClassName}} } from './configuration';
-import { HttpClient } from '@angular/common/http';
-
-{{#apiInfo}}
-{{#apis}}
-import { {{classname}} } from './{{importPath}}';
-{{/apis}}
-{{/apiInfo}}
-
-@NgModule({
-  imports:      [],
-  declarations: [],
-  exports:      [],
-  providers: [{{#isProvidedInNone}}
-    {{#apiInfo}}{{#apis}}{{classname}}{{^-last}},
-    {{/-last}}{{/apis}}{{/apiInfo}} {{/isProvidedInNone}}]
-})
-export class {{apiModuleClassName}} {
-    public static forRoot(configurationFactory: () => {{configurationClassName}}): ModuleWithProviders{{#enforceGenericModuleWithProviders}}<{{apiModuleClassName}}>{{/enforceGenericModuleWithProviders}} {
-        return {
-            ngModule: {{apiModuleClassName}},
-            providers: [ { provide: {{configurationClassName}}, useFactory: configurationFactory } ]
-        };
-    }
-
-    constructor( @Optional() @SkipSelf() parentModule: {{apiModuleClassName}},
-                 @Optional() http: HttpClient) {
-        if (parentModule) {
-            throw new Error('{{apiModuleClassName}} is already loaded. Import in your base AppModule only.');
-        }
-        if (!http) {
-            throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
-            'See also https://github.com/angular/angular/issues/20575');
-        }
-    }
-}
diff --git a/libs/schematic/api-client-angular/tools/pull-templates.sh b/libs/schematic/api-client-angular/tools/pull-templates.sh
deleted file mode 100755
index 84cde04f6b..0000000000
--- a/libs/schematic/api-client-angular/tools/pull-templates.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-openapiGeneratorVersion="6.1.x"
-destinationFolder="${PWD}/templates/v${openapiGeneratorVersion}"
-
-mkdir -p "${destinationFolder}"
-
-curl -O --output-dir "${destinationFolder}" \
-  "https://raw.githubusercontent.com/OpenAPITools/openapi-generator/${openapiGeneratorVersion}/modules/openapi-generator/src/main/resources/typescript-angular/api.module.mustache"
\ No newline at end of file
diff --git a/libs/schematic/api-client-angular/tsconfig.json b/libs/schematic/api-client-angular/tsconfig.json
deleted file mode 100644
index f96ad85d2e..0000000000
--- a/libs/schematic/api-client-angular/tsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ],
-  "compilerOptions": {
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "target": "es2020"
-  },
-  "angularCompilerOptions": {
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "strictTemplates": true
-  }
-}
diff --git a/libs/schematic/api-client-angular/tsconfig.lib.json b/libs/schematic/api-client-angular/tsconfig.lib.json
deleted file mode 100644
index 3cb1ad4548..0000000000
--- a/libs/schematic/api-client-angular/tsconfig.lib.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "declaration": true,
-    "declarationMap": true,
-    "inlineSources": true,
-    "types": [],
-    "target": "ES2022",
-    "useDefineForClassFields": false
-  },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
-  "include": ["**/*.ts"]
-}
diff --git a/libs/schematic/api-client-angular/tsconfig.lib.prod.json b/libs/schematic/api-client-angular/tsconfig.lib.prod.json
deleted file mode 100644
index 5c82bb22b3..0000000000
--- a/libs/schematic/api-client-angular/tsconfig.lib.prod.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "./tsconfig.lib.json",
-  "compilerOptions": {
-    "declarationMap": false,
-    "target": "ES2022",
-    "useDefineForClassFields": false
-  },
-  "angularCompilerOptions": {}
-}
diff --git a/libs/schematic/api-client-angular/tsconfig.spec.json b/libs/schematic/api-client-angular/tsconfig.spec.json
deleted file mode 100644
index d3889a9881..0000000000
--- a/libs/schematic/api-client-angular/tsconfig.spec.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node"]
-  },
-  "files": ["src/test-setup.ts"],
-  "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
-}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 0420f23cd1..c7d4bf85a4 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -46,9 +46,6 @@
         "libs/openchallenges/user-profile/src/index.ts"
       ],
       "@sagebionetworks/openchallenges/util": ["libs/openchallenges/util/src/index.ts"],
-      "@sagebionetworks/schematic/api-client-angular": [
-        "libs/schematic/api-client-angular/src/index.ts"
-      ],
       "@sagebionetworks/shared/util": ["libs/shared/typescript/util/src/index.ts"],
       "@sagebionetworks/shared/web-components": [
         "libs/shared/typescript/web-components/src/index.ts"

From b0bef9915407d8525382c0e114fd18c8899375e8 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Tue, 31 Oct 2023 11:42:15 -0700
Subject: [PATCH 12/19] feat(sage-monorepo): enable Format on Save for JSON and
 JSON with Comments (#2294)

* Format JSON on save

* Enable format on save for jsonc
---
 .vscode/settings.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 58718fb83d..c2f81f9c1b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,8 +13,9 @@
     "editor.formatOnSave": true,
     "editor.tabSize": 4
   },
-  "[json]": {
-    "editor.tabSize": 2
+  "[json][jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true
   },
   // "[typescript]": {
   //   "editor.defaultFormatter": "dbaeumer.vscode-eslint",

From e22874dd6528fc28638cbc115ffd78267bf5e38f Mon Sep 17 00:00:00 2001
From: Rongrong Chai <73901500+rrchai@users.noreply.github.com>
Date: Wed, 1 Nov 2023 11:13:00 -0400
Subject: [PATCH 13/19] hide page size options on search pages (#2298)

---
 .../challenge-search/src/lib/challenge-search.component.html   | 1 -
 .../org-search/src/lib/org-search.component.html               | 1 -
 .../openchallenges/ui/src/lib/paginator/paginator.component.ts | 3 ++-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/openchallenges/challenge-search/src/lib/challenge-search.component.html b/libs/openchallenges/challenge-search/src/lib/challenge-search.component.html
index 843268eb42..a8f9f5dfcf 100644
--- a/libs/openchallenges/challenge-search/src/lib/challenge-search.component.html
+++ b/libs/openchallenges/challenge-search/src/lib/challenge-search.component.html
@@ -161,7 +161,6 @@ <h3>Results ({{ searchResultsCount }})</h3>
         [pageNumber]="selectedPageNumber || defaultPageNumber"
         [pageSize]="selectedPageSize || defaultPageSize"
         [totalRecords]="searchResultsCount"
-        [itemsPerPage]="[12, 24, 36, 48]"
         (pageChange)="onParamChange({ pageNumber: $event.page, pageSize: $event.rows,})"
       />
     </div>
diff --git a/libs/openchallenges/org-search/src/lib/org-search.component.html b/libs/openchallenges/org-search/src/lib/org-search.component.html
index 59a84ea8d3..24210bc772 100644
--- a/libs/openchallenges/org-search/src/lib/org-search.component.html
+++ b/libs/openchallenges/org-search/src/lib/org-search.component.html
@@ -71,7 +71,6 @@ <h3>Results ({{ searchResultsCount }})</h3>
         [pageNumber]="selectedPageNumber || defaultPageNumber"
         [pageSize]="selectedPageSize || defaultPageSize"
         [totalRecords]="searchResultsCount"
-        [itemsPerPage]="[12, 24, 36, 48]"
         (pageChange)="onParamChange({ pageNumber: $event.page, pageSize: $event.rows,})"
       />
     </div>
diff --git a/libs/openchallenges/ui/src/lib/paginator/paginator.component.ts b/libs/openchallenges/ui/src/lib/paginator/paginator.component.ts
index 4fcc1bceba..4c18b58aa6 100644
--- a/libs/openchallenges/ui/src/lib/paginator/paginator.component.ts
+++ b/libs/openchallenges/ui/src/lib/paginator/paginator.component.ts
@@ -14,7 +14,8 @@ export class PaginatorComponent implements OnInit {
   @Input({ required: false }) pageLinkSize = 5;
   @Input({ required: true }) pageSize = 0; // number of rows to display in new page
   @Input({ required: true }) totalRecords = 0;
-  @Input({ required: true }) itemsPerPage!: number[];
+  @Input({ required: false }) itemsPerPage!: number[];
+
   @Output() pageChange = new EventEmitter();
 
   itemIndex = 0; // index of the first item in the new page

From 996222ed2b13e7587931dde671c545e35f6a14e3 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 17:22:54 +0000
Subject: [PATCH 14/19] delete

---
 .../SimpleChallengeGlobalExceptionTest.java   | 44 -------------------
 .../model/dto/ImageAspectRatioDtoTest.java    | 33 --------------
 2 files changed, 77 deletions(-)
 delete mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
 delete mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
deleted file mode 100644
index 067aa98af6..0000000000
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/exception/SimpleChallengeGlobalExceptionTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// import org.junit.Assert;
-// import static org.junit.Assert.assertEquals;
-// import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
-import org.springframework.http.HttpStatus;
-
-public class SimpleChallengeGlobalExceptionTest {
-
-  @Test
-  public void testConstructorWithDetails() {
-    // Create an instance of SimpleChallengeGlobalException using the constructor with details
-    String details = "Something went wrong";
-    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details);
-
-    // Verify the exception details
-    assertEquals(details, exception.getMessage());
-    assertNull(exception.getType());
-    assertNull(exception.getTitle());
-    assertNull(exception.getStatus());
-    assertNull(exception.getDetail());
-  }
-
-  @Test
-  public void SimpleChallenge_ShouldReturnSpecifiedArgs() {
-    // Define the exception details
-    String type = "ExceptionType";
-    String title = "Exception Title";
-    HttpStatus status = HttpStatus.BAD_REQUEST;
-    String detail = "Exception detail message";
-
-    // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception =
-        new SimpleChallengeGlobalException(type, title, status, detail);
-
-    // Verify the exception details
-    assertNull(exception.getMessage());
-    assertEquals(type, exception.getType());
-    assertEquals(title, exception.getTitle());
-    assertEquals(status, exception.getStatus());
-    assertEquals(detail, exception.getDetail());
-  }
-}
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
deleted file mode 100644
index b641a30937..0000000000
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/openchallenges/image/service/model/dto/ImageAspectRatioDtoTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// import static org.junit.Assert.assertEquals;
-
-// import org.junit.Test;
-// import org.sagebionetworks.openchallenges.image.service.model.dto.ImageAspectRatioDto;
-
-// public class ImageAspectRatioDtoTest {
-
-//   @Test
-//   public void GetValueShouldGetSpecifiedNumericCombination() {
-//     // Test the getValue() method for each enum value
-//     assertEquals("original", ImageAspectRatioDto.ORIGINAL.getValue());
-//     assertEquals("16_9", ImageAspectRatioDto._16_9.getValue());
-//     assertEquals("1_1", ImageAspectRatioDto._1_1.getValue());
-//     assertEquals("3_2", ImageAspectRatioDto._3_2.getValue());
-//     assertEquals("2_3", ImageAspectRatioDto._2_3.getValue());
-//   }
-
-//   @Test
-//   public void FromValueShouldEqualExpectedValue() {
-//     // Test the fromValue() method for each enum value
-//     assertEquals(ImageAspectRatioDto.ORIGINAL, ImageAspectRatioDto.fromValue("original"));
-//     assertEquals(ImageAspectRatioDto._16_9, ImageAspectRatioDto.fromValue("16_9"));
-//     assertEquals(ImageAspectRatioDto._1_1, ImageAspectRatioDto.fromValue("1_1"));
-//     assertEquals(ImageAspectRatioDto._3_2, ImageAspectRatioDto.fromValue("3_2"));
-//     assertEquals(ImageAspectRatioDto._2_3, ImageAspectRatioDto.fromValue("2_3"));
-//   }
-
-//   @Test(expected = IllegalArgumentException.class)
-//   public void testFromShouldReturnInvalidValue() {
-//     // Test the fromValue() method with an invalid value
-//     ImageAspectRatioDto.fromValue("invalid_value");
-//   }
-// }

From b21e2be5819f1404690f407fa55468b0a9033195 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 19:08:36 +0000
Subject: [PATCH 15/19] img hgt exception test

---
 .../ImageHeightNotSpecifiedExceptionTest.java | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
new file mode 100644
index 0000000000..ae59fcfe63
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
@@ -0,0 +1,22 @@
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+
+import static org.assertj.core.api.Assertions.assertEquals;
+
+public class ImageHeightNotSpecifiedExceptionTest {
+
+  @Test
+  public void testConstructor() {
+    // Define the exception detail
+    String detail = "Image height is not specified";
+
+    // Create an instance of ImageHeightNotSpecifiedException
+    ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
+
+    // Verify the exception details
+    assertEquals(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getType(), exception.getType());
+    assertEquals(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getTitle(), exception.getTitle());
+    assertEquals(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getStatus(), exception.getStatus());
+    assertEquals(detail, exception.getDetail());
+  }
+}

From e035e39f0d67785ba135fe7b0bc231c8d678b9a5 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 19:49:10 +0000
Subject: [PATCH 16/19] final image height exception test

---
 .../ImageHeightNotSpecifiedExceptionTest.java | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
index ae59fcfe63..3690f15ac8 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
@@ -1,12 +1,50 @@
-import org.junit.Test;
+package org.sagebionetworks.openchallenges.image.service.exception;
+import org.junit.jupiter.api.Test;
+import org.sagebionetworks.openchallenges.image.service.exception.ImageHeightNotSpecifiedException;
+import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
+import org.sagebionetworks.openchallenges.image.service.exception.ErrorConstants;
 import org.springframework.http.HttpStatus;
 
-import static org.assertj.core.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+
 
 public class ImageHeightNotSpecifiedExceptionTest {
 
   @Test
-  public void testConstructor() {
+  public void ConstructorTypeShouldMatch() {
+    // Define the exception detail
+    String detail = "Image height is not specified";
+
+    // Create an instance of ImageHeightNotSpecifiedException
+    ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
+
+    // Verify the exception details
+    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getType()).isEqualTo(exception.getType());
+  }
+  @Test
+  public void ConstructorTitle_Match() {
+    // Define the exception detail
+    String detail = "Image height is not specified";
+
+    // Create an instance of ImageHeightNotSpecifiedException
+    ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
+
+    // Verify the exception details
+    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getTitle()).isEqualTo(exception.getTitle());
+  }
+  @Test
+  public void ConstructorStatusMatch() {
+    // Define the exception detail
+    String detail = "Image height is not specified";
+
+    // Create an instance of ImageHeightNotSpecifiedException
+    ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
+
+    // Verify the exception details
+    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getStatus()).isEqualTo(exception.getStatus());
+  }
+  @Test
+  public void ConstructorDetailMatch() {
     // Define the exception detail
     String detail = "Image height is not specified";
 
@@ -14,9 +52,6 @@ public void testConstructor() {
     ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
 
     // Verify the exception details
-    assertEquals(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getType(), exception.getType());
-    assertEquals(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getTitle(), exception.getTitle());
-    assertEquals(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getStatus(), exception.getStatus());
-    assertEquals(detail, exception.getDetail());
+    assertThat(exception.getDetail()).isEqualTo(detail);
   }
 }

From 49d7f1c1435cd63c0e5d036a005037145d30f575 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 19:49:56 +0000
Subject: [PATCH 17/19] update

---
 .../ImageHeightNotSpecifiedExceptionTest.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
index 3690f15ac8..23785a3bd3 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
@@ -1,12 +1,8 @@
 package org.sagebionetworks.openchallenges.image.service.exception;
-import org.junit.jupiter.api.Test;
-import org.sagebionetworks.openchallenges.image.service.exception.ImageHeightNotSpecifiedException;
-import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
-import org.sagebionetworks.openchallenges.image.service.exception.ErrorConstants;
-import org.springframework.http.HttpStatus;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.Test;
 
 public class ImageHeightNotSpecifiedExceptionTest {
 
@@ -21,6 +17,7 @@ public void ConstructorTypeShouldMatch() {
     // Verify the exception details
     assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getType()).isEqualTo(exception.getType());
   }
+
   @Test
   public void ConstructorTitle_Match() {
     // Define the exception detail
@@ -30,8 +27,10 @@ public void ConstructorTitle_Match() {
     ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
 
     // Verify the exception details
-    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getTitle()).isEqualTo(exception.getTitle());
+    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getTitle())
+        .isEqualTo(exception.getTitle());
   }
+
   @Test
   public void ConstructorStatusMatch() {
     // Define the exception detail
@@ -41,8 +40,10 @@ public void ConstructorStatusMatch() {
     ImageHeightNotSpecifiedException exception = new ImageHeightNotSpecifiedException(detail);
 
     // Verify the exception details
-    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getStatus()).isEqualTo(exception.getStatus());
+    assertThat(ErrorConstants.IMAGE_HEIGHT_NOT_SPECIFIED.getStatus())
+        .isEqualTo(exception.getStatus());
   }
+
   @Test
   public void ConstructorDetailMatch() {
     // Define the exception detail

From db67dbf166d0361cb0ed50fff089938ec91f22c2 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 20:16:48 +0000
Subject: [PATCH 18/19] additional variable formatting

---
 .../ImageHeightNotSpecifiedExceptionTest.java |  8 +--
 .../SimpleChallengeGlobalExceptionTest.java   | 65 +++++++++++++++++++
 2 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
index 23785a3bd3..edd24e7245 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/ImageHeightNotSpecifiedExceptionTest.java
@@ -7,7 +7,7 @@
 public class ImageHeightNotSpecifiedExceptionTest {
 
   @Test
-  public void ConstructorTypeShouldMatch() {
+  public void ImageHeightNotSpecifiedException_ConstructorTypeShouldMatch() {
     // Define the exception detail
     String detail = "Image height is not specified";
 
@@ -19,7 +19,7 @@ public void ConstructorTypeShouldMatch() {
   }
 
   @Test
-  public void ConstructorTitle_Match() {
+  public void ImageHeightNotSpecifiedException_ConstructorTitle_Match() {
     // Define the exception detail
     String detail = "Image height is not specified";
 
@@ -32,7 +32,7 @@ public void ConstructorTitle_Match() {
   }
 
   @Test
-  public void ConstructorStatusMatch() {
+  public void ImageHeightNotSpecifiedException_ConstructorStatusMatch() {
     // Define the exception detail
     String detail = "Image height is not specified";
 
@@ -45,7 +45,7 @@ public void ConstructorStatusMatch() {
   }
 
   @Test
-  public void ConstructorDetailMatch() {
+  public void ImageHeightNotSpecifiedException_ConstructorDetailMatch() {
     // Define the exception detail
     String detail = "Image height is not specified";
 
diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java
new file mode 100644
index 0000000000..4fdc8edb4b
--- /dev/null
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java
@@ -0,0 +1,65 @@
+package org.sagebionetworks.openchallenges.challenge.service.exception;
+
+import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.springframework.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+public class SimpleChallengeGlobalExceptionTest {
+
+  @Test
+  public void SimpleChallengeGlobalException_ConstructorDetailsShouldMatch() {
+    // Create an instance of SimpleChallengeGlobalException using the constructor with details
+    String details = "Something went wrong";
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(details);
+
+    // Verify the exception details
+    assertThat(exception.getMessage()).isEqualTo(details);
+  }
+
+  @Test
+  public void SimpleChallengeGlobalException_ConstructorTypeShouldMatch() {
+    // Define the exception details
+    String type = "ExceptionType";
+    String title = "Exception Title";
+    HttpStatus status = HttpStatus.BAD_REQUEST;
+    String detail = "Exception detail message";
+
+    // Create an instance of SimpleChallengeGlobalException using the all-args constructor
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+
+    // Verify the exception details
+    assertThat(exception.getType()).isEqualTo(type);
+  }
+
+  @Test
+  public void SimpleChallengeGlobalException_ConstructorTitleShouldMatch() {
+    // Define the exception details
+    String type = "ExceptionType";
+    String title = "Exception Title";
+    HttpStatus status = HttpStatus.BAD_REQUEST;
+    String detail = "Exception detail message";
+
+    // Create an instance of SimpleChallengeGlobalException using the all-args constructor
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+
+    // Verify the exception details
+    assertThat(exception.getTitle()).isEqualTo(title);
+  }
+
+  @Test
+  public void SimpleChallengeGlobalException_ConstructorStatusShouldMatch() {
+    // Define the exception details
+    String type = "ExceptionType";
+    String title = "Exception Title";
+    HttpStatus status = HttpStatus.BAD_REQUEST;
+    String detail = "Exception detail message";
+
+    // Create an instance of SimpleChallengeGlobalException using the all-args constructor
+    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+
+    // Verify the exception details
+    assertThat(exception.getStatus()).isEqualTo(status);
+  }
+
+}
\ No newline at end of file

From d5124ca05f33cf01815c05f277a9f8b537915463 Mon Sep 17 00:00:00 2001
From: mdsage1 <maria.diaz@sagebase.org>
Date: Wed, 1 Nov 2023 20:17:09 +0000
Subject: [PATCH 19/19] updtate unittest

---
 .../SimpleChallengeGlobalExceptionTest.java     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java
index 4fdc8edb4b..6e33fa1a4c 100644
--- a/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java
+++ b/apps/openchallenges/image-service/src/test/java/org/sagebionetworks/exception/SimpleChallengeGlobalExceptionTest.java
@@ -1,9 +1,10 @@
 package org.sagebionetworks.openchallenges.challenge.service.exception;
 
-import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
 import static org.assertj.core.api.Assertions.assertThat;
-import org.springframework.http.HttpStatus;
+
 import org.junit.jupiter.api.Test;
+import org.sagebionetworks.openchallenges.image.service.exception.SimpleChallengeGlobalException;
+import org.springframework.http.HttpStatus;
 
 public class SimpleChallengeGlobalExceptionTest {
 
@@ -26,7 +27,8 @@ public void SimpleChallengeGlobalException_ConstructorTypeShouldMatch() {
     String detail = "Exception detail message";
 
     // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+    SimpleChallengeGlobalException exception =
+        new SimpleChallengeGlobalException(type, title, status, detail);
 
     // Verify the exception details
     assertThat(exception.getType()).isEqualTo(type);
@@ -41,7 +43,8 @@ public void SimpleChallengeGlobalException_ConstructorTitleShouldMatch() {
     String detail = "Exception detail message";
 
     // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+    SimpleChallengeGlobalException exception =
+        new SimpleChallengeGlobalException(type, title, status, detail);
 
     // Verify the exception details
     assertThat(exception.getTitle()).isEqualTo(title);
@@ -56,10 +59,10 @@ public void SimpleChallengeGlobalException_ConstructorStatusShouldMatch() {
     String detail = "Exception detail message";
 
     // Create an instance of SimpleChallengeGlobalException using the all-args constructor
-    SimpleChallengeGlobalException exception = new SimpleChallengeGlobalException(type, title, status, detail);
+    SimpleChallengeGlobalException exception =
+        new SimpleChallengeGlobalException(type, title, status, detail);
 
     // Verify the exception details
     assertThat(exception.getStatus()).isEqualTo(status);
   }
-
-}
\ No newline at end of file
+}