fix some types

Author: jsladerman

www/src/components/cluster/ClusterConsole.tsx

@@ -1,32 +1,30 @@
-import { ReactElement } from 'react'
-
-import LoadingIndicator from '../utils/LoadingIndicator'
+import { ClusterFragment, useRepositoryQuery } from '../../generated/graphql'
 import { EmptyListMessage } from '../overview/clusters/misc'
-import { Cluster, useRepositoryQuery } from '../../generated/graphql'
+import LoadingIndicator from '../utils/LoadingIndicator'
 
-import { GqlError } from '../utils/Alert'
-import { useNavigate, useParams } from 'react-router-dom'
-import { useTheme } from 'styled-components'
 import {
-  IconFrame,
-  Flex,
+  ArrowTopRightIcon,
+  Button,
   Card,
   Chip,
+  Flex,
   GearTrainIcon,
-  Button,
-  ArrowTopRightIcon,
+  IconFrame,
 } from '@pluralsh/design-system'
-import { Body1BoldP } from '../utils/Typography'
-import { ensureURLValidity } from '../../utils/url'
+import { useNavigate, useParams } from 'react-router-dom'
+import { useTheme } from 'styled-components'
 import { ignoreEvent } from '../../utils/ignore-event'
+import { ensureURLValidity } from '../../utils/url'
+import { GqlError } from '../utils/Alert'
+import { Body1BoldP } from '../utils/Typography'
 
 const CONSOLE_APP_NAME = 'console'
 
