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

package/dist/ui-components/src/types/deviceSpec.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BatchLimitType = exports.isHttpProviderSpec = exports.isHttpConfigTemplate = exports.isInlineProviderSpec = exports.isInlineConfigTemplate = exports.isKubeProviderSpec = exports.isKubeSecretTemplate = exports.getRepoName = exports.getConfigFullRepoUrl = exports.getAppIdentifier = exports.isHelmImageAppForm = exports.isSingleContainerAppForm = exports.isComposeInlineAppForm = exports.isComposeImageAppForm = exports.isQuadletInlineAppForm = exports.isQuadletImageAppForm = exports.isImageAppProvider = exports.isRepoConfig = exports.isGitProviderSpec = exports.isGitConfigTemplate = exports.AppSpecType = exports.ConfigType = exports.RUN_AS_ROOT_USER = exports.RUN_AS_DEFAULT_USER = void 0;
-const types_1 = require("@flightctl/types");
-exports.RUN_AS_DEFAULT_USER = 'flightctl';
+exports.BatchLimitType = exports.isHttpProviderSpec = exports.isHttpConfigTemplate = exports.isInlineProviderSpec = exports.isInlineConfigTemplate = exports.isKubeProviderSpec = exports.isKubeSecretTemplate = exports.getRepoName = exports.getConfigFullRepoUrl = exports.getAppIdentifier = exports.isInlineVariantApp = exports.isImageVariantApp = exports.isRepoConfig = exports.isGitProviderSpec = exports.isGitConfigTemplate = exports.AppSpecType = exports.ConfigType = exports.RUN_AS_FLIGHTCTL_USER = exports.RUN_AS_ROOT_USER = void 0;
+// At the moment the "root" user is the default user when no user is specified.
 exports.RUN_AS_ROOT_USER = 'root';
+exports.RUN_AS_FLIGHTCTL_USER = 'flightctl';
 var ConfigType;
 (function (ConfigType) {
     ConfigType["GIT"] = "git";
@@ -11,6 +11,7 @@ var ConfigType;
     ConfigType["K8S_SECRET"] = "secret";
     ConfigType["INLINE"] = "inline";
 })(ConfigType || (exports.ConfigType = ConfigType = {}));
