cloudmr-ux 4.1.9 → 4.2.2

package/dist/CmrComponents/CmrCheckbox/CmrCheckbox.css

@@ -15,7 +15,7 @@
 }
 
 .Mui-checked {
-    color: #580F8B !important;  /* Checked state color */
+    color: var(--cmr-checkbox-checked-color, #580f8b) !important;  /* Default #580f8b; override via checkedColor prop */
 }
 
 .MuiCheckbox-root:active, .MuiCheckbox-root:focus {

package/dist/CmrComponents/CmrCheckbox/CmrCheckbox.d.ts

@@ -9,6 +9,8 @@ interface CmrCheckboxProps extends React.HTMLAttributes<HTMLDivElement> {
     onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
     children?: any;
     style?: any;
+    /** Checked state color (e.g. '#580F8B'). Defaults to #580f8b when not set. */
+    checkedColor?: string;
 }
 export declare const CmrCheckbox: (props: CmrCheckboxProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/CmrComponents/CmrCheckbox/CmrCheckbox.js

@@ -25,6 +25,8 @@ import { Checkbox } from '@mui/material';
 import './CmrCheckbox.css';
 import { FormControlLabel } from '@mui/material';
 export var CmrCheckbox = function (props) {
-    var defaultChecked = props.defaultChecked, onChange = props.onChange, children = props.children, rest = __rest(props, ["defaultChecked", "onChange", "children"]);
-    return (_jsx(FormControlLabel, { disabled: props.disabled, style: props.style, className: props.className, control: _jsx(Checkbox, { style: props.style, checked: props.checked, defaultChecked: defaultChecked, onChange: onChange }), label: _jsx("span", __assign({ className: 'cmr-label', style: { paddingRight: 0, color: 'var(--bs-card-color)' } }, { children: props.children })), labelPlacement: "end" }));
+    var _a;
+    var defaultChecked = props.defaultChecked, onChange = props.onChange, children = props.children, checkedColor = props.checkedColor, rest = __rest(props, ["defaultChecked", "onChange", "children", "checkedColor"]);
+    var wrapperStyle = __assign({ display: 'contents' }, (checkedColor != null && (_a = {}, _a['--cmr-checkbox-checked-color'] = checkedColor, _a)));
+    return (_jsx("div", __assign({ className: "cmr-checkbox-wrapper", style: wrapperStyle }, { children: _jsx(FormControlLabel, { disabled: props.disabled, style: props.style, className: props.className, control: _jsx(Checkbox, { style: props.style, checked: props.checked, defaultChecked: defaultChecked, onChange: onChange }), label: _jsx("span", __assign({ className: "cmr-label", style: { paddingRight: 0, color: 'var(--bs-card-color)' } }, { children: children })), labelPlacement: "end" }) })));
 };

package/dist/core/features/jobs/jobActionCreation.d.ts

@@ -23,6 +23,7 @@ export declare const uploadJob: import("@reduxjs/toolkit").AsyncThunk<{
         filetype: string;
         filesize: string;
         filemd5: string;
+        file: File;
     };
     uploadTarget: string | undefined;
 } | {

package/dist/core/features/jobs/jobActionCreation.js

@@ -34,17 +34,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import axios from 'axios';
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import { getFileExtension } from "../../common/utilities/SystemUtilities";
@@ -107,8 +96,7 @@ export var uploadJob = createAsyncThunk('UploadJob', function (_a, thunkAPI) {
                     switch (_a.label) {
                         case 0:
                             _a.trys.push([0, 2, , 7]);
-                            return [4 /*yield*/, axios.put(partUrl, part, {
-                                    // const response = await AuthenticatedHttpClient.put(partUrl, part, {
+                            return [4 /*yield*/, AuthenticatedHttpClient.put(partUrl, part, {
                                     headers: {
                                         'Content-Type': ""
                                     },
@@ -147,18 +135,18 @@ export var uploadJob = createAsyncThunk('UploadJob', function (_a, thunkAPI) {
                 });
             });
         }
-        var endpoints, FILE_CHUNK_SIZE, payload, initResponse, _b, uploadId, partUrls_1, Key, fileParts, i, part, totalSize_1, totalUploadedParts_1, uploadedParts, finalizeResponse, _c, _file, lambdaFileMeta, e_1;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var endpoints, FILE_CHUNK_SIZE, payload, initResponse, _b, uploadId, partUrls_1, Key, fileParts, i, part, totalSize_1, totalUploadedParts_1, uploadedParts, finalizeResponse, e_1;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     endpoints = getEndpoints();
-                    _d.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _d.trys.push([1, 6, , 7]);
+                    _c.trys.push([1, 6, , 7]);
                     FILE_CHUNK_SIZE = 10 * 1024 * 1024;
                     return [4 /*yield*/, createPayload(uploadToken, file, fileAlias)];
                 case 2:
-                    payload = _d.sent();
+                    payload = _c.sent();
                     if (payload === undefined)
                         return [2 /*return*/, { code: 403, response: 'file not found', file: undefined, uploadTarget: uploadTarget }
                             // thunkAPI.dispatch(setupSetters.setUploadProgress({target: uploadTarget, progress: 0}));
@@ -166,7 +154,7 @@ export var uploadJob = createAsyncThunk('UploadJob', function (_a, thunkAPI) {
                         ];
                     return [4 /*yield*/, AuthenticatedHttpClient.post(payload.destination, payload.lambdaFile, payload.config)];
                 case 3:
-                    initResponse = _d.sent();
+                    initResponse = _c.sent();
                     console.log(initResponse);
                     _b = initResponse.data, uploadId = _b.uploadId, partUrls_1 = _b.partUrls, Key = _b.Key;
                     fileParts = [];
@@ -192,23 +180,22 @@ export var uploadJob = createAsyncThunk('UploadJob', function (_a, thunkAPI) {
                             });
                         }); }))];
                 case 4:
-                    uploadedParts = _d.sent();
-                    return [4 /*yield*/, AuthenticatedHttpClient.post(endpoints.JOB_UPLOAD_FINALIZE, {
+                    uploadedParts = _c.sent();
+                    return [4 /*yield*/, axios.post(endpoints.JOB_UPLOAD_FINALIZE, {
                             uploadId: uploadId,
                             parts: uploadedParts,
                             Key: Key
                         }, payload.config)];
                 case 5:
-                    finalizeResponse = _d.sent();
+                    finalizeResponse = _c.sent();
                     console.log(finalizeResponse);
                     console.log('all uploads completed');
                     if (onUploaded)
                         onUploaded(initResponse, file);
                     thunkAPI.dispatch(getUpstreamJobs());
-                    _c = payload.lambdaFile, _file = _c.file, lambdaFileMeta = __rest(_c, ["file"]);
-                    return [2 /*return*/, { code: 200, response: initResponse.data.response, file: lambdaFileMeta, uploadTarget: uploadTarget }];
+                    return [2 /*return*/, { code: 200, response: initResponse.data.response, file: payload.lambdaFile, uploadTarget: uploadTarget }];
                 case 6:
-                    e_1 = _d.sent();
+                    e_1 = _c.sent();
                     console.log("Following error encountered during uploading:");
                     console.error(e_1);
                     return [2 /*return*/, { code: 500, response: e_1.response, file: undefined, uploadTarget: uploadTarget }];
@@ -245,8 +232,7 @@ var createPayload = function (uploadToken, file, fileAlias) { return __awaiter(v
             case 2:
                 UploadHeaders = {
                     headers: {
-                        'Content-Type': 'application/json',
-                        'X-Api-Key': uploadToken
+                        'Content-Type': 'application/json'
                     }
                 };
                 return [2 /*return*/, { destination: endpoints.JOB_UPLOAD_INIT, lambdaFile: lambdaFile, file: file, config: UploadHeaders }];

package/dist/index.d.ts

@@ -11,7 +11,6 @@ export { default as CmrConfirmation } from "./CmrComponents/dialogue/Confirmatio
 export { default as CmrDeletionDialog } from "./CmrComponents/dialogue/DeletionDialog";
 export { default as CmrEditConfirmation } from "./CmrComponents/dialogue/EditConfirmation";
 export { default as CmrTabs } from "./CmrTabs/CmrTabs";
-export { default as CmrCheckbox } from "./CmrComponents/checkbox/Checkbox";
 export { default as CmrLabel } from "./CmrComponents/label/Label";
 export { default as CmrButton } from "./CmrComponents/CmrButton/CmrButton";
 export { default as CmrInputNumber } from "./CmrComponents/input-number/InputNumber";

package/dist/index.js

@@ -12,7 +12,7 @@ export { default as CmrConfirmation } from "./CmrComponents/dialogue/Confirmatio
 export { default as CmrDeletionDialog } from "./CmrComponents/dialogue/DeletionDialog";
 export { default as CmrEditConfirmation } from "./CmrComponents/dialogue/EditConfirmation";
 export { default as CmrTabs } from "./CmrTabs/CmrTabs";
-export { default as CmrCheckbox } from "./CmrComponents/checkbox/Checkbox";
+// export { default as CmrCheckbox } from "./CmrComponents/checkbox/Checkbox";
 export { default as CmrLabel } from "./CmrComponents/label/Label";
 export { default as CmrButton } from "./CmrComponents/CmrButton/CmrButton";
 export { default as CmrInputNumber } from "./CmrComponents/input-number/InputNumber";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudmr-ux",
-  "version": "4.1.9",
+  "version": "4.2.2",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",