Merge pull request #469 from middlewarehq/GROW-1752

Refactor deployment_type in TeamsCRUDProvider and update WorkflowSelector styles
middlewarehq · Jul 8, 2024 · 9bcbb9d · 9bcbb9d
2 parents 56d1bc9 + e02d962
commit 9bcbb9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/web-server/src/components/Teams/useTeamsConfig.tsx b/web-server/src/components/Teams/useTeamsConfig.tsx
@@ -148,7 +148,7 @@ export const TeamsCRUDProvider: React.FC<{
     (_: SyntheticEvent<Element, Event>, value: BaseRepo[]) => {
       const reposWithDeploymentType = value.map((r) => ({
         ...r,
-        deployment_type: DeploymentSources.PR_MERGE
+        deployment_type: r.deployment_type ?? DeploymentSources.PR_MERGE
       }));
       depFn(selections.set, reposWithDeploymentType);
       depFn(teamRepoError.false);

diff --git a/web-server/src/components/WorkflowSelector.tsx b/web-server/src/components/WorkflowSelector.tsx
@@ -125,7 +125,12 @@ export const DeploymentWorkflowSelector: FC<{ repo: BaseRepo }> = ({
             'aria-labelledby': 'simple-menu',
             disablePadding: true,
             sx: {
-              padding: 0
+              padding: 0,
+              maxHeight: '350px',
+              overflowY: 'auto',
+              msOverflowStyle: 'none',
+              scrollbarWidth: 'none',
+              '&::-webkit-scrollbar': { display: 'none' }
             }
           }
         }}