+/** Used when adding a Compose/Quadlet app to choose image vs inline source. */
 var AppSpecType;
 (function (AppSpecType) {
     AppSpecType["OCI_IMAGE"] = "image";
@@ -22,31 +23,17 @@ const isGitProviderSpec = (providerSpec) => 'gitRef' in providerSpec;
 exports.isGitProviderSpec = isGitProviderSpec;
 const isRepoConfig = (config) => (0, exports.isGitProviderSpec)(config) || (0, exports.isHttpProviderSpec)(config);
 exports.isRepoConfig = isRepoConfig;
-const isImageAppProvider = (app) => 'image' in app;
-exports.isImageAppProvider = isImageAppProvider;
-// Type guards for the 5 explicit types
-const isQuadletImageAppForm = (app) => app.appType === types_1.AppType.AppTypeQuadlet && app.specType === AppSpecType.OCI_IMAGE;
-exports.isQuadletImageAppForm = isQuadletImageAppForm;
-const isQuadletInlineAppForm = (app) => app.appType === types_1.AppType.AppTypeQuadlet && app.specType === AppSpecType.INLINE;
-exports.isQuadletInlineAppForm = isQuadletInlineAppForm;
-const isComposeImageAppForm = (app) => app.appType === types_1.AppType.AppTypeCompose && app.specType === AppSpecType.OCI_IMAGE;
-exports.isComposeImageAppForm = isComposeImageAppForm;
-const isComposeInlineAppForm = (app) => app.appType === types_1.AppType.AppTypeCompose && app.specType === AppSpecType.INLINE;
-exports.isComposeInlineAppForm = isComposeInlineAppForm;
-const isSingleContainerAppForm = (app) => app.appType === types_1.AppType.AppTypeContainer;
-exports.isSingleContainerAppForm = isSingleContainerAppForm;
-const isHelmImageAppForm = (app) => app.appType === types_1.AppType.AppTypeHelm && app.specType === AppSpecType.OCI_IMAGE;
-exports.isHelmImageAppForm = isHelmImageAppForm;
+const isImageVariantApp = (app) => 'image' in app;
+exports.isImageVariantApp = isImageVariantApp;
+const isInlineVariantApp = (app) => 'inline' in app;
+exports.isInlineVariantApp = isInlineVariantApp;
 const hasTemplateVariables = (str) => /{{.+?}}/.test(str);
 const getAppIdentifier = (app) => {
-    if ((0, exports.isSingleContainerAppForm)(app)) {
-        return app.name || app.image;
-    }
-    if ((0, exports.isQuadletImageAppForm)(app) || (0, exports.isComposeImageAppForm)(app)) {
-        return app.name || app.image;
-    }
-    // Name is mandatory for inline applications
-    return app.name;
+    if (app.name)
+        return app.name;
+    if ('image' in app && app.image)
+        return app.image;
+    return '';
 };
 exports.getAppIdentifier = getAppIdentifier;
 const removeSlashes = (url) => (url || '').replace(/^\/+|\/+$/g, '');

package/dist/ui-components/src/types/deviceSpec.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceSpec.js","sourceRoot":"","sources":["../../../../src/types/deviceSpec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deviceSpec.js","sourceRoot":"","sources":["../../../../src/types/deviceSpec.ts"],"names":[],"mappings":"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"}

package/dist/ui-components/src/types/extraTypes.d.ts

@@ -1,4 +1,4 @@
-import { AppType, ApplicationEnvVars, ApplicationVolumeProviderSpec, AuthProvider, Condition, ConditionType, Device, EnrollmentRequest, FileContent, Fleet, ImageApplicationProviderSpec, OAuth2ProviderSpec, OIDCProviderSpec, RelativePath, ResourceKind, ResourceSync } from '@flightctl/types';
+import { AuthProvider, Condition, ConditionType, Device, EnrollmentRequest, FileContent, Fleet, OAuth2ProviderSpec, OIDCProviderSpec, RelativePath, ResourceKind, ResourceSync } from '@flightctl/types';
 import { ImageBuild, ImageBuildCondition, ImageBuildConditionType, ResourceKind as ImageBuilderResourceKind, ImageExport, ImageExportCondition, ImageExportConditionType } from '@flightctl/types/imagebuilder';
 export interface FlightCtlLabel {
     key: string;
@@ -21,12 +21,6 @@ export declare const isEnrollmentRequest: (resource: Device | EnrollmentRequest)
 export type AnnotationType = DeviceAnnotation;
 export declare const isFleet: (resource: ResourceSync | Fleet) => resource is Fleet;
 export type InlineApplicationFileFixed = FileContent & RelativePath;
-export type ApplicationProviderSpecFixed = ApplicationEnvVars & ApplicationVolumeProviderSpec & {
-    name?: string;
-    appType: AppType;
-} & (ImageApplicationProviderSpec | {
-    inline: InlineApplicationFileFixed[];
-});
 type CliArtifact = {
     os: string;
     arch: string;

package/dist/ui-components/src/types/extraTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extraTypes.d.ts","sourceRoot":"","sources":["../../../../src/types/extraTypes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extraTypes.d.ts","sourceRoot":"","sources":["../../../../src/types/extraTypes.ts"],"names":[],"mappings":"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"}

package/dist/ui-components/src/types/extraTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"extraTypes.js","sourceRoot":"","sources":["../../../../src/types/extraTypes.ts"],"names":[],"mappings":";;;AAyCA,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,wEAAoD,CAAA;IACpD,yEAAqD,CAAA;AACvD,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAMM,MAAM,mBAAmB,GAAG,CAAC,QAAoC,EAAiC,EAAE,CACzG,QAAQ,CAAC,IAAI,KAAK,mBAAmB,CAAC;AAD3B,QAAA,mBAAmB,uBACQ;AAIjC,MAAM,OAAO,GAAG,CAAC,QAA8B,EAAqB,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC;AAA3F,QAAA,OAAO,WAAoF;AAmDjG,MAAM,qBAAqB,GAAG,CAAC,QAAsB,EAAmC,EAAE,CAC/F,QAAQ,CAAC,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,MAAM,CAAC;AAD5F,QAAA,qBAAqB,yBACuE;AAEzG,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,2BAAW,CAAA;IACX,2BAAW,CAAA;IACX,uCAAuB,CAAA;AACzB,CAAC,EANW,YAAY,4BAAZ,YAAY,QAMvB"}
+{"version":3,"file":"extraTypes.js","sourceRoot":"","sources":["../../../../src/types/extraTypes.ts"],"names":[],"mappings":";;;AAqCA,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,wEAAoD,CAAA;IACpD,yEAAqD,CAAA;AACvD,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAMM,MAAM,mBAAmB,GAAG,CAAC,QAAoC,EAAiC,EAAE,CACzG,QAAQ,CAAC,IAAI,KAAK,mBAAmB,CAAC;AAD3B,QAAA,mBAAmB,uBACQ;AAIjC,MAAM,OAAO,GAAG,CAAC,QAA8B,EAAqB,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC;AAA3F,QAAA,OAAO,WAAoF;AA6CjG,MAAM,qBAAqB,GAAG,CAAC,QAAsB,EAAmC,EAAE,CAC/F,QAAQ,CAAC,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,MAAM,CAAC;AAD5F,QAAA,qBAAqB,yBACuE;AAEzG,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,2BAAW,CAAA;IACX,2BAAW,CAAA;IACX,uCAAuB,CAAA;AACzB,CAAC,EANW,YAAY,4BAAZ,YAAY,QAMvB"}

package/dist/ui-components/src/types/rbac.d.ts

@@ -19,6 +19,12 @@ export declare enum RESOURCE {
     ENROLLMENT_REQUEST_APPROVAL = "enrollmentrequests/approval",
     ALERTS = "alerts",
     AUTH_PROVIDER = "authproviders",
-    IMAGE_BUILD = "imagebuilds"
+    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"
 }
 //# sourceMappingURL=rbac.d.ts.map

package/dist/ui-components/src/types/rbac.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rbac.d.ts","sourceRoot":"","sources":["../../../../src/types/rbac.ts"],"names":[],"mappings":"AAAA,oBAAY,IAAI;IACd,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,oBAAY,QAAQ;IAClB,KAAK,WAAW;IAChB,MAAM,YAAY;IAClB,cAAc,oBAAoB;IAClC,mBAAmB,yBAAyB;IAC5C,aAAa,mBAAmB;IAChC,UAAU,iBAAiB;IAC3B,aAAa,kBAAkB;IAC/B,kBAAkB,uBAAuB;IACzC,2BAA2B,gCAAgC;IAC3D,MAAM,WAAW;IACjB,aAAa,kBAAkB;IAC/B,WAAW,gBAAgB;CAC5B"}
+{"version":3,"file":"rbac.d.ts","sourceRoot":"","sources":["../../../../src/types/rbac.ts"],"names":[],"mappings":"AAAA,oBAAY,IAAI;IACd,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED,oBAAY,QAAQ;IAClB,KAAK,WAAW;IAChB,MAAM,YAAY;IAClB,cAAc,oBAAoB;IAClC,mBAAmB,yBAAyB;IAC5C,aAAa,mBAAmB;IAChC,UAAU,iBAAiB;IAC3B,aAAa,kBAAkB;IAC/B,kBAAkB,uBAAuB;IACzC,2BAA2B,gCAAgC;IAC3D,MAAM,WAAW;IACjB,aAAa,kBAAkB;IAC/B,WAAW,gBAAgB;IAC3B,eAAe,oBAAoB;IACnC,kBAAkB,uBAAuB;IACzC,YAAY,iBAAiB;IAC7B,gBAAgB,qBAAqB;IACrC,mBAAmB,wBAAwB;IAC3C,qBAAqB,0BAA0B;CAChD"}

package/dist/ui-components/src/types/rbac.js

@@ -25,5 +25,11 @@ var RESOURCE;
     RESOURCE["ALERTS"] = "alerts";
     RESOURCE["AUTH_PROVIDER"] = "authproviders";
     RESOURCE["IMAGE_BUILD"] = "imagebuilds";
+    RESOURCE["IMAGE_BUILD_LOG"] = "imagebuilds/log";
+    RESOURCE["IMAGE_BUILD_CANCEL"] = "imagebuilds/cancel";
+    RESOURCE["IMAGE_EXPORT"] = "imageexports";
+    RESOURCE["IMAGE_EXPORT_LOG"] = "imageexports/log";
+    RESOURCE["IMAGE_EXPORT_CANCEL"] = "imageexports/cancel";
+    RESOURCE["IMAGE_EXPORT_DOWNLOAD"] = "imageexports/download";
 })(RESOURCE || (exports.RESOURCE = RESOURCE = {}));
 //# sourceMappingURL=rbac.js.map

package/dist/ui-components/src/types/rbac.js.map

@@ -1 +1 @@
-{"version":3,"file":"rbac.js","sourceRoot":"","sources":["../../../../src/types/rbac.ts"],"names":[],"mappings":";;;AAAA,IAAY,IAQX;AARD,WAAY,IAAI;IACd,yBAAiB,CAAA;IACjB,yBAAiB,CAAA;IACjB,qBAAa,CAAA;IACb,mBAAW,CAAA;IACX,uBAAe,CAAA;IACf,qBAAa,CAAA;IACb,yBAAiB,CAAA;AACnB,CAAC,EARW,IAAI,oBAAJ,IAAI,QAQf;AAED,IAAY,QAaX;AAbD,WAAY,QAAQ;IAClB,4BAAgB,CAAA;IAChB,8BAAkB,CAAA;IAClB,8CAAkC,CAAA;IAClC,wDAA4C,CAAA;IAC5C,4CAAgC,CAAA;IAChC,uCAA2B,CAAA;IAC3B,2CAA+B,CAAA;IAC/B,qDAAyC,CAAA;IACzC,uEAA2D,CAAA;IAC3D,6BAAiB,CAAA;IACjB,2CAA+B,CAAA;IAC/B,uCAA2B,CAAA;AAC7B,CAAC,EAbW,QAAQ,wBAAR,QAAQ,QAanB"}
+{"version":3,"file":"rbac.js","sourceRoot":"","sources":["../../../../src/types/rbac.ts"],"names":[],"mappings":";;;AAAA,IAAY,IAQX;AARD,WAAY,IAAI;IACd,yBAAiB,CAAA;IACjB,yBAAiB,CAAA;IACjB,qBAAa,CAAA;IACb,mBAAW,CAAA;IACX,uBAAe,CAAA;IACf,qBAAa,CAAA;IACb,yBAAiB,CAAA;AACnB,CAAC,EARW,IAAI,oBAAJ,IAAI,QAQf;AAED,IAAY,QAmBX;AAnBD,WAAY,QAAQ;IAClB,4BAAgB,CAAA;IAChB,8BAAkB,CAAA;IAClB,8CAAkC,CAAA;IAClC,wDAA4C,CAAA;IAC5C,4CAAgC,CAAA;IAChC,uCAA2B,CAAA;IAC3B,2CAA+B,CAAA;IAC/B,qDAAyC,CAAA;IACzC,uEAA2D,CAAA;IAC3D,6BAAiB,CAAA;IACjB,2CAA+B,CAAA;IAC/B,uCAA2B,CAAA;IAC3B,+CAAmC,CAAA;IACnC,qDAAyC,CAAA;IACzC,yCAA6B,CAAA;IAC7B,iDAAqC,CAAA;IACrC,uDAA2C,CAAA;IAC3C,2DAA+C,CAAA;AACjD,CAAC,EAnBW,QAAQ,wBAAR,QAAQ,QAmBnB"}

package/dist/ui-components/src/utils/imageBuilds.d.ts

@@ -9,6 +9,7 @@ export declare const getImageReference: (repositories: Repository[], imageTarget
 export declare const getImageBuildStatusReason: (imageBuild: ImageBuild) => ImageBuildConditionReason;
 export declare const getImageExportStatusReason: (imageExport: ImageExport) => ImageExportConditionReason;
 export declare const isImageBuildActiveReason: (reason: ImageBuildConditionReason) => boolean;
+export declare const isImageBuildCancelable: (reason: ImageBuildConditionReason) => boolean;
 export declare const isImageExportActiveReason: (reason: ImageExportConditionReason) => boolean;
 export type ExportDownloadResult = {
     type: 'redirect';

package/dist/ui-components/src/utils/imageBuilds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageBuilds.d.ts","sourceRoot":"","sources":["../../../../src/utils/imageBuilds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,yBAAyB,EAEzB,qBAAqB,EACrB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAE3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,eAAO,MAAM,mBAAmB,0BAK/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,gBAAgB,GAAG,qBAAqB,GAAG,SAAS,WAKhG,CAAC;AAEF,eAAO,MAAM,0BAA0B,MAAO,SAAS,UAAU,gBAAgB,WAWhF,CAAC;AAEF,eAAO,MAAM,oBAAoB,MAAO,SAAS,UAAU,gBAAgB,WAO1E,CAAC;AAUF,eAAO,MAAM,iBAAiB,iBACd,UAAU,EAAE,eACb,gBAAgB,GAAG,qBAAqB,uBAUtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,eAAgB,UAAU,KAAG,yBAOlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBAAiB,WAAW,KAAG,0BAQrE,CAAC;AAEF,eAAO,MAAM,wBAAwB,WAAY,yBAAyB,KAAG,OAO5E,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,0BAA0B,KAAG,OAO9E,CAAC;AAmCF,MAAM,MAAM,oBAAoB,GAC5B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAK/D,eAAO,MAAM,uBAAuB,aAAoB,QAAQ,KAAG,QAAQ,oBAAoB,GAAG,IAAI,CAwBrG,CAAC"}
+{"version":3,"file":"imageBuilds.d.ts","sourceRoot":"","sources":["../../../../src/utils/imageBuilds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,yBAAyB,EAEzB,qBAAqB,EACrB,gBAAgB,EAChB,WAAW,EACX,0BAA0B,EAE3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,eAAO,MAAM,mBAAmB,0BAK/B,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,gBAAgB,GAAG,qBAAqB,GAAG,SAAS,WAKhG,CAAC;AAEF,eAAO,MAAM,0BAA0B,MAAO,SAAS,UAAU,gBAAgB,WAWhF,CAAC;AAEF,eAAO,MAAM,oBAAoB,MAAO,SAAS,UAAU,gBAAgB,WAO1E,CAAC;AAUF,eAAO,MAAM,iBAAiB,iBACd,UAAU,EAAE,eACb,gBAAgB,GAAG,qBAAqB,uBAUtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,eAAgB,UAAU,KAAG,yBAOlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBAAiB,WAAW,KAAG,0BAQrE,CAAC;AAEF,eAAO,MAAM,wBAAwB,WAAY,yBAAyB,KAAG,OAO5E,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAY,yBAAyB,KAAG,OAM1E,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,0BAA0B,KAAG,OAO9E,CAAC;AAYF,MAAM,MAAM,oBAAoB,GAC5B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAK/D,eAAO,MAAM,uBAAuB,aAAoB,QAAQ,KAAG,QAAQ,oBAAoB,GAAG,IAAI,CA6BrG,CAAC"}

package/dist/ui-components/src/utils/imageBuilds.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExportDownloadResult = exports.isImageExportActiveReason = exports.isImageBuildActiveReason = exports.getImageExportStatusReason = exports.getImageBuildStatusReason = exports.getImageReference = exports.getExportFormatLabel = exports.getExportFormatDescription = exports.getImageBuildImage = exports.getAllExportFormats = void 0;
+exports.getExportDownloadResult = exports.isImageExportActiveReason = exports.isImageBuildCancelable = exports.isImageBuildActiveReason = exports.getImageExportStatusReason = exports.getImageBuildStatusReason = exports.getImageReference = exports.getExportFormatLabel = exports.getExportFormatDescription = exports.getImageBuildImage = exports.getAllExportFormats = void 0;
 const tslib_1 = require("tslib");
 const imagebuilder_1 = require("@flightctl/types/imagebuilder");
 const utils_1 = require("../components/Repository/CreateRepository/utils");
@@ -78,6 +78,12 @@ const isImageBuildActiveReason = (reason) => {
         reason === imagebuilder_1.ImageBuildConditionReason.ImageBuildConditionReasonCanceling);
 };
 exports.isImageBuildActiveReason = isImageBuildActiveReason;
+const isImageBuildCancelable = (reason) => {
+    return (reason === imagebuilder_1.ImageBuildConditionReason.ImageBuildConditionReasonPending ||
+        reason === imagebuilder_1.ImageBuildConditionReason.ImageBuildConditionReasonBuilding ||
+        reason === imagebuilder_1.ImageBuildConditionReason.ImageBuildConditionReasonPushing);
+};
+exports.isImageBuildCancelable = isImageBuildCancelable;
 const isImageExportActiveReason = (reason) => {
     return (reason === imagebuilder_1.ImageExportConditionReason.ImageExportConditionReasonPending ||
         reason === imagebuilder_1.ImageExportConditionReason.ImageExportConditionReasonConverting ||
@@ -85,14 +91,6 @@ const isImageExportActiveReason = (reason) => {
         reason === imagebuilder_1.ImageExportConditionReason.ImageExportConditionReasonCanceling);
 };
 exports.isImageExportActiveReason = isImageExportActiveReason;
-const isDownloadResultRedirect = (response) => {
-    return (response.status === 302 ||
-        response.status === 301 ||
-        response.status === 307 ||
-        response.status === 308 ||
-        response.type === 'opaqueredirect' ||
-        response.status === 0);
-};
 // Validate that a URL is safe to use for download (only http/https protocols)
 const isValidDownloadUrl = (url) => {
     try {
@@ -103,31 +101,24 @@ const isValidDownloadUrl = (url) => {
         return false;
     }
 };
-const getRedirectUrl = (response) => {
-    // If the Location header is present, it indicates a redirect.
-    const redirectUrl = response.headers.get('Location');
-    if (redirectUrl) {
-        return redirectUrl;
-    }
-    if (isDownloadResultRedirect(response) && response.url) {
-        return response.url;
-    }
-    return undefined;
-};
-// The download endpoint returns two types of responses: a redirect URL or a blob.
-// If a redirect URL is found, we should use it to trigger the download in the browser.
-// If no redirect URL is found, we should download the blob directly.
+// The ImageBuilder API download endpoint returns two types of responses: a redirect URL or a blob.
+// When it returns a redirect URL, the UI proxy rewrites the response to 200 with { redirectUrl: CDN_URL }
+// When no redirect URL is found, we should download the blob directly.
 const getExportDownloadResult = (response) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    if (!response.ok && response.status !== 0) {
+    if (!response.ok || response.type === 'opaqueredirect' || response.status === 0) {
         return null;
     }
-    const redirectUrl = getRedirectUrl(response);
-    if (redirectUrl) {
-        if (!isValidDownloadUrl(redirectUrl)) {
-            throw new Error('Invalid redirect URL received from server');
+    // Extract the redirect URL returned by the UI proxy
+    const contentType = response.headers.get('Content-Type') || '';
+    if (response.ok && contentType.includes('application/json')) {
+        const data = (yield response.json());
+        const url = data === null || data === void 0 ? void 0 : data.redirectUrl;
+        if (url && isValidDownloadUrl(url)) {
+            return { type: 'redirect', url };
         }
-        return { type: 'redirect', url: redirectUrl };
+        return null;
     }
+    // Download the blob directly
     const blob = yield response.blob();
     let filename = '';
     const disposition = response.headers.get('Content-Disposition');

package/dist/ui-components/src/utils/imageBuilds.js.map

@@ -1 +1 @@
-{"version":3,"file":"imageBuilds.js","sourceRoot":"","sources":["../../../../src/utils/imageBuilds.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"imageBuilds.js","sourceRoot":"","sources":["../../../../src/utils/imageBuilds.ts"],"names":[],"mappings":"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"}

package/dist/ui-components/src/utils/search.d.ts

@@ -1,8 +1,9 @@
+import { ApiVersion } from '@flightctl/types';
 export declare const MAX_TOTAL_SEARCH_RESULTS = 10;
 export declare const fuzzySeach: (filter: string | undefined, value?: string) => boolean;
 export declare const getSearchResultsCount: (labelCount: number, fleetCount: number) => number[];
 export declare const getEmptyFleetSearch: () => {
-    apiVersion: string;
+    apiVersion: ApiVersion;
     kind: string;
     metadata: {};
     items: never[];

package/dist/ui-components/src/utils/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/utils/search.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C,eAAO,MAAM,UAAU,WAAY,MAAM,GAAG,SAAS,UAAU,MAAM,KAAG,OAMvE,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAgB,MAAM,cAAc,MAAM,aAW3E,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;CAK9B,CAAC"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/utils/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAE3C,eAAO,MAAM,UAAU,WAAY,MAAM,GAAG,SAAS,UAAU,MAAM,KAAG,OAMvE,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAgB,MAAM,cAAc,MAAM,aAW3E,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;CAK9B,CAAC"}

package/dist/ui-components/src/utils/search.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEmptyFleetSearch = exports.getSearchResultsCount = exports.fuzzySeach = exports.MAX_TOTAL_SEARCH_RESULTS = void 0;
 const tslib_1 = require("tslib");
 const fuzzysearch_1 = tslib_1.__importDefault(require("fuzzysearch"));
-const constants_1 = require("../constants");
+const types_1 = require("@flightctl/types");
 // Must be an even number for "getSearchResultsCount" to work
 exports.MAX_TOTAL_SEARCH_RESULTS = 10;
 const fuzzySeach = (filter, value) => {
@@ -27,7 +27,7 @@ const getSearchResultsCount = (labelCount, fleetCount) => {
 };
 exports.getSearchResultsCount = getSearchResultsCount;
 const getEmptyFleetSearch = () => ({
-    apiVersion: constants_1.API_VERSION,
+    apiVersion: types_1.ApiVersion.ApiVersionV1beta1,
     kind: 'Fleet',
     metadata: {},
     items: [],

package/dist/ui-components/src/utils/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/utils/search.ts"],"names":[],"mappings":";;;;AAAA,sEAAgC;AAChC,4CAA2C;AAE3C,6DAA6D;AAChD,QAAA,wBAAwB,GAAG,EAAE,CAAC;AAEpC,MAAM,UAAU,GAAG,CAAC,MAA0B,EAAE,KAAc,EAAW,EAAE;IAChF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,6DAA6D;IAC7D,OAAO,IAAA,qBAAK,EAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAY,CAAC;AACrF,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;IAC9E,IAAI,UAAU,GAAG,UAAU,IAAI,gCAAwB,EAAE,CAAC;QACxD,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,gCAAwB,GAAG,CAAC,CAAC,CAAC;IAC3E,IAAI,GAAG,KAAK,gCAAwB,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,gCAAwB,GAAG,CAAC,EAAE,gCAAwB,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,IAAI,GAAG,gCAAwB,GAAG,GAAG,CAAC;IAC5C,OAAO,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC,CAAC;AAXW,QAAA,qBAAqB,yBAWhC;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,CAAC;IACxC,UAAU,EAAE,uBAAW;IACvB,IAAI,EAAE,OAAO;IACb,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE,EAAE;CACV,CAAC,CAAC;AALU,QAAA,mBAAmB,uBAK7B"}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/utils/search.ts"],"names":[],"mappings":";;;;AAAA,sEAAgC;AAChC,4CAA8C;AAE9C,6DAA6D;AAChD,QAAA,wBAAwB,GAAG,EAAE,CAAC;AAEpC,MAAM,UAAU,GAAG,CAAC,MAA0B,EAAE,KAAc,EAAW,EAAE;IAChF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,6DAA6D;IAC7D,OAAO,IAAA,qBAAK,EAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAY,CAAC;AACrF,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;IAC9E,IAAI,UAAU,GAAG,UAAU,IAAI,gCAAwB,EAAE,CAAC;QACxD,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,gCAAwB,GAAG,CAAC,CAAC,CAAC;IAC3E,IAAI,GAAG,KAAK,gCAAwB,GAAG,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,gCAAwB,GAAG,CAAC,EAAE,gCAAwB,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,IAAI,GAAG,gCAAwB,GAAG,GAAG,CAAC;IAC5C,OAAO,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC,CAAC;AAXW,QAAA,qBAAqB,yBAWhC;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,CAAC;IACxC,UAAU,EAAE,kBAAU,CAAC,iBAAiB;IACxC,IAAI,EAAE,OAAO;IACb,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE,EAAE;CACV,CAAC,CAAC;AALU,QAAA,mBAAmB,uBAK7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flightctl/ui-components",
-  "version": "1.1.0-rc1",
+  "version": "1.1.0-rc3",
   "description": "Components for Flightctl UI",
   "repository": "https://github.com/flightctl/flightctl-ui.git",
   "homepage": "https://github.com/flightctl/flightctl-ui.git",
@@ -35,7 +35,7 @@
     "file-saver": "^2.0.2",
     "formik": "^2.4.5",
     "fuzzysearch": "^1.0.3",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "percent-round": "^2.3.1",
     "use-debounce": "^10.0.1",
     "yup": "^1.3.3"

package/src/components/AuthProvider/CreateAuthProvider/utils.ts

@@ -1,6 +1,7 @@
 import * as Yup from 'yup';
 import { TFunction } from 'i18next';
 import {
+  ApiVersion,
   AuthDynamicRoleAssignment,
   AuthOrganizationAssignment,
   AuthProvider,
@@ -25,7 +26,6 @@ import {
 } from './types';
 import { validKubernetesDnsSubdomain } from '../../form/validations';
 import { DynamicAuthProviderSpec, ProviderType } from '../../../types/extraTypes';
-import { API_VERSION } from '../../../constants';
 
 export const getAssignmentTypeLabel = (
   type: AuthOrganizationAssignment['type'] | AuthRoleAssignment['type'] | undefined,
@@ -317,7 +317,7 @@ export const getAuthProvider = (values: AuthProviderFormValues): AuthProvider =>
   }
 
   return {
-    apiVersion: API_VERSION,
+    apiVersion: ApiVersion.ApiVersionV1beta1,
     kind: 'AuthProvider',
     metadata: {
       name: values.name,

package/src/components/DetailsPage/Tables/ApplicationsTable.tsx

@@ -6,7 +6,7 @@ import { DeviceApplicationStatus } from '@flightctl/types';
 import { useTranslation } from '../../../hooks/useTranslation';
 import ApplicationStatus from '../../Status/ApplicationStatus';
 import { getAppTypeLabel } from '../../../utils/apps';
-import { RUN_AS_DEFAULT_USER } from '../../../types/deviceSpec';
+import { RUN_AS_ROOT_USER } from '../../../types/deviceSpec';
 
 type ApplicationsTableProps = {
   appsStatus: DeviceApplicationStatus[];
@@ -45,7 +45,7 @@ const ApplicationsTable = ({ appsStatus }: ApplicationsTableProps) => {
               <Td dataLabel={t('Type')}>
                 {app.appType ? <Label variant="outline">{getAppTypeLabel(app.appType, t)}</Label> : '-'}
               </Td>
-              <Td dataLabel={t('Run as user')}>{app.runAs || RUN_AS_DEFAULT_USER}</Td>
+              <Td dataLabel={t('Run as user')}>{app.runAs || RUN_AS_ROOT_USER}</Td>
               <Td dataLabel={t('Embedded')}>{app.embedded ? t('Yes') : t('No')}</Td>
             </Tr>
           );

package/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx

@@ -59,9 +59,10 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
   const isEnrolled = !device || isDeviceEnrolled(device);
 
   const { checkPermissions } = usePermissionsContext();
-  const [hasTerminalAccess, canDelete, canEdit, canDecommission, canResume] =
+  const [hasTerminalAccess, canDelete, hasEditPermissions, canDecommission, canResume] =
     checkPermissions(deviceDetailsPermissions);
 
+  const canEdit = hasEditPermissions && isEnrolled;
   const canOpenTerminal = hasTerminalAccess && isEnrolled;
 
   const { deleteAction, deleteModal } = useDeleteAction({
@@ -159,7 +160,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
         isEnrolled ? (
           <DetailsPageActions>
             <DropdownList>
-              {canEdit && (
+              {hasEditPermissions && (
                 <DropdownItem
                   onClick={() => navigate({ route: ROUTE.DEVICE_EDIT, postfix: deviceId })}
                   {...editActionProps}
@@ -186,7 +187,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
           <Route
             path="details"
             element={
-              <DeviceDetailsTab device={device} refetch={refetch} canEdit={canEdit}>
+              <DeviceDetailsTab device={device} refetch={refetch} canEdit={hasEditPermissions}>
                 {children}
               </DeviceDetailsTab>
             }
@@ -194,7 +195,12 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) =
           <Route
             path="yaml"
             element={
-              <YamlEditor apiObj={device} refetch={refetch} disabledEditReason={editDisabledReason} canEdit={canEdit} />
+              <YamlEditor
+                apiObj={device}
+                refetch={refetch}
+                disabledEditReason={editDisabledReason}
+                canEdit={hasEditPermissions}
+              />
             }
           />
           {!hideTerminal && canOpenTerminal && <Route path="terminal" element={<TerminalTab device={device} />} />}

package/src/components/Device/DeviceDetails/TerminalTab.tsx

@@ -97,7 +97,15 @@ const TerminalTab = ({ device }: TerminalTabProps) => {
   }
 
   if (error) {
-    return <ErrorAlert error={error} />;
+    return (
+      <ErrorAlert
+        error={error}
+        onRetry={() => {
+          terminal.current?.reset();
+          reconnect();
+        }}
+      />
+    );
   }
 
   return (