Skip to content

Commit c332ef4

Browse files
committed
Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/markdown-to-jsx-9.8.0
2 parents 9219a1a + 4a6fd1a commit c332ef4

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

src/components/modals/ConfigureGitModal.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ export default function ConfigureGitModal({ open, onClose }: ConfigureGitModalPr
249249
user: { isPlatformAdmin },
250250
settings: {
251251
cluster: { domainSuffix },
252-
otomi: { isPreInstalled },
253252
},
254253
} = useSession()
255254

@@ -259,7 +258,7 @@ export default function ConfigureGitModal({ open, onClose }: ConfigureGitModalPr
259258
const actualOpen = useMemo(() => (isControlled ? !!open : !!showGitWizard), [isControlled, open, showGitWizard])
260259

261260
const { data: gitSettings, isFetching: isFetchingGitSettings } = useGetGitSettingsQuery(undefined, {
262-
skip: !isPlatformAdmin || !isPreInstalled || !actualOpen,
261+
skip: !isPlatformAdmin || !actualOpen,
263262
})
264263

265264
const defaultGitUrl = gitSettings?.repoUrl || ''
@@ -306,10 +305,6 @@ export default function ConfigureGitModal({ open, onClose }: ConfigureGitModalPr
306305
if (showGitWizard === undefined) setShowGitWizard(true)
307306
}, [showGitWizard, setShowGitWizard])
308307

309-
useEffect(() => {
310-
if (!isPreInstalled && !isControlled) setShowGitWizard(false)
311-
}, [isPreInstalled, isControlled, setShowGitWizard])
312-
313308
useEffect(() => {
314309
if (!actualOpen) {
315310
resetModalState()
@@ -406,7 +401,7 @@ export default function ConfigureGitModal({ open, onClose }: ConfigureGitModalPr
406401
}
407402
}
408403

409-
if (!isPlatformAdmin || !isPreInstalled) return null
404+
if (!isPlatformAdmin) return null
410405
if (!isControlled && !showGitWizard) return null
411406

412407
return (

0 commit comments

Comments
 (0)