@flightctl/ui-components 1.1.0-rc1 → 1.1.0-rc2

package/src/components/form/validations.ts

@@ -10,31 +10,25 @@ import {
   AppSpecType,
   BatchForm,
   BatchLimitType,
-  ComposeImageAppForm,
-  ComposeInlineAppForm,
+  ComposeAppForm,
   DisruptionBudgetForm,
   GitConfigTemplate,
-  HelmImageAppForm,
+  HelmAppForm,
   HttpConfigTemplate,
   InlineConfigTemplate,
+  InlineFileForm,
   KubeSecretTemplate,
   PortMapping,
-  QuadletImageAppForm,
-  QuadletInlineAppForm,
+  QuadletAppForm,
   RolloutPolicyForm,
   SpecConfigTemplate,
   SystemdUnitFormValue,
   UpdatePolicyForm,
   getAppIdentifier,
-  isComposeImageAppForm,
   isGitConfigTemplate,
-  isHelmImageAppForm,
   isHttpConfigTemplate,
   isInlineConfigTemplate,
   isKubeSecretTemplate,
-  isQuadletImageAppForm,
-  isQuadletInlineAppForm,
-  isSingleContainerAppForm,
 } from '../../types/deviceSpec';
 import { labelToString } from '../../utils/labels';
 import { UpdateScheduleMode } from '../../utils/time';
@@ -74,6 +68,9 @@ const relativePathRegex = /^(?!\.\.\/|\.\.\$|\.\/)(\.\/)*[\w.-]+(?:\/[\w.-]+)*\/
 export const MAX_TARGET_REVISION_LENGTH = 244;
 const MAX_FILE_PATH_LENGTH = 253;
 
+const HELM_NAMESPACE_MAX_LENGTH = 63;
+const HELM_VALUES_FILE_EXT_REGEXP = /\.(yaml|yml)$/i;
+
 const isInteger = (val: number | undefined) => val === undefined || Number.isInteger(val);
 
 const validComposeFileNames = [
@@ -265,6 +262,48 @@ export const validOsImage = (t: TFunction, { isFleet }: { isFleet: boolean }) =>
     },
   );
 
+export const validHelmNamespace = (t: TFunction) =>
+  Yup.string()
+    .max(
+      HELM_NAMESPACE_MAX_LENGTH,
+      t('Namespace must not exceed {{ max }} characters.', { max: HELM_NAMESPACE_MAX_LENGTH }),
+    )
+    .test(
+      'helm-namespace-format',
+      t(
+        'Namespace must only include lowercase letters, numbers, and hyphens. It must start and end with a letter or number.',
+      ),
+      (value) => {
+        return !value || APPLICATION_NAME_REGEXP.test(value);
+      },
+    );
+
+export const validHelmValuesFile = (t: TFunction) =>
+  Yup.string().test('helm-values-file', function (filename) {
+    if (!filename) {
+      return true;
+    }
+    if (filename.length > MAX_FILE_PATH_LENGTH) {
+      return this.createError({
+        message: t('Values file path must not exceed {{ max }} characters.', {
+          max: MAX_FILE_PATH_LENGTH,
+        }),
+      });
+    }
+    if (filename.startsWith('/') || filename.includes('..')) {
+      return this.createError({
+        message: t('Values file path must be relative and cannot contain parent directory references (..).'),
+      });
+    }
+
+    if (!HELM_VALUES_FILE_EXT_REGEXP.test(filename)) {
+      return this.createError({
+        message: t('Values file must have .yaml or .yml extension.'),
+      });
+    }
+    return true;
+  });
+
 export const validLabelsSchema = (t: TFunction, forbiddenLabels?: string[]) =>
   Yup.array()
     .of(
@@ -370,11 +409,7 @@ const inlineAppFileSchema = (t: TFunction) =>
 
 // Common test for unique file paths in inline applications
 const uniqueFilePathsTest =
-  (t: TFunction) =>
-  (
-    files: (QuadletInlineAppForm | ComposeInlineAppForm)['files'] | undefined,
-    testContext: Yup.TestContext<Yup.AnyObject>,
-  ) => {
+  (t: TFunction) => (files: InlineFileForm[] | undefined, testContext: Yup.TestContext<Yup.AnyObject>) => {
     if (!files || files.length === 0) {
       return true;
     }
@@ -412,34 +447,33 @@ const uniqueFilePathsTest =
     });
   };
 
