@balena/ui-shared-components 14.0.4-build-drop-some-lodash-for-native-alternatives-2a3088132113a3386a2f3ebdc5a452727d0d746c-1 → 14.0.4-build-fix-multiple-file-upload-18a6175ce02ea73a9b818aca69b4aaea9e232837-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/DownloadImageDialog/ApplicationInstructions.js +2 -1
- package/dist/components/DownloadImageDialog/index.js +6 -5
- package/dist/components/DownloadImageDialog/version.js +1 -1
- package/dist/components/DropDownButton/index.js +7 -7
- package/dist/components/Form/Widgets/FileWidget.js +25 -13
- package/dist/components/RJST/DataTypes/object.js +9 -18
- package/dist/components/RJST/Filters/utils.js +3 -3
- package/dist/components/RJST/Lenses/index.js +2 -1
- package/dist/components/RJST/components/Table/useTagActions.js +1 -1
- package/dist/components/RJST/components/Widget/Formats/TxtWidget.js +2 -1
- package/dist/components/RJST/components/Widget/index.js +2 -2
- package/dist/components/RJST/models/helpers.js +2 -1
- package/dist/components/RJST/utils.js +2 -2
- package/dist/components/TagManagementDialog/AddTagForm.js +8 -3
- package/dist/components/TagManagementDialog/index.js +2 -2
- package/dist/components/TagManagementDialog/tag-management-service.js +6 -5
- package/dist/index.d.ts +0 -1
- package/dist/index.js +0 -1
- package/package.json +3 -3
- package/dist/utils/arrays.d.ts +0 -2
- package/dist/utils/arrays.js +0 -6
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import has from 'lodash/has';
|
|
2
3
|
import { interpolateMustache } from './utils';
|
|
3
4
|
import { Box, List, Tab, Tabs, Typography } from '@mui/material';
|
|
4
5
|
import { memo, useEffect, useState } from 'react';
|
|
@@ -54,7 +55,7 @@ export const ApplicationInstructions = memo(function ApplicationInstructions({ d
|
|
|
54
55
|
}) }) }) })), _jsx(InstructionsList, { instructions: finalInstructions }), _jsx(Box, { mt: 2, children: _jsxs(Typography, { children: ["For more details please refer to our", ' ', _jsx(MUILinkWithTracking, { href: `https://www.balena.io/docs/learn/getting-started/${deviceType.slug}/nodejs/`, children: "Getting Started Guide" }), "."] }) })] }));
|
|
55
56
|
});
|
|
56
57
|
const InstructionsItem = ({ node, index }) => {
|
|
57
|
-
const hasChildren =
|
|
58
|
+
const hasChildren = has(node, 'children');
|
|
58
59
|
let text = null;
|
|
59
60
|
if (typeof node === 'string') {
|
|
60
61
|
text = node;
|
|
@@ -7,8 +7,9 @@ import { ApplicationInstructions } from './ApplicationInstructions';
|
|
|
7
7
|
import { DropDownButton } from '../DropDownButton';
|
|
8
8
|
import pickBy from 'lodash/pickBy';
|
|
9
9
|
import debounce from 'lodash/debounce';
|
|
10
|
+
import isEmpty from 'lodash/isEmpty';
|
|
10
11
|
import { OsTypesEnum } from './models';
|
|
11
|
-
import
|
|
12
|
+
import uniq from 'lodash/uniq';
|
|
12
13
|
import { enqueueSnackbar } from 'notistack';
|
|
13
14
|
import { DialogWithCloseButton } from '../DialogWithCloseButton';
|
|
14
15
|
import { Callout } from '../Callout';
|
|
@@ -24,9 +25,9 @@ export var ActionType;
|
|
|
24
25
|
ActionType["downloadConfigFile"] = "download_config_file";
|
|
25
26
|
})(ActionType || (ActionType = {}));
|
|
26
27
|
const getUniqueOsTypes = (osVersions, deviceTypeSlug) => {
|
|
27
|
-
if (
|
|
28
|
+
if (isEmpty(osVersions) ||
|
|
28
29
|
!deviceTypeSlug ||
|
|
29
|
-
osVersions[deviceTypeSlug]
|
|
30
|
+
isEmpty(osVersions[deviceTypeSlug])) {
|
|
30
31
|
return [];
|
|
31
32
|
}
|
|
32
33
|
return uniq(osVersions[deviceTypeSlug].map((x) => x.osType));
|
|
@@ -95,7 +96,7 @@ export const DownloadImageDialog = ({ open, applicationId, releaseId, compatible
|
|
|
95
96
|
[initialDeviceType.slug]: osTypes.includes(OsTypesEnum.ESR),
|
|
96
97
|
}
|
|
97
98
|
: {});
|
|
98
|
-
const [isFetching, setIsFetching] = useState(
|
|
99
|
+
const [isFetching, setIsFetching] = useState(isEmpty(osVersions));
|
|
99
100
|
const [downloadSize, setDownloadSize] = useState(null);
|
|
100
101
|
const [isValidatingUrl, setIsValidatingUrl] = useState(false);
|
|
101
102
|
const defaultDisplayName = useMemo(() => { var _a, _b; return (_b = (_a = formModel.deviceType) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : '-'; }, [(_a = formModel.deviceType) === null || _a === void 0 ? void 0 : _a.name]);
|
|
@@ -258,7 +259,7 @@ export const DownloadImageDialog = ({ open, applicationId, releaseId, compatible
|
|
|
258
259
|
sm: 12,
|
|
259
260
|
md: 6,
|
|
260
261
|
lg: 7,
|
|
261
|
-
}, children: isFetching ? (_jsx(Spinner, {})) : (_jsxs(_Fragment, { children: [
|
|
262
|
+
}, children: isFetching ? (_jsx(Spinner, {})) : (_jsxs(_Fragment, { children: [isEmpty(osVersions) && (_jsx(Callout, { severity: "warning", children: "No OS versions available for download" })), !!osType && !!compatibleDeviceTypes && (_jsx(ImageForm, { applicationId: applicationId, releaseId: releaseId, compatibleDeviceTypes: compatibleDeviceTypes, osVersions: osVersions, isInitialDefault: isInitialDefault, hasEsrVersions: deviceTypeHasEsr[formModel.deviceType.slug], formElement: formElement, downloadUrl: downloadUrl, authToken: authToken, osType: osType, osTypes: osTypes, model: formModel, onSelectedOsTypeChange: setOsTypeCallback, onChange: handleChange }))] })) }), _jsxs(Grid, { pb: 0, size: {
|
|
262
263
|
xs: 12,
|
|
263
264
|
sm: 12,
|
|
264
265
|
md: 6,
|
|
@@ -5,6 +5,7 @@ import { Button, ButtonGroup, MenuItem, Menu } from '@mui/material';
|
|
|
5
5
|
import { ButtonWithTracking } from '../ButtonWithTracking';
|
|
6
6
|
import { useAnalyticsContext } from '../../contexts/AnalyticsContext';
|
|
7
7
|
import groupBy from 'lodash/groupBy';
|
|
8
|
+
import flatMap from 'lodash/flatMap';
|
|
8
9
|
import { Tooltip } from '../Tooltip';
|
|
9
10
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
10
11
|
import { faCaretDown, faCaretUp, faChevronDown, faChevronUp, } from '@fortawesome/free-solid-svg-icons';
|
|
@@ -21,17 +22,16 @@ export const DropDownButton = (_a) => {
|
|
|
21
22
|
// const items = [{...menuItem, section: 'test1'}, {...menuItem, section: 'test2'}];
|
|
22
23
|
// <Dropdown groupByProp='section' .../>
|
|
23
24
|
const memoizedItems = useMemo(() => {
|
|
24
|
-
var _a;
|
|
25
25
|
if (!groupByProp) {
|
|
26
26
|
return items;
|
|
27
27
|
}
|
|
28
28
|
const grouped = groupBy(items, (item) => item[groupByProp]);
|
|
29
|
-
const
|
|
30
|
-
const lastKey =
|
|
31
|
-
return
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
const keys = Object.keys(grouped);
|
|
30
|
+
const lastKey = keys[keys.length - 1];
|
|
31
|
+
return flatMap(grouped, (value, key) => [
|
|
32
|
+
...value.map((v, index) => key !== lastKey && index === value.length - 1
|
|
33
|
+
? Object.assign(Object.assign({}, v), { divider: true }) : v),
|
|
34
|
+
]).filter((item) => item);
|
|
35
35
|
}, [items, groupByProp]);
|
|
36
36
|
const handleClick = (event) => {
|
|
37
37
|
var _a, _b, _c;
|
|
@@ -2,12 +2,12 @@ import { createElement as _createElement } from "react";
|
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
3
|
import { useDropzone } from 'react-dropzone';
|
|
4
4
|
import { Typography, InputLabel, Stack, Link, LinearProgress, Box, useMediaQuery, useTheme, } from '@mui/material';
|
|
5
|
-
import { useCallback, useMemo, useState } from 'react';
|
|
5
|
+
import { useCallback, useEffect, useMemo, useState } from 'react';
|
|
6
6
|
import { IconButtonWithTracking, Tooltip } from '../../..';
|
|
7
7
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
8
8
|
import { faCircleExclamation, faFile, faFileImage, faTrash, faUpload, } from '@fortawesome/free-solid-svg-icons';
|
|
9
9
|
import { useRandomUUID } from '../../../hooks/useRandomUUID';
|
|
10
|
-
import
|
|
10
|
+
import uniq from 'lodash/uniq';
|
|
11
11
|
import { token } from '../../../utils/token';
|
|
12
12
|
const restingStyle = {
|
|
13
13
|
borderColor: token('color.border'),
|
|
@@ -64,6 +64,7 @@ const getErrorMessage = (code, message, maxSize) => {
|
|
|
64
64
|
};
|
|
65
65
|
export const FileWidget = ({ onChange, multiple, schema, uiSchema, }) => {
|
|
66
66
|
const [files, setFiles] = useState([]);
|
|
67
|
+
const [filesWithDataUrl, setFilesWithDataUrl] = useState([]);
|
|
67
68
|
const [errorFiles, setErrorFiles] = useState([]);
|
|
68
69
|
const theme = useTheme();
|
|
69
70
|
const mobile = useMediaQuery(theme.breakpoints.down('md'));
|
|
@@ -102,16 +103,13 @@ export const FileWidget = ({ onChange, multiple, schema, uiSchema, }) => {
|
|
|
102
103
|
const base64Data = reader.result.split(',')[1];
|
|
103
104
|
file.base64Data = base64Data;
|
|
104
105
|
const dataUrl = `data:${file.type};name=${file.name};base64,${base64Data}`;
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
dataUrl,
|
|
113
|
-
uploadedFile: file,
|
|
114
|
-
});
|
|
106
|
+
setFilesWithDataUrl((prev) => [
|
|
107
|
+
...prev,
|
|
108
|
+
{
|
|
109
|
+
dataUrl,
|
|
110
|
+
uploadedFile: file,
|
|
111
|
+
},
|
|
112
|
+
]);
|
|
115
113
|
};
|
|
116
114
|
reader.readAsDataURL(file);
|
|
117
115
|
});
|
|
@@ -122,7 +120,21 @@ export const FileWidget = ({ onChange, multiple, schema, uiSchema, }) => {
|
|
|
122
120
|
setFiles(acceptedFiles.length ? [acceptedFiles[0]] : []);
|
|
123
121
|
}
|
|
124
122
|
setErrorFiles(rejectedFiles);
|
|
125
|
-
}, [
|
|
123
|
+
}, [setFiles, files, multiple]);
|
|
124
|
+
useEffect(() => {
|
|
125
|
+
if (filesWithDataUrl.length && filesWithDataUrl.length === files.length) {
|
|
126
|
+
// NOTE: JSONSchema array data-url does not expect objects but only strings[]
|
|
127
|
+
// see: https://github.com/rjsf-team/react-jsonschema-form/blob/297dac059fdf64fd1453bebb8366f0602c722f90/packages/utils/src/schema/isFilesArray.ts#L24
|
|
128
|
+
// Check if possibile to always pass only strings (dataUrls) and not objects when not multiple.
|
|
129
|
+
if (multiple) {
|
|
130
|
+
onChange(filesWithDataUrl.map((fileWithDataUrl) => fileWithDataUrl.dataUrl));
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
// If not multiple, the schema accept an object and we can pass it directly
|
|
134
|
+
// if not necessary, in a major release we can change it to pass only the dataUrl string and unify the behaviour
|
|
135
|
+
onChange(filesWithDataUrl[0]);
|
|
136
|
+
}
|
|
137
|
+
}, [files, filesWithDataUrl, multiple, onChange]);
|
|
126
138
|
const removeFile = useCallback((index) => {
|
|
127
139
|
const newFiles = [...files];
|
|
128
140
|
newFiles.splice(index, 1);
|
|
@@ -1,31 +1,22 @@
|
|
|
1
|
+
import find from 'lodash/find';
|
|
1
2
|
import { getDataTypeSchema, regexEscape } from './utils';
|
|
2
3
|
import { FULL_TEXT_SLUG, createModelFilter, } from '../components/Filters/SchemaSieve';
|
|
3
4
|
import { isJSONSchema, getRefSchema } from '../schemaOps';
|
|
5
|
+
import findKey from 'lodash/findKey';
|
|
4
6
|
import pick from 'lodash/pick';
|
|
5
7
|
import mapValues from 'lodash/mapValues';
|
|
6
|
-
const findValueByDescription = (obj, description) => {
|
|
7
|
-
return Object.values(obj !== null && obj !== void 0 ? obj : {}).find((property) => typeof property === 'object' &&
|
|
8
|
-
'description' in property &&
|
|
9
|
-
property.description === description);
|
|
10
|
-
};
|
|
11
|
-
const findKeyByDescription = (obj, description) => {
|
|
12
|
-
var _a;
|
|
13
|
-
return (_a = Object.entries(obj !== null && obj !== void 0 ? obj : {}).find(([, value]) => typeof value === 'object' &&
|
|
14
|
-
'description' in value &&
|
|
15
|
-
value.description === description)) === null || _a === void 0 ? void 0 : _a[0];
|
|
16
|
-
};
|
|
17
8
|
const getKeyLabel = (schema) => {
|
|
18
9
|
var _a;
|
|
19
|
-
const s =
|
|
10
|
+
const s = find(schema.properties, { description: 'key' });
|
|
20
11
|
return (_a = s === null || s === void 0 ? void 0 : s.title) !== null && _a !== void 0 ? _a : 'key';
|
|
21
12
|
};
|
|
22
13
|
const getValueLabel = (schema) => {
|
|
23
14
|
var _a;
|
|
24
|
-
const s =
|
|
15
|
+
const s = find(schema.properties, { description: 'value' });
|
|
25
16
|
return (_a = s === null || s === void 0 ? void 0 : s.title) !== null && _a !== void 0 ? _a : 'value';
|
|
26
17
|
};
|
|
27
|
-
export const isKeyValueObj = (schema) => !!
|
|
28
|
-
!!
|
|
18
|
+
export const isKeyValueObj = (schema) => !!find(schema.properties, { description: 'key' }) ||
|
|
19
|
+
!!find(schema.properties, { description: 'value' });
|
|
29
20
|
export const operators = (s) => {
|
|
30
21
|
return Object.assign({ is: 'is', is_not: 'is not' }, (!isKeyValueObj(s)
|
|
31
22
|
? {
|
|
@@ -82,7 +73,7 @@ const getValueForOperation = (operator, schema, value) => {
|
|
|
82
73
|
? 'value'
|
|
83
74
|
: null;
|
|
84
75
|
const schemaProperty = schemaField
|
|
85
|
-
?
|
|
76
|
+
? findKey(schema.properties, { description: schemaField })
|
|
86
77
|
: null;
|
|
87
78
|
// Return the appropriate value format based on the operation type
|
|
88
79
|
return schemaProperty
|
|
@@ -150,8 +141,8 @@ export const createFilter = (field, operator, value, schema) => {
|
|
|
150
141
|
}
|
|
151
142
|
// TODO: this case does not cover complex objects for FULL_TEXT_SLUG
|
|
152
143
|
if (operator === FULL_TEXT_SLUG && schema.properties) {
|
|
153
|
-
const schemaKey =
|
|
154
|
-
const schemaValue =
|
|
144
|
+
const schemaKey = findKey(schema.properties, { description: 'key' });
|
|
145
|
+
const schemaValue = findKey(schema.properties, { description: 'value' });
|
|
155
146
|
const properties = [schemaKey, schemaValue]
|
|
156
147
|
.map((key) => key
|
|
157
148
|
? {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { convertRefSchemeToSchemaPath, getRefSchemeTitle, getRefSchemePrefix, isJSONSchema, parseDescription, parseDescriptionProperty, } from '../schemaOps';
|
|
2
|
+
import isEmpty from 'lodash/isEmpty';
|
|
2
3
|
import get from 'lodash/get';
|
|
3
4
|
const X_FOREIGN_KEY_SCHEMA_SEPARATOR = '___ref_scheme_separator_';
|
|
4
5
|
export const removeFieldsWithNoFilter = (schema) => {
|
|
5
6
|
const processProperties = (properties, parentXNoFilterSet) => {
|
|
6
|
-
var _a;
|
|
7
7
|
if (!properties) {
|
|
8
8
|
return undefined;
|
|
9
9
|
}
|
|
@@ -40,10 +40,10 @@ export const removeFieldsWithNoFilter = (schema) => {
|
|
|
40
40
|
newValue.items = Object.assign(Object.assign({}, value.items), { properties: processProperties(value.items.properties, xNoFilterSet) });
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
const hasEmptyProperties = newValue.properties &&
|
|
43
|
+
const hasEmptyProperties = newValue.properties && isEmpty(newValue.properties);
|
|
44
44
|
const hasEmptyItemsProperties = isJSONSchema(newValue.items) &&
|
|
45
45
|
'properties' in newValue.items &&
|
|
46
|
-
|
|
46
|
+
isEmpty(newValue.items.properties);
|
|
47
47
|
if (hasEmptyProperties || hasEmptyItemsProperties) {
|
|
48
48
|
continue;
|
|
49
49
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as types from './types';
|
|
2
|
+
import uniq from 'lodash/uniq';
|
|
2
3
|
const lenses = Object.values(types);
|
|
3
4
|
// Returns an array of lenses that can be used to render `data`.
|
|
4
5
|
export const getLenses = (data, customLenses) => {
|
|
@@ -7,7 +8,7 @@ export const getLenses = (data, customLenses) => {
|
|
|
7
8
|
}
|
|
8
9
|
const concatenatedLenses = lenses.concat(customLenses !== null && customLenses !== void 0 ? customLenses : []);
|
|
9
10
|
const slugs = concatenatedLenses.map((lens) => lens.slug);
|
|
10
|
-
if (slugs.length >
|
|
11
|
+
if (slugs.length > uniq(slugs).length) {
|
|
11
12
|
throw new Error('Lenses must have unique slugs');
|
|
12
13
|
}
|
|
13
14
|
return concatenatedLenses;
|
|
@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { useMemo, useState } from 'react';
|
|
3
3
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
4
4
|
import { faPlus } from '@fortawesome/free-solid-svg-icons/faPlus';
|
|
5
|
-
import
|
|
5
|
+
import uniq from 'lodash/uniq';
|
|
6
6
|
import { useQuery } from '@tanstack/react-query';
|
|
7
7
|
import { Stack } from '@mui/material';
|
|
8
8
|
export function useTagActions(rjstContext, data) {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import get from 'lodash/get';
|
|
3
3
|
import invokeMap from 'lodash/invokeMap';
|
|
4
|
+
import isArray from 'lodash/isArray';
|
|
4
5
|
import { UiOption, JsonTypes, widgetFactory, formatTimestamp } from '../utils';
|
|
5
6
|
import { Truncate } from '../../../../Truncate';
|
|
6
7
|
import { Typography } from '@mui/material';
|
|
@@ -35,7 +36,7 @@ const TxtWidget = widgetFactory('Txt', [
|
|
|
35
36
|
variant: UiOption.string,
|
|
36
37
|
})(({ value, schema, uiSchema }) => {
|
|
37
38
|
var _a;
|
|
38
|
-
let displayValue =
|
|
39
|
+
let displayValue = isArray(value)
|
|
39
40
|
? getArrayValue(value, uiSchema)
|
|
40
41
|
: value === null || value === void 0 ? void 0 : value.toString();
|
|
41
42
|
if (DATE_TIME_FORMATS.includes((_a = schema === null || schema === void 0 ? void 0 : schema.format) !== null && _a !== void 0 ? _a : '')) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import
|
|
2
|
+
import castArray from 'lodash/castArray';
|
|
3
3
|
import { JsonTypes } from './utils';
|
|
4
4
|
import { typeWidgets } from './Formats';
|
|
5
5
|
import { getSchemaFormat, getSubSchemaFromRefScheme } from '../../schemaOps';
|
|
@@ -38,7 +38,7 @@ export const Widget = ({ value, resource, schema = {}, extraFormats, uiSchema, }
|
|
|
38
38
|
}
|
|
39
39
|
const processedValue = getValue(value, schema, uiSchema);
|
|
40
40
|
const subSchema = getSubSchemaFromRefScheme(schema);
|
|
41
|
-
const types = (subSchema === null || subSchema === void 0 ? void 0 : subSchema.type) != null ?
|
|
41
|
+
const types = (subSchema === null || subSchema === void 0 ? void 0 : subSchema.type) != null ? castArray(subSchema.type) : [];
|
|
42
42
|
if (processedValue == null && !types.includes(JsonTypes.null)) {
|
|
43
43
|
return null;
|
|
44
44
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import isEmpty from 'lodash/isEmpty';
|
|
1
2
|
import { rjstJsonSchemaPick } from '../schemaOps';
|
|
2
3
|
export const rjstDefaultPermissions = {
|
|
3
4
|
read: [],
|
|
@@ -9,7 +10,7 @@ export const rjstRunTransformers = (data, transformers, context) => {
|
|
|
9
10
|
if (!data) {
|
|
10
11
|
return data;
|
|
11
12
|
}
|
|
12
|
-
if (!transformers ||
|
|
13
|
+
if (!transformers || isEmpty(transformers)) {
|
|
13
14
|
return data;
|
|
14
15
|
}
|
|
15
16
|
const transformEntry = (entry) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getPropertyScheme } from './schemaOps';
|
|
2
|
-
import
|
|
2
|
+
import castArray from 'lodash/castArray';
|
|
3
3
|
import get from 'lodash/get';
|
|
4
4
|
import { JsonTypes } from './components/Widget/utils';
|
|
5
5
|
export const DEFAULT_ITEMS_PER_PAGE = 50;
|
|
@@ -119,7 +119,7 @@ const sortFn = (a, b, ref) => {
|
|
|
119
119
|
return diff(aa, bb);
|
|
120
120
|
};
|
|
121
121
|
export const getSortingFunction = (schemaKey, schemaValue) => {
|
|
122
|
-
const types =
|
|
122
|
+
const types = castArray(schemaValue.type);
|
|
123
123
|
const refScheme = getPropertyScheme(schemaValue);
|
|
124
124
|
const splitRefScheme = (refScheme === null || refScheme === void 0 ? void 0 : refScheme[0]) ? splitPath(refScheme[0]) : null;
|
|
125
125
|
if (types.includes(JsonTypes.string)) {
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import * as React from 'react';
|
|
3
|
+
import find from 'lodash/find';
|
|
4
|
+
import startsWith from 'lodash/startsWith';
|
|
5
|
+
import isEmpty from 'lodash/isEmpty';
|
|
3
6
|
import { Button, Stack, TextField, Typography } from '@mui/material';
|
|
4
7
|
import { Callout } from '../Callout';
|
|
5
8
|
import { useTranslation } from '../../hooks/useTranslations';
|
|
@@ -10,7 +13,7 @@ const RESERVED_NAMESPACES = ['io.resin.', 'io.balena.'];
|
|
|
10
13
|
const newTagValidationRules = (t, key, existingTags) => {
|
|
11
14
|
return [
|
|
12
15
|
{
|
|
13
|
-
test: () => !key,
|
|
16
|
+
test: () => !key || isEmpty(key),
|
|
14
17
|
message: t('fields_errors.tag_name_cannot_be_empty'),
|
|
15
18
|
},
|
|
16
19
|
{
|
|
@@ -18,7 +21,7 @@ const newTagValidationRules = (t, key, existingTags) => {
|
|
|
18
21
|
message: t('fields_errors.tag_names_cannot_contain_whitespace'),
|
|
19
22
|
},
|
|
20
23
|
{
|
|
21
|
-
test: () => RESERVED_NAMESPACES.some((reserved) =>
|
|
24
|
+
test: () => RESERVED_NAMESPACES.some((reserved) => startsWith(key, reserved)),
|
|
22
25
|
message: t(`fields_errors.some_tag_keys_are_reserved`, {
|
|
23
26
|
namespace: RESERVED_NAMESPACES.join(', '),
|
|
24
27
|
}),
|
|
@@ -50,7 +53,9 @@ export const AddTagForm = ({ itemType, existingTags, overridableTags = [], addTa
|
|
|
50
53
|
return hasErrors;
|
|
51
54
|
};
|
|
52
55
|
const checkTagOverwrites = async () => {
|
|
53
|
-
const overridableTag =
|
|
56
|
+
const overridableTag = find(overridableTags, {
|
|
57
|
+
tag_key: tagKey,
|
|
58
|
+
});
|
|
54
59
|
if (!overridableTag) {
|
|
55
60
|
return true;
|
|
56
61
|
}
|
|
@@ -5,6 +5,7 @@ import { faUndo } from '@fortawesome/free-solid-svg-icons/faUndo';
|
|
|
5
5
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
6
6
|
import { AddTagForm } from './AddTagForm';
|
|
7
7
|
import sortBy from 'lodash/sortBy';
|
|
8
|
+
import toString from 'lodash/toString';
|
|
8
9
|
import { faPencilAlt } from '@fortawesome/free-solid-svg-icons/faPencilAlt';
|
|
9
10
|
import { getResourceTagSubmitInfo, groupResourcesByTags, } from './tag-management-service';
|
|
10
11
|
import partition from 'lodash/partition';
|
|
@@ -185,10 +186,9 @@ export const TagManagementDialog = ({ items, itemType, titleField, tagField, can
|
|
|
185
186
|
setTags(tags.slice());
|
|
186
187
|
};
|
|
187
188
|
const getItemTitle = (item) => {
|
|
188
|
-
var _a;
|
|
189
189
|
const title = typeof titleField === 'function'
|
|
190
190
|
? titleField(item)
|
|
191
|
-
:
|
|
191
|
+
: toString(item[titleField]);
|
|
192
192
|
return title || `(${t('no_data.no_name_set')})`;
|
|
193
193
|
};
|
|
194
194
|
return (_jsxs(DialogWithCloseButton, { open: true, title: _jsxs(Stack, { children: [_jsxs(Typography, { variant: "h3", mt: 0, mb: 10, children: [items.length > 1 && _jsxs("span", { children: [t('labels.shared'), " "] }), t('labels.tags')] }), _jsx(CollectionSummary, { items: items.map(getItemTitle).sort(), itemsType: t('resource.' + itemType, { count: items.length }), maxVisibleItemCount: 10 })] }), children: [_jsxs(DialogContent, { children: [_jsx(AddTagForm, { itemType: itemType, existingTags: tags, overridableTags: partialTags, addTag: addTag, t: t }), _jsxs(Table, { children: [_jsxs(TableHead, { children: [_jsx(TableCell, {}), _jsx(TableCell, { children: t('labels.tag_name') }), _jsx(TableCell, { children: t('labels.value') }), _jsx(TableCell, {})] }), _jsx(TableBody, { children: !tags.length ? (_jsxs(TableRow, { children: [_jsx(TableCell, {}), _jsx(TableCell, { children: t(`errors.no_tags_for_selected_itemtype`, {
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
import keys from 'lodash/keys';
|
|
2
|
+
import flatMap from 'lodash/flatMap';
|
|
3
|
+
import map from 'lodash/map';
|
|
1
4
|
import groupBy from 'lodash/groupBy';
|
|
2
5
|
export const TAGS_COLUMN_KEY = 'Tags';
|
|
3
6
|
export const getTagKeyValueComposite = (tagKey, value) => `${tagKey}: ${value}`;
|
|
4
7
|
export const getResourceTags = (item, tagField) => { var _a; return ((_a = (tagField in item ? item[tagField] : null)) !== null && _a !== void 0 ? _a : []); };
|
|
5
8
|
export const groupResourcesByTags = (items, tagField) => {
|
|
6
|
-
const resourceTagInfos =
|
|
9
|
+
const resourceTagInfos = flatMap(items, (item) => {
|
|
7
10
|
const tags = getResourceTags(item, tagField);
|
|
8
11
|
return tags.map((tag) => ({
|
|
9
12
|
tag_key_value: getTagKeyValueComposite(tag.tag_key, tag.value),
|
|
@@ -13,15 +16,13 @@ export const groupResourcesByTags = (items, tagField) => {
|
|
|
13
16
|
}));
|
|
14
17
|
});
|
|
15
18
|
const tagsByTagKeyValue = groupBy(resourceTagInfos, 'tag_key_value');
|
|
16
|
-
const tagsWithItems =
|
|
17
|
-
.sort()
|
|
18
|
-
.map((tagKeyValue) => {
|
|
19
|
+
const tagsWithItems = map(keys(tagsByTagKeyValue).sort(), (tagKeyValue) => {
|
|
19
20
|
const tags = tagsByTagKeyValue[tagKeyValue];
|
|
20
21
|
const firstTag = tags[0];
|
|
21
22
|
return {
|
|
22
23
|
tag_key: firstTag.tag_key,
|
|
23
24
|
value: firstTag.value,
|
|
24
|
-
items:
|
|
25
|
+
items: map(tags, 'item'),
|
|
25
26
|
};
|
|
26
27
|
});
|
|
27
28
|
return tagsWithItems;
|
package/dist/index.d.ts
CHANGED
|
@@ -92,6 +92,5 @@ export * as MaterialDataGrid from '@mui/x-data-grid';
|
|
|
92
92
|
export { enqueueSnackbar, closeSnackbar } from 'notistack';
|
|
93
93
|
export { useRandomUUID } from './hooks/useRandomUUID';
|
|
94
94
|
export { token } from './utils/token';
|
|
95
|
-
export { uniq, toArray } from './utils/arrays';
|
|
96
95
|
export * as designTokens from '@balena/design-tokens';
|
|
97
96
|
export * as ReactQuery from '@tanstack/react-query';
|
package/dist/index.js
CHANGED
|
@@ -53,6 +53,5 @@ export * as MaterialDataGrid from '@mui/x-data-grid';
|
|
|
53
53
|
export { enqueueSnackbar, closeSnackbar } from 'notistack';
|
|
54
54
|
export { useRandomUUID } from './hooks/useRandomUUID';
|
|
55
55
|
export { token } from './utils/token';
|
|
56
|
-
export { uniq, toArray } from './utils/arrays';
|
|
57
56
|
export * as designTokens from '@balena/design-tokens';
|
|
58
57
|
export * as ReactQuery from '@tanstack/react-query';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/ui-shared-components",
|
|
3
|
-
"version": "14.0.4-build-
|
|
3
|
+
"version": "14.0.4-build-fix-multiple-file-upload-18a6175ce02ea73a9b818aca69b4aaea9e232837-1",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"files": [
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"zxcvbn": "^4.4.2"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@balena/lint": "^9.3.
|
|
57
|
+
"@balena/lint": "^9.3.0",
|
|
58
58
|
"@storybook/addon-docs": "^9.0.0",
|
|
59
59
|
"@storybook/addon-links": "^9.0.0",
|
|
60
60
|
"@storybook/addon-onboarding": "^9.0.0",
|
|
@@ -132,7 +132,7 @@
|
|
|
132
132
|
},
|
|
133
133
|
"homepage": "https://github.com/balena-io/ui-shared-components#readme",
|
|
134
134
|
"versionist": {
|
|
135
|
-
"publishedAt": "2025-
|
|
135
|
+
"publishedAt": "2025-10-02T12:29:39.077Z"
|
|
136
136
|
},
|
|
137
137
|
"overrides": {
|
|
138
138
|
"storybook": "$storybook"
|
package/dist/utils/arrays.d.ts
DELETED