Merge branch 'master' into migrate-fav-apps

equinor · Jan 10, 2024 · da97178 · da97178
2 parents 8acdd35 + eff5c33
commit da97178
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 353 deletions.
diff --git a/src/components/app-list/index.tsx b/src/components/app-list/index.tsx
@@ -78,7 +78,7 @@ export default function AppList() {
       <div className="app-list__header">
         <Typography variant="body_short_bold">Favourites</Typography>
         <div className="create-app">
-          <PageCreateApplication />
+          <PageCreateApplication refetch={refetch} />
         </div>
       </div>
       <div className="app-list">

diff --git a/src/components/configure-application-github/index.tsx b/src/components/configure-application-github/index.tsx
@@ -27,11 +27,12 @@ import { RequestState } from '../../state/state-utils/request-states';
 import { configVariables } from '../../utils/config';
 
 import './style.css';
+import { ApplicationRegistration } from '../../store/radix-api';
 
 const radixZoneDNS = configVariables.RADIX_CLUSTER_BASE;
 
 export interface ConfigureApplicationGithubProps {
-  app: ApplicationRegistrationModel;
+  app: ApplicationRegistration | ApplicationRegistrationModel;
   onDeployKeyChange: (appName: string) => void;
   startVisible?: boolean;
   useOtherCiToolOptionVisible?: boolean;