-const composeFileName =
-  (t: TFunction) => (files: ComposeInlineAppForm['files'], testContext: Yup.TestContext<Yup.AnyObject>) => {
-    const invalidFiles = files
-      .map((file, index) => {
-        if (!file.path) {
-          return null;
-        }
-        // Extract filename from relative path (get last part after slash, or use whole path if no slash)
-        const fileName = file.path.includes('/') ? file.path.split('/').pop() || file.path : file.path;
-        if (!validComposeFileNames.includes(fileName)) {
-          return index;
-        }
+const composeFileName = (t: TFunction) => (files: InlineFileForm[], testContext: Yup.TestContext<Yup.AnyObject>) => {
+  const invalidFiles = files
+    .map((file, index) => {
+      if (!file.path) {
         return null;
-      })
-      .filter((index): index is number => index !== null);
+      }
+      // Extract filename from relative path (get last part after slash, or use whole path if no slash)
+      const fileName = file.path.includes('/') ? file.path.split('/').pop() || file.path : file.path;
+      if (!validComposeFileNames.includes(fileName)) {
+        return index;
+      }
+      return null;
+    })
+    .filter((index): index is number => index !== null);
 
-    if (invalidFiles.length > 0) {
-      const firstInvalidIndex = invalidFiles[0];
-      return testContext.createError({
-        path: `${testContext.path}[${firstInvalidIndex}].path`,
-        message: () =>
-          t('File name must be one of: {{ allowedFileNames }}', {
-            allowedFileNames: validComposeFileNameDisplay,
-          }),
-      });
-    }
-    return true;
-  };
+  if (invalidFiles.length > 0) {
+    const firstInvalidIndex = invalidFiles[0];
+    return testContext.createError({
+      path: `${testContext.path}[${firstInvalidIndex}].path`,
+      message: () =>
+        t('File name must be one of: {{ allowedFileNames }}', {
+          allowedFileNames: validComposeFileNameDisplay,
+        }),
+    });
+  }
+  return true;
+};
 
 // Helper to extract file extension from a path
 const getFileExtension = (path: string): string => {
@@ -454,7 +488,7 @@ const isAtRoot = (path: string): boolean => {
 
 // Validation for quadlet applications: checks for unsupported types first, then requires at least one supported type
 const quadletFileTypesValidation =
-  (t: TFunction) => (files: QuadletInlineAppForm['files'], testContext: Yup.TestContext<Yup.AnyObject>) => {
+  (t: TFunction) => (files: InlineFileForm[], testContext: Yup.TestContext<Yup.AnyObject>) => {
     if (!files || files.length === 0) {
       return true; // This is handled by the min(1) requirement
     }
@@ -512,36 +546,35 @@ const quadletFileTypesValidation =
   };
 
 // Validation for quadlet applications: quadlet files must be at root level
-const quadletFilesAtRoot =
-  (t: TFunction) => (files: QuadletInlineAppForm['files'], testContext: Yup.TestContext<Yup.AnyObject>) => {
-    if (!files || files.length === 0) {
-      return true;
-    }
+const quadletFilesAtRoot = (t: TFunction) => (files: InlineFileForm[], testContext: Yup.TestContext<Yup.AnyObject>) => {
+  if (!files || files.length === 0) {
+    return true;
+  }
 
-    const invalidFiles = files
-      .map((file, index) => {
-        if (!file.path) {
-          return null;
-        }
-        const ext = getFileExtension(file.path);
-        // Only check files with supported quadlet extensions
-        if (supportedQuadletExtensions.includes(ext) && !isAtRoot(file.path)) {
-          return index;
-        }
+  const invalidFiles = files
+    .map((file, index) => {
+      if (!file.path) {
         return null;
-      })
-      .filter((index): index is number => index !== null);
+      }
+      const ext = getFileExtension(file.path);
+      // Only check files with supported quadlet extensions
+      if (supportedQuadletExtensions.includes(ext) && !isAtRoot(file.path)) {
+        return index;
+      }
+      return null;
+    })
+    .filter((index): index is number => index !== null);
 
-    if (invalidFiles.length > 0) {
-      const firstInvalidIndex = invalidFiles[0];
-      return testContext.createError({
-        path: `${testContext.path}[${firstInvalidIndex}].path`,
-        message: () => t('Quadlet files must be at root level (no subdirectories)'),
-      });
-    }
+  if (invalidFiles.length > 0) {
+    const firstInvalidIndex = invalidFiles[0];
+    return testContext.createError({
+      path: `${testContext.path}[${firstInvalidIndex}].path`,
+      message: () => t('Quadlet files must be at root level (no subdirectories)'),
+    });
+  }
 
-    return true;
-  };
+  return true;
+};
 
 const PORT_NUMBER_REGEXP = /^\d+$/;
 const MAX_PORT = 65535;
@@ -670,13 +703,13 @@ export const validApplicationsSchema = (t: TFunction) => {
     .of(
       Yup.lazy((value: AppForm) => {
         // Container applications (image-based with ports and resources)
-        if (isSingleContainerAppForm(value)) {
+        if (value.appType === AppType.AppTypeContainer) {
           return Yup.object().shape({
             specType: Yup.string()
               .oneOf([AppSpecType.OCI_IMAGE])
               .required(t('Definition source must be image for this type of applications')),
             appType: Yup.string().oneOf([AppType.AppTypeContainer]).required(t('Application type is required')),
-            name: validApplicationAndVolumeName(t).required(t('Name is required for single container applications.')),
+            name: validApplicationAndVolumeName(t),
             image: Yup.string()
               .required(t('Image is required.'))
               .matches(APPLICATION_IMAGE_REGEXP, t('Application image includes invalid characters.')),
@@ -709,8 +742,8 @@ export const validApplicationsSchema = (t: TFunction) => {
         }
 
         // Helm applications
-        if (isHelmImageAppForm(value)) {
-          return Yup.object<HelmImageAppForm>().shape({
+        if (value.appType === AppType.AppTypeHelm) {
+          return Yup.object<HelmAppForm>().shape({
             specType: Yup.string()
               .oneOf([AppSpecType.OCI_IMAGE])
               .required(t('Definition source must be image for this type of applications')),
@@ -719,7 +752,7 @@ export const validApplicationsSchema = (t: TFunction) => {
             image: Yup.string()
               .required(t('Image is required.'))
               .matches(APPLICATION_IMAGE_REGEXP, t('Application image includes invalid characters.')),
-            namespace: Yup.string(),
+            namespace: validHelmNamespace(t),
             valuesYaml: Yup.string().test('valid-yaml', t('YAML content is invalid.'), (value) => {
               if (!value || value.trim() === '') {
                 return true;
@@ -731,16 +764,13 @@ export const validApplicationsSchema = (t: TFunction) => {
               }
               return true;
             }),
-            // Values files don't need to be validated.
-            // Since the UX design has the first field added by default, we will ignore all empty values files.
-            // The user can't add more values files if any is empty (though they can clear existing ones).
-            valuesFiles: Yup.array().of(Yup.string()),
+            valuesFiles: Yup.array().of(validHelmValuesFile(t)),
           });
         }
 
         // Image applications (Quadlet or Compose)
-        if (isQuadletImageAppForm(value) || isComposeImageAppForm(value)) {
-          return Yup.object<QuadletImageAppForm | ComposeImageAppForm>().shape({
+        if (value.specType === AppSpecType.OCI_IMAGE) {
+          return Yup.object<QuadletAppForm | ComposeAppForm>().shape({
             specType: Yup.string()
               .oneOf([AppSpecType.OCI_IMAGE])
               .required(t('Definition source must be image for this type of applications')),
@@ -757,8 +787,8 @@ export const validApplicationsSchema = (t: TFunction) => {
         }
 
         // Inline quadlet applications
-        if (isQuadletInlineAppForm(value)) {
-          return Yup.object<QuadletInlineAppForm>().shape({
+        if (value.appType === AppType.AppTypeQuadlet && value.specType === AppSpecType.INLINE) {
+          return Yup.object<QuadletAppForm>().shape({
             specType: appSpecTypeSchema(t),
             appType: Yup.string().oneOf([AppType.AppTypeQuadlet]).required(t('Application type is required')),
             name: validApplicationAndVolumeName(t).required(t('Name is required for quadlet applications.')),
@@ -772,7 +802,7 @@ export const validApplicationsSchema = (t: TFunction) => {
         }
 
         // Inline compose applications
-        return Yup.object<ComposeInlineAppForm>().shape({
+        return Yup.object<ComposeAppForm>().shape({
           specType: appSpecTypeSchema(t),
           appType: Yup.string().oneOf([AppType.AppTypeCompose]).required(t('Application type is required')),
           name: validApplicationAndVolumeName(t).required(t('Name is required for compose applications.')),

package/src/constants.ts

@@ -1,7 +1,20 @@
-const APP_TITLE = 'Edge Manager';
-const API_VERSION = 'v1beta1';
-const PAGE_SIZE = 15;
-const EVENT_PAGE_SIZE = 200; // It's 500 in OCP console
-const CERTIFICATE_VALIDITY_IN_YEARS = 1;
+export const APP_TITLE = 'Edge Manager';
+export const CORE_API_VERSION = 'v1beta1';
+export const IMAGEBUILDER_API_VERSION = 'v1alpha1';
 
-export { APP_TITLE, API_VERSION, PAGE_SIZE, EVENT_PAGE_SIZE, CERTIFICATE_VALIDITY_IN_YEARS };
+export const PAGE_SIZE = 15;
+export const EVENT_PAGE_SIZE = 200; // It's 500 in OCP console
+
+export const CERTIFICATE_VALIDITY_IN_YEARS = 1;
+
+export const getApiVersion = (api: 'flightctl' | 'imagebuilder' | 'alerts'): string | undefined => {
+  switch (api) {
+    case 'flightctl':
+      return CORE_API_VERSION;
+    case 'imagebuilder':
+      return IMAGEBUILDER_API_VERSION;
+    case 'alerts':
+    default:
+      return undefined;
+  }
+};

package/src/types/deviceSpec.ts

@@ -1,20 +1,25 @@
 import {
-  AppType,
-  ApplicationResourceLimits,
+  ApplicationProviderSpec,
+  ComposeApplication,
   ConfigProviderSpec,
+  ContainerApplication,
   DisruptionBudget,
   GitConfigProviderSpec,
+  HelmApplication,
   HttpConfigProviderSpec,
   ImageApplicationProviderSpec,
   ImagePullPolicy,
+  InlineApplicationProviderSpec,
   InlineConfigProviderSpec,
   KubernetesSecretProviderSpec,
+  QuadletApplication,
 } from '@flightctl/types';
-import { ApplicationProviderSpecFixed, FlightCtlLabel } from './extraTypes';
+import { FlightCtlLabel } from './extraTypes';
 import { UpdateScheduleMode } from '../utils/time';
 
-export const RUN_AS_DEFAULT_USER = 'flightctl';
+// At the moment the "root" user is the default user when no user is specified.
 export const RUN_AS_ROOT_USER = 'root';
+export const RUN_AS_FLIGHTCTL_USER = 'flightctl';
 
 export enum ConfigType {
   GIT = 'git',
@@ -35,77 +40,12 @@ export type GitConfigTemplate = ConfigTemplate & {
   path: string;
 };
 
+/** Used when adding a Compose/Quadlet app to choose image vs inline source. */
 export enum AppSpecType {
   OCI_IMAGE = 'image',
   INLINE = 'inline',
 }
 
-type InlineContent = {
-  content?: string;
-  path: string;
-  base64?: boolean;
-};
-
-type AppBase = {
-  appType: AppType;
-  specType: AppSpecType;
-  name?: string;
-  variables: { name: string; value: string }[];
-  volumes?: ApplicationVolumeForm[];
-};
-
-export type PortMapping = {
-  hostPort: string;
-  containerPort: string;
-};
-
-export type SingleContainerAppForm = AppBase & {
-  appType: AppType.AppTypeContainer;
-  specType: AppSpecType.OCI_IMAGE;
-  name: string;
-  image: string;
-  ports?: PortMapping[];
-  limits?: ApplicationResourceLimits;
-  runAs?: string;
-};
-
-export type QuadletImageAppForm = AppBase & {
-  appType: AppType.AppTypeQuadlet;
-  specType: AppSpecType.OCI_IMAGE;
-  image: string;
-  runAs?: string;
-};
-
-export type QuadletInlineAppForm = AppBase & {
-  appType: AppType.AppTypeQuadlet;
-  specType: AppSpecType.INLINE;
-  name: string; // transforms the field in required
-  files: InlineContent[];
-  runAs?: string;
-};
-
-export type ComposeImageAppForm = AppBase & {
-  appType: AppType.AppTypeCompose;
-  specType: AppSpecType.OCI_IMAGE;
-  image: string;
-};
-
-export type ComposeInlineAppForm = AppBase & {
-  appType: AppType.AppTypeCompose;
-  specType: AppSpecType.INLINE;
-  name: string;
-  files: InlineContent[];
-};
-
-export type HelmImageAppForm = Omit<AppBase, 'variables' | 'volumes'> & {
-  appType: AppType.AppTypeHelm;
-  specType: AppSpecType.OCI_IMAGE;
-  image: string;
-  namespace?: string;
-  valuesFiles: Array<string>;
-  valuesYaml?: string;
-};
-
 export const isGitConfigTemplate = (configTemplate: ConfigTemplate): configTemplate is GitConfigTemplate =>
   configTemplate.type === ConfigType.GIT;
 
@@ -123,50 +63,70 @@ export type RepoConfig = GitConfigProviderSpec | HttpConfigProviderSpec;
 export const isRepoConfig = (config: ConfigSourceProvider): config is RepoConfig =>
   isGitProviderSpec(config) || isHttpProviderSpec(config);
 
-export type AppForm =
-  | QuadletImageAppForm
-  | QuadletInlineAppForm
-  | ComposeImageAppForm
-  | ComposeInlineAppForm
-  | SingleContainerAppForm
-  | HelmImageAppForm;
-
-export const isImageAppProvider = (
-  app: ApplicationProviderSpecFixed,
-): app is ApplicationProviderSpecFixed & ImageApplicationProviderSpec => 'image' in app;
-
-// Type guards for the 5 explicit types
-export const isQuadletImageAppForm = (app: AppForm): app is QuadletImageAppForm =>
-  app.appType === AppType.AppTypeQuadlet && app.specType === AppSpecType.OCI_IMAGE;
-export const isQuadletInlineAppForm = (app: AppForm): app is QuadletInlineAppForm =>
-  app.appType === AppType.AppTypeQuadlet && app.specType === AppSpecType.INLINE;
-export const isComposeImageAppForm = (app: AppForm): app is ComposeImageAppForm =>
-  app.appType === AppType.AppTypeCompose && app.specType === AppSpecType.OCI_IMAGE;
-export const isComposeInlineAppForm = (app: AppForm): app is ComposeInlineAppForm =>
-  app.appType === AppType.AppTypeCompose && app.specType === AppSpecType.INLINE;
-export const isSingleContainerAppForm = (app: AppForm): app is SingleContainerAppForm =>
-  app.appType === AppType.AppTypeContainer;
-export const isHelmImageAppForm = (app: AppForm): app is HelmImageAppForm =>
-  app.appType === AppType.AppTypeHelm && app.specType === AppSpecType.OCI_IMAGE;
+export const isImageVariantApp = (
+  app: ApplicationProviderSpec,
+): app is ApplicationProviderSpec & ImageApplicationProviderSpec => 'image' in app;
+export const isInlineVariantApp = (
+  app: ApplicationProviderSpec,
+): app is ApplicationProviderSpec & InlineApplicationProviderSpec => 'inline' in app;
 
 export type ApplicationVolumeForm = {
   name: string;
-  imageRef?: string;
-  imagePullPolicy?: ImagePullPolicy;
-  mountPath?: string;
+  imageRef: string;
+  imagePullPolicy: ImagePullPolicy;
+  mountPath: string;
 };
 
+export type PortMapping = {
+  hostPort: string;
+  containerPort: string;
+};
+
+export type VariablesForm = { name: string; value: string }[];
+
+export type InlineFileForm = { path: string; content?: string; base64?: boolean };
+
+type InlineOrImageVariantForm = {
+  specType: AppSpecType;
+  image: string;
+  files: InlineFileForm[];
+};
+
+export type SingleContainerAppForm = Omit<ContainerApplication, 'ports' | 'resources' | 'envVars' | 'volumes'> & {
+  specType: AppSpecType.OCI_IMAGE;
+  ports: PortMapping[];
+  cpuLimit: string;
+  memoryLimit: string;
+  variables: VariablesForm;
+  volumes: ApplicationVolumeForm[];
+};
+
+export type HelmAppForm = Omit<HelmApplication, 'values'> & {
+  specType: AppSpecType.OCI_IMAGE;
+  valuesYaml?: string;
+  valuesFiles: string[];
+};
+
+export type QuadletAppForm = Omit<QuadletApplication, 'envVars' | 'volumes' | 'image' | 'inline'> &
+  InlineOrImageVariantForm & {
+    variables: VariablesForm;
+    volumes: ApplicationVolumeForm[];
+  };
+
+export type ComposeAppForm = Omit<ComposeApplication, 'envVars' | 'volumes' | 'image' | 'inline'> &
+  InlineOrImageVariantForm & {
+    variables: VariablesForm;
+    volumes: ApplicationVolumeForm[];
+  };
+
+export type AppForm = SingleContainerAppForm | HelmAppForm | QuadletAppForm | ComposeAppForm;
+
 const hasTemplateVariables = (str: string) => /{{.+?}}/.test(str);
 
-export const getAppIdentifier = (app: AppForm) => {
-  if (isSingleContainerAppForm(app)) {
-    return app.name || app.image;
-  }
-  if (isQuadletImageAppForm(app) || isComposeImageAppForm(app)) {
-    return app.name || app.image;
-  }
-  // Name is mandatory for inline applications
-  return app.name;
+export const getAppIdentifier = (app: AppForm | ApplicationProviderSpec): string => {
+  if (app.name) return app.name;
+  if ('image' in app && app.image) return app.image;
+  return '';
 };
 
 const removeSlashes = (url: string | undefined) => (url || '').replace(/^\/+|\/+$/g, '');
@@ -214,7 +174,7 @@ export const isKubeProviderSpec = (providerSpec: ConfigProviderSpec): providerSp
 
 export type InlineConfigTemplate = ConfigTemplate & {
   type: ConfigType.INLINE;
-  files: Array<InlineContent & { permissions?: string; user?: string; group?: string }>;
+  files: Array<InlineFileForm & { permissions?: string; user?: string; group?: string }>;
 };
 
 export const isInlineConfigTemplate = (configTemplate: ConfigTemplate): configTemplate is InlineConfigTemplate =>

package/src/types/extraTypes.ts

@@ -1,7 +1,4 @@
 import {
-  AppType,
-  ApplicationEnvVars,
-  ApplicationVolumeProviderSpec,
   AuthProvider,
   Condition,
   ConditionType,
@@ -9,7 +6,6 @@ import {
   EnrollmentRequest,
   FileContent,
   Fleet,
-  ImageApplicationProviderSpec,
   OAuth2ProviderSpec,
   OIDCProviderSpec,
   RelativePath,
@@ -55,16 +51,10 @@ export type AnnotationType = DeviceAnnotation; // Add more types when they are a
 
 export const isFleet = (resource: ResourceSync | Fleet): resource is Fleet => resource.kind === 'Fleet';
 
-// ApplicationProviderSpec's definition for inline files adds a Record<string, any>. We use the fixed types to get full Typescript checks for the field
+// ApplicationProviderSpec's definition for inline files adds a Record<string, any>.
+// We use the fixed type to get proper Typescript checks for the field
 export type InlineApplicationFileFixed = FileContent & RelativePath;
 
-// "FixedApplicationProviderSpec" will need to be manually adjusted whenever the API definition changes
-export type ApplicationProviderSpecFixed = ApplicationEnvVars &
-  ApplicationVolumeProviderSpec & {
-    name?: string;
-    appType: AppType;
-  } & (ImageApplicationProviderSpec | { inline: InlineApplicationFileFixed[] });
-
 type CliArtifact = {
   os: string;
   arch: string;

package/src/types/rbac.ts

@@ -21,4 +21,10 @@ export enum RESOURCE {
   ALERTS = 'alerts',
   AUTH_PROVIDER = 'authproviders',
   IMAGE_BUILD = 'imagebuilds',
+  IMAGE_BUILD_LOG = 'imagebuilds/log',
+  IMAGE_BUILD_CANCEL = 'imagebuilds/cancel',
+  IMAGE_EXPORT = 'imageexports',
+  IMAGE_EXPORT_LOG = 'imageexports/log',
+  IMAGE_EXPORT_CANCEL = 'imageexports/cancel',
+  IMAGE_EXPORT_DOWNLOAD = 'imageexports/download',
 }

package/src/utils/imageBuilds.ts

@@ -99,6 +99,14 @@ export const isImageBuildActiveReason = (reason: ImageBuildConditionReason): boo
   );
 };
 
+export const isImageBuildCancelable = (reason: ImageBuildConditionReason): boolean => {
+  return (
+    reason === ImageBuildConditionReason.ImageBuildConditionReasonPending ||
+    reason === ImageBuildConditionReason.ImageBuildConditionReasonBuilding ||
+    reason === ImageBuildConditionReason.ImageBuildConditionReasonPushing
+  );
+};
+
 export const isImageExportActiveReason = (reason: ImageExportConditionReason): boolean => {
   return (
     reason === ImageExportConditionReason.ImageExportConditionReasonPending ||

package/src/utils/search.ts

@@ -1,5 +1,5 @@
 import fuzzy from 'fuzzysearch';
-import { API_VERSION } from '../constants';
+import { CORE_API_VERSION } from '../constants';
 
 // Must be an even number for "getSearchResultsCount" to work
 export const MAX_TOTAL_SEARCH_RESULTS = 10;
@@ -26,7 +26,7 @@ export const getSearchResultsCount = (labelCount: number, fleetCount: number) =>
 };
 
 export const getEmptyFleetSearch = () => ({
-  apiVersion: API_VERSION,
+  apiVersion: CORE_API_VERSION,
   kind: 'Fleet',
   metadata: {},
   items: [],