-type ClusterAppsProps = { cluster: Cluster }
-
 export function ClusterConsole({
   cluster: { consoleUrl },
-}: ClusterAppsProps): ReactElement {
+}: {
+  cluster: ClusterFragment
+}) {
   const theme = useTheme()
   const navigate = useNavigate()
   const { clusterId } = useParams()

www/src/components/cluster/ClusterDependencyModal.tsx

@@ -5,7 +5,7 @@ import { useMutation } from '@apollo/client'
 
 import subscriptionContext from '../../contexts/SubscriptionContext'
 
-import { Cluster } from '../../generated/graphql'
+import { ClusterFragment } from '../../generated/graphql'
 import { ClusterPicker } from '../utils/ClusterPicker'
 import { GqlError } from '../utils/Alert'
 
@@ -16,7 +16,7 @@ import UpgradeNeededModal from './UpgradeNeededModal'
 type ClusterDependencyModalProps = {
   open: boolean
   setOpen: Dispatch<boolean>
-  destination: Cluster
+  destination: ClusterFragment
 }
 
 export function ClusterDependencyModal({
@@ -25,7 +25,7 @@ export function ClusterDependencyModal({
   destination,
 }: ClusterDependencyModalProps) {
   const { isPaidPlan, isTrialPlan } = useContext(subscriptionContext)
-  const [source, setSource] = useState<Cluster | undefined>()
+  const [source, setSource] = useState<ClusterFragment | undefined>()
 
   const close = useCallback(() => {
     setOpen(false)
@@ -42,7 +42,7 @@ export function ClusterDependencyModal({
   )
 
   const filterSources = useCallback(
-    (s: Cluster) => {
+    (s: ClusterFragment) => {
       const d = destination
 
       return (

www/src/components/cluster/ClusterMetadataPanel.tsx

@@ -1,18 +1,18 @@
 import { A } from 'honorable'
 import moment from 'moment'
 import { Tooltip } from '@pluralsh/design-system'
-import { Dispatch, ReactElement } from 'react'
+import { Dispatch } from 'react'
 import { Link } from 'react-router-dom'
 
-import { Cluster } from '../../generated/graphql'
+import { ClusterFragment } from '../../generated/graphql'
 import CopyButton from '../utils/CopyButton'
 import ClusterHealth from '../overview/clusters/ClusterHealth'
 import ClusterOwner from '../overview/clusters/ClusterOwner'
 import { InfoPanel } from '../utils/InfoPanel'
 import Prop from '../utils/Prop'
 
 type ClusterMetadataPanelProps = {
-  cluster: Cluster
+  cluster: ClusterFragment
   open: boolean
   setOpen: Dispatch<boolean>
 }
@@ -21,7 +21,7 @@ export default function ClusterMetadataPanel({
   cluster,
   open,
   setOpen,
-}: ClusterMetadataPanelProps): ReactElement | null {
+}: ClusterMetadataPanelProps) {
   if (!open) return null
 
   return (

www/src/components/cluster/ClusterPromoteModal.tsx

@@ -4,7 +4,7 @@ import { Dispatch, useCallback, useContext, useState } from 'react'
 import isNil from 'lodash/isNil'
 import { useMutation } from '@apollo/client'
 
-import { Cluster } from '../../generated/graphql'
+import { ClusterFragment } from '../../generated/graphql'
 import { ClusterPicker } from '../utils/ClusterPicker'
 import { GqlError } from '../utils/Alert'
 import { ensureURLValidity } from '../../utils/url'
@@ -18,7 +18,7 @@ import ClustersContext from '../../contexts/ClustersContext'
 type ClusterPromoteModalProps = {
   open: boolean
   setOpen: Dispatch<boolean>
-  destination: Cluster
+  destination: ClusterFragment
 }
 
 export function ClusterPromoteModal({

www/src/components/cluster/ClusterSidecar.tsx

@@ -1,16 +1,15 @@
+import { Sidecar, SidecarItem, Tooltip } from '@pluralsh/design-system'
 import { A, Flex } from 'honorable'
 import moment from 'moment'
-import { Button, Sidecar, SidecarItem, Tooltip } from '@pluralsh/design-system'
 import { ReactElement } from 'react'
 import { Link } from 'react-router-dom'
 
-import { Cluster } from '../../generated/graphql'
-import CopyButton from '../utils/CopyButton'
+import { ClusterFragment } from '../../generated/graphql'
 import ClusterHealth from '../overview/clusters/ClusterHealth'
-import { ensureURLValidity } from '../../utils/url'
 import ClusterOwner from '../overview/clusters/ClusterOwner'
+import CopyButton from '../utils/CopyButton'
 
-type ClusterSidecarProps = { cluster: Cluster }
+type ClusterSidecarProps = { cluster: ClusterFragment }
 
 export function ClusterSidecar({ cluster }: ClusterSidecarProps): ReactElement {
   return (

www/src/components/overview/ClusterUpgradeInfo.tsx

@@ -1,16 +1,16 @@
-import { isEmpty } from 'lodash'
-import { Flex } from 'honorable'
 import { CaretRightIcon, Chip, IconFrame } from '@pluralsh/design-system'
+import { Flex } from 'honorable'
+import { isEmpty } from 'lodash'
 import { Link } from 'react-router-dom'
 
 import { useTheme } from 'styled-components'
 
-import { Maybe, UpgradeInfo } from '../../generated/graphql'
+import { Maybe, UpgradeInfoFragment } from '../../generated/graphql'
 import { getRepoIcon } from '../repository/misc'
 
 type ClusterUpgradeInfoProps = {
   clusterId?: Maybe<string>
-  upgradeInfo?: Maybe<Maybe<UpgradeInfo>[]>
+  upgradeInfo?: Maybe<Maybe<UpgradeInfoFragment>[]>
 }
 
 export function ClusterUpgradeInfo({

www/src/components/utils/ClusterPicker.tsx

@@ -20,12 +20,19 @@ import {
 import ClustersContext from '../../contexts/ClustersContext'
 
 import { useCurrentUser } from '../../contexts/CurrentUserContext'
-import { Cluster, Maybe, Provider, UpgradeInfo } from '../../generated/graphql'
+import {
+  ClusterFragment,
+  Maybe,
+  Provider,
+  UpgradeInfoFragment,
+} from '../../generated/graphql'
 import ClusterHealth from '../overview/clusters/ClusterHealth'
 
 import { ProviderIcon } from './ProviderIcon'
 
-type ClusterPickerReadyChipProps = { upgradeInfo?: Maybe<UpgradeInfo>[] | null }
+type ClusterPickerReadyChipProps = {
+  upgradeInfo?: Maybe<UpgradeInfoFragment>[] | null
+}
 
 function ClusterPickerReadyChip({ upgradeInfo }: ClusterPickerReadyChipProps) {
   const ready = useMemo(() => isEmpty(upgradeInfo), [upgradeInfo])
@@ -42,8 +49,8 @@ function ClusterPickerReadyChip({ upgradeInfo }: ClusterPickerReadyChipProps) {
 }
 
 type ClusterPickerProps = {
-  cluster?: Cluster | null
-  setCluster?: Dispatch<Cluster | undefined>
+  cluster?: ClusterFragment | null
+  setCluster?: Dispatch<ClusterFragment | undefined>
   onChange?: (Cluster) => void
   filter?: (Cluster) => boolean
   heading?: string
@@ -94,8 +101,10 @@ export function ClusterPicker({
   )
 }
 
-type SelectBoxCluster = Pick<Cluster, 'id' | 'name'> &
-  Partial<Pick<Cluster, 'pingedAt' | 'provider' | 'upgradeInfo' | 'owner'>> & {
+type SelectBoxCluster = Pick<ClusterFragment, 'id' | 'name'> &
+  Partial<
+    Pick<ClusterFragment, 'pingedAt' | 'provider' | 'upgradeInfo' | 'owner'>
+  > & {
     icon?: ReactNode
   }
 
@@ -235,16 +244,16 @@ type CloudShellClusterPickerProps = Omit<
   'clusters'
 > & { showCliClusters?: boolean }
 
-export function clusterHasCloudShell(cluster: Cluster) {
+export function clusterHasCloudShell(cluster: ClusterFragment) {
   return !!cluster?.owner?.hasShell
 }
 
-export function userCanAdminCluster(cluster: Cluster, userId: string) {
+export function userCanAdminCluster(cluster: ClusterFragment, userId: string) {
   return cluster.owner?.id === userId || !!cluster.owner?.serviceAccount
 }
 
 export function clusterFilter(
-  cluster: Cluster,
+  cluster: ClusterFragment,
   currentUserId: string,
   { showCliClusters = false }
 ) {
@@ -269,7 +278,7 @@ export function CloudShellClusterPicker({
     () =>
       raw
         ? raw.filter((cl) => clusterFilter(cl, userId, { showCliClusters }))
-        : ([] as Cluster[]),
+        : ([] as ClusterFragment[]),
     [raw, showCliClusters, userId]
   )
 

www/src/components/utils/InstallAppButton.tsx

@@ -21,7 +21,7 @@ import { Link } from 'react-router-dom'
 
 import ClustersContext from '../../contexts/ClustersContext'
 import { useCurrentUser } from '../../contexts/CurrentUserContext'
-import { Cluster, Provider } from '../../generated/graphql'
+import { ClusterFragment, Provider } from '../../generated/graphql'
 
 import {
   CloudShellClusterPicker,
@@ -225,7 +225,7 @@ function InstallModal({
   onClose,
   ...props
 }: Omit<InstallAppButtonProps, 'loading'> & {
-  clusters: Cluster[]
+  clusters: ClusterFragment[]
 } & ComponentProps<typeof Modal>) {
   const [clusterId, setClusterId] = useState<string | undefined>(
     !isEmpty(clusters) ? clusters[0].id : undefined

www/src/generated/graphql.ts

@@ -5486,6 +5486,8 @@ export type UninstallChartMutation = { __typename?: 'RootMutationType', deleteCh
 
 export type ClusterFragment = { __typename?: 'Cluster', id: string, name: string, provider: Provider, source?: Source | null, pingedAt?: Date | null, gitUrl?: string | null, consoleUrl?: string | null, owner?: { __typename?: 'User', id: string, name: string, email: string, avatar?: string | null, provider?: Provider | null, demoed?: boolean | null, onboarding?: OnboardingState | null, emailConfirmed?: boolean | null, emailConfirmBy?: Date | null, backgroundColor?: string | null, serviceAccount?: boolean | null, hasInstallations?: boolean | null, hasShell?: boolean | null, impersonationPolicy?: { __typename?: 'ImpersonationPolicy', id: string, bindings?: Array<{ __typename?: 'ImpersonationPolicyBinding', id: string, group?: { __typename?: 'Group', id: string, name: string } | null, user?: { __typename?: 'User', id: string, name: string, email: string } | null } | null> | null } | null, onboardingChecklist?: { __typename?: 'OnboardingChecklist', dismissed?: boolean | null, status?: OnboardingChecklistState | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null, roles?: { __typename?: 'Roles', admin?: boolean | null } | null, groups?: Array<{ __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null> | null } | null, queue?: { __typename?: 'UpgradeQueue', id: string, acked?: string | null, upgrades?: { __typename?: 'UpgradeConnection', edges?: Array<{ __typename?: 'UpgradeEdge', node?: { __typename?: 'Upgrade', id: string } | null } | null> | null } | null } | null, upgradeInfo?: Array<{ __typename?: 'UpgradeInfo', count?: number | null, installation?: { __typename?: 'Installation', id: string, context?: Map<string, unknown> | null, license?: string | null, licenseKey?: string | null, acmeKeyId?: string | null, acmeSecret?: string | null, autoUpgrade?: boolean | null, trackTag: string, pingedAt?: Date | null, synced?: boolean | null, locked?: boolean | null, repository?: { __typename?: 'Repository', id: string, name: string, icon?: string | null, darkIcon?: string | null, private?: boolean | null, trending?: boolean | null, verified?: boolean | null, category?: Category | null } | null, user?: { __typename?: 'User', id: string, name: string, email: string, avatar?: string | null, provider?: Provider | null, demoed?: boolean | null, onboarding?: OnboardingState | null, emailConfirmed?: boolean | null, emailConfirmBy?: Date | null, backgroundColor?: string | null, serviceAccount?: boolean | null, hasInstallations?: boolean | null, hasShell?: boolean | null, onboardingChecklist?: { __typename?: 'OnboardingChecklist', dismissed?: boolean | null, status?: OnboardingChecklistState | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null, roles?: { __typename?: 'Roles', admin?: boolean | null } | null, groups?: Array<{ __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null> | null, impersonationPolicy?: { __typename?: 'ImpersonationPolicy', id: string, bindings?: Array<{ __typename?: 'ImpersonationPolicyBinding', id: string, group?: { __typename?: 'Group', id: string, name: string } | null, user?: { __typename?: 'User', id: string, name: string, email: string } | null } | null> | null } | null } | null, oidcProvider?: { __typename?: 'OidcProvider', id: string, name?: string | null, description?: string | null, clientId: string, authMethod: OidcAuthMethod, clientSecret: string, redirectUris?: Array<string | null> | null, bindings?: Array<{ __typename?: 'OidcProviderBinding', id: string, user?: { __typename?: 'User', id: string, name: string, email: string, avatar?: string | null, provider?: Provider | null, demoed?: boolean | null, onboarding?: OnboardingState | null, emailConfirmed?: boolean | null, emailConfirmBy?: Date | null, backgroundColor?: string | null, serviceAccount?: boolean | null, hasInstallations?: boolean | null, hasShell?: boolean | null, onboardingChecklist?: { __typename?: 'OnboardingChecklist', dismissed?: boolean | null, status?: OnboardingChecklistState | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null, roles?: { __typename?: 'Roles', admin?: boolean | null } | null, groups?: Array<{ __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null> | null, impersonationPolicy?: { __typename?: 'ImpersonationPolicy', id: string, bindings?: Array<{ __typename?: 'ImpersonationPolicyBinding', id: string, group?: { __typename?: 'Group', id: string, name: string } | null, user?: { __typename?: 'User', id: string, name: string, email: string } | null } | null> | null } | null } | null, group?: { __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null } | null> | null, configuration?: { __typename?: 'OuathConfiguration', issuer?: string | null, authorizationEndpoint?: string | null, tokenEndpoint?: string | null, jwksUri?: string | null, userinfoEndpoint?: string | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null } | null } | null } | null> | null, dependency?: { __typename?: 'ClusterDependency', dependency?: { __typename?: 'Cluster', id: string, name: string, provider: Provider } | null } | null };
 
+export type UpgradeInfoFragment = { __typename?: 'UpgradeInfo', count?: number | null, installation?: { __typename?: 'Installation', id: string, context?: Map<string, unknown> | null, license?: string | null, licenseKey?: string | null, acmeKeyId?: string | null, acmeSecret?: string | null, autoUpgrade?: boolean | null, trackTag: string, pingedAt?: Date | null, synced?: boolean | null, locked?: boolean | null, repository?: { __typename?: 'Repository', id: string, name: string, icon?: string | null, darkIcon?: string | null, private?: boolean | null, trending?: boolean | null, verified?: boolean | null, category?: Category | null } | null, user?: { __typename?: 'User', id: string, name: string, email: string, avatar?: string | null, provider?: Provider | null, demoed?: boolean | null, onboarding?: OnboardingState | null, emailConfirmed?: boolean | null, emailConfirmBy?: Date | null, backgroundColor?: string | null, serviceAccount?: boolean | null, hasInstallations?: boolean | null, hasShell?: boolean | null, onboardingChecklist?: { __typename?: 'OnboardingChecklist', dismissed?: boolean | null, status?: OnboardingChecklistState | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null, roles?: { __typename?: 'Roles', admin?: boolean | null } | null, groups?: Array<{ __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null> | null, impersonationPolicy?: { __typename?: 'ImpersonationPolicy', id: string, bindings?: Array<{ __typename?: 'ImpersonationPolicyBinding', id: string, group?: { __typename?: 'Group', id: string, name: string } | null, user?: { __typename?: 'User', id: string, name: string, email: string } | null } | null> | null } | null } | null, oidcProvider?: { __typename?: 'OidcProvider', id: string, name?: string | null, description?: string | null, clientId: string, authMethod: OidcAuthMethod, clientSecret: string, redirectUris?: Array<string | null> | null, bindings?: Array<{ __typename?: 'OidcProviderBinding', id: string, user?: { __typename?: 'User', id: string, name: string, email: string, avatar?: string | null, provider?: Provider | null, demoed?: boolean | null, onboarding?: OnboardingState | null, emailConfirmed?: boolean | null, emailConfirmBy?: Date | null, backgroundColor?: string | null, serviceAccount?: boolean | null, hasInstallations?: boolean | null, hasShell?: boolean | null, onboardingChecklist?: { __typename?: 'OnboardingChecklist', dismissed?: boolean | null, status?: OnboardingChecklistState | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null, roles?: { __typename?: 'Roles', admin?: boolean | null } | null, groups?: Array<{ __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null> | null, impersonationPolicy?: { __typename?: 'ImpersonationPolicy', id: string, bindings?: Array<{ __typename?: 'ImpersonationPolicyBinding', id: string, group?: { __typename?: 'Group', id: string, name: string } | null, user?: { __typename?: 'User', id: string, name: string, email: string } | null } | null> | null } | null } | null, group?: { __typename?: 'Group', id: string, name: string, global?: boolean | null, description?: string | null } | null } | null> | null, configuration?: { __typename?: 'OuathConfiguration', issuer?: string | null, authorizationEndpoint?: string | null, tokenEndpoint?: string | null, jwksUri?: string | null, userinfoEndpoint?: string | null } | null, invites?: Array<{ __typename?: 'Invite', id: string, email?: string | null } | null> | null } | null } | null };
+
 export type ClustersQueryVariables = Exact<{
   first?: InputMaybe<Scalars['Int']['input']>;
 }>;
@@ -6946,6 +6948,14 @@ export const InstallationFragmentDoc = gql`
     ${InstallationRepoFragmentDoc}
 ${UserFragmentDoc}
 ${OidcProviderFragmentDoc}`;
+export const UpgradeInfoFragmentDoc = gql`
+    fragment UpgradeInfo on UpgradeInfo {
+  installation {
+    ...Installation
+  }
+  count
+}
+    ${InstallationFragmentDoc}`;
 export const ClusterFragmentDoc = gql`
     fragment Cluster on Cluster {
   id
@@ -6973,10 +6983,7 @@ export const ClusterFragmentDoc = gql`
     }
   }
   upgradeInfo {
-    installation {
-      ...Installation
-    }
-    count
+    ...UpgradeInfo
   }
   dependency {
     dependency {
@@ -6988,7 +6995,7 @@ export const ClusterFragmentDoc = gql`
 }
     ${UserFragmentDoc}
 ${ImpersonationPolicyFragmentDoc}
-${InstallationFragmentDoc}`;
+${UpgradeInfoFragmentDoc}`;
 export const DnsRecordFragmentDoc = gql`
     fragment DnsRecord on DnsRecord {
   id
@@ -13021,6 +13028,7 @@ export const namedOperations = {
     ScanError: 'ScanError',
     PackageScan: 'PackageScan',
     Cluster: 'Cluster',
+    UpgradeInfo: 'UpgradeInfo',
     DnsRecord: 'DnsRecord',
     DockerRepo: 'DockerRepo',
     DockerRepository: 'DockerRepository',

www/src/graph/cluster.graphql

@@ -24,10 +24,7 @@ fragment Cluster on Cluster {
     }
   }
   upgradeInfo {
-    installation {
-      ...Installation
-    }
-    count
+    ...UpgradeInfo
   }
   dependency {
     dependency {
@@ -38,6 +35,13 @@ fragment Cluster on Cluster {
   }
 }
 
+fragment UpgradeInfo on UpgradeInfo {
+  installation {
+    ...Installation
+  }
+  count
+}
+
 query Clusters($first: Int = 100) {
   clusters(first: $first) {
     pageInfo {