@camunda/camunda-composite-components 0.20.9 → 0.21.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/lib/esm/package.json +6 -4
- package/lib/esm/src/components/c3-data-table/c3-data-table.js +1 -1
- package/lib/esm/src/components/c3-navigation/c3-navigation-appbar/c3-navigation-appbar.js +9 -3
- package/lib/esm/src/utils/versionCheck.utils.d.ts +15 -0
- package/lib/esm/src/utils/versionCheck.utils.js +79 -0
- package/package.json +6 -4
package/lib/esm/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@camunda/camunda-composite-components",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"@babel/preset-typescript": "7.25.7",
|
|
44
44
|
"@carbon/react": "1.90.0",
|
|
45
45
|
"@mdx-js/react": "3.0.1",
|
|
46
|
-
"@playwright/test": "1.
|
|
46
|
+
"@playwright/test": "1.56.1",
|
|
47
47
|
"@storybook/addon-a11y": "9.1.4",
|
|
48
48
|
"@storybook/addon-docs": "^9.1.4",
|
|
49
49
|
"@storybook/addon-links": "9.1.4",
|
|
@@ -56,9 +56,10 @@
|
|
|
56
56
|
"@types/react-dom": "18.3.2",
|
|
57
57
|
"@types/mixpanel-browser": "2.49.0",
|
|
58
58
|
"@types/node": "22.13.14",
|
|
59
|
+
"@types/semver": "^7.5.8",
|
|
59
60
|
"@typescript-eslint/eslint-plugin": "7.17.0",
|
|
60
61
|
"@typescript-eslint/parser": "7.17.0",
|
|
61
|
-
"axe-playwright": "2.
|
|
62
|
+
"axe-playwright": "2.2.2",
|
|
62
63
|
"babel-loader": "9.2.1",
|
|
63
64
|
"conventional-changelog-conventionalcommits": "7.0.2",
|
|
64
65
|
"copyfiles": "2.4.1",
|
|
@@ -92,7 +93,8 @@
|
|
|
92
93
|
"dependencies": {
|
|
93
94
|
"jwt-decode": "4.0.0",
|
|
94
95
|
"react-error-boundary": "4.0.13",
|
|
95
|
-
"react-markdown": "8.0.7"
|
|
96
|
+
"react-markdown": "8.0.7",
|
|
97
|
+
"semver": "^7.7.3"
|
|
96
98
|
},
|
|
97
99
|
"peerDependencies": {
|
|
98
100
|
"@carbon/react": "1.x",
|
|
@@ -335,7 +335,7 @@ export const C3DataTable = ({ data, headers, options, toolbar: singleToolbar, to
|
|
|
335
335
|
const searchElement = toolbarElement;
|
|
336
336
|
const filterId = searchElement.id ?? searchElement.queryName;
|
|
337
337
|
const defaultValue = currentFilters.current.get(filterId);
|
|
338
|
-
searchComponent = (_jsx(TableToolbarSearch, { onFocus: (event, handleExpand) => {
|
|
338
|
+
searchComponent = (_jsx(TableToolbarSearch, { placeholder: searchElement.label, persistent: true, onFocus: (event, handleExpand) => {
|
|
339
339
|
handleExpand(event, true);
|
|
340
340
|
if (searchElement.queryName) {
|
|
341
341
|
updateFilterURLState(searchElement?.queryName, "");
|
|
@@ -11,6 +11,7 @@ import { APPS } from "../../../utils/camunda";
|
|
|
11
11
|
import { NavWrapper, SideNav } from "./components";
|
|
12
12
|
import { useClusterUpdate } from "../../../contexts/c3-cluster-update-manager";
|
|
13
13
|
import { ActiveOrgName } from "../c3-org-sidebar/components";
|
|
14
|
+
import { checkVersion, VersionCheckOperator, } from "../../../utils/versionCheck.utils";
|
|
14
15
|
const getOrgLink = (app, orgId, domain) => {
|
|
15
16
|
switch (app) {
|
|
16
17
|
case "console": {
|
|
@@ -31,7 +32,13 @@ const getClustersToRender = (clusters, activeOrg, appToNavigateTo) => {
|
|
|
31
32
|
// either the user has appreadpermissions on this app
|
|
32
33
|
(activeOrg?.permissions?.cluster?.[appToNavigateTo]?.read ||
|
|
33
34
|
// OR this is a 8.8+ cluster - in this case we also allow rendering this item
|
|
34
|
-
|
|
35
|
+
checkVersion({
|
|
36
|
+
possiblyVersionOrDockerPath: generation.versions?.zeebe,
|
|
37
|
+
trueForSnapshot: true,
|
|
38
|
+
operator: VersionCheckOperator.GreaterThanOrEqual,
|
|
39
|
+
versionToCompareTo: "8.8.0",
|
|
40
|
+
trueOnInvalidVersion: false,
|
|
41
|
+
})));
|
|
35
42
|
};
|
|
36
43
|
const OrgNameWrapper = styled.div `
|
|
37
44
|
margin-bottom: 1rem;
|
|
@@ -242,8 +249,7 @@ export const C3NavigationAppBar = ({ app: appProps, appBar, forwardRef, navbar,
|
|
|
242
249
|
const hasAppReadPermission = activeOrg?.permissions?.cluster?.[app]?.read;
|
|
243
250
|
const clustersToRender = getClustersToRender(clusters ?? [], activeOrg, app);
|
|
244
251
|
if (clustersToRender?.length === 1 && !enforceDropDown) {
|
|
245
|
-
|
|
246
|
-
element.href = clustersToRender?.[0].endpoints[app];
|
|
252
|
+
element.href = clustersToRender?.[0].endpoints[app];
|
|
247
253
|
}
|
|
248
254
|
else if (clustersToRender?.length > 1 ||
|
|
249
255
|
(enforceDropDown && clustersToRender?.length > 0)) {
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export declare enum VersionCheckOperator {
|
|
2
|
+
LessThan = 0,
|
|
3
|
+
LessThanOrEqual = 1,
|
|
4
|
+
GreaterThan = 2,
|
|
5
|
+
GreaterThanOrEqual = 3,
|
|
6
|
+
SameMajor = 4,
|
|
7
|
+
SameMinor = 5
|
|
8
|
+
}
|
|
9
|
+
export declare const checkVersion: (params: {
|
|
10
|
+
possiblyVersionOrDockerPath?: string;
|
|
11
|
+
trueForSnapshot: boolean;
|
|
12
|
+
operator: VersionCheckOperator;
|
|
13
|
+
versionToCompareTo: string;
|
|
14
|
+
trueOnInvalidVersion?: boolean;
|
|
15
|
+
}) => boolean;
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
|
|
3
|
+
* under one or more contributor license agreements. Licensed under a commercial license.
|
|
4
|
+
* You may not use this file except in compliance with the commercial license.
|
|
5
|
+
*/
|
|
6
|
+
import * as semver from 'semver';
|
|
7
|
+
// eslint-disable-next-line no-shadow
|
|
8
|
+
export var VersionCheckOperator;
|
|
9
|
+
(function (VersionCheckOperator) {
|
|
10
|
+
VersionCheckOperator[VersionCheckOperator["LessThan"] = 0] = "LessThan";
|
|
11
|
+
VersionCheckOperator[VersionCheckOperator["LessThanOrEqual"] = 1] = "LessThanOrEqual";
|
|
12
|
+
VersionCheckOperator[VersionCheckOperator["GreaterThan"] = 2] = "GreaterThan";
|
|
13
|
+
VersionCheckOperator[VersionCheckOperator["GreaterThanOrEqual"] = 3] = "GreaterThanOrEqual";
|
|
14
|
+
VersionCheckOperator[VersionCheckOperator["SameMajor"] = 4] = "SameMajor";
|
|
15
|
+
VersionCheckOperator[VersionCheckOperator["SameMinor"] = 5] = "SameMinor";
|
|
16
|
+
})(VersionCheckOperator || (VersionCheckOperator = {}));
|
|
17
|
+
export const checkVersion = (params) => {
|
|
18
|
+
if (!semver.valid(params.versionToCompareTo)) {
|
|
19
|
+
throw new Error('Invalid version to compare to');
|
|
20
|
+
}
|
|
21
|
+
let version = '';
|
|
22
|
+
if (semver.valid(params.possiblyVersionOrDockerPath ?? '')) {
|
|
23
|
+
version = params.possiblyVersionOrDockerPath ?? '';
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
const versionSplit = params.possiblyVersionOrDockerPath?.split(':') ?? [];
|
|
27
|
+
if (versionSplit.length > 1) {
|
|
28
|
+
version = versionSplit[1];
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
if (params.trueForSnapshot && version.includes('SNAPSHOT')) {
|
|
32
|
+
if (version === 'SNAPSHOT') {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
version = version.replace('-SNAPSHOT', '');
|
|
36
|
+
if (version.split('.').length === 1) {
|
|
37
|
+
version = `${version}.99.99`;
|
|
38
|
+
}
|
|
39
|
+
if (version.split('.').length === 2) {
|
|
40
|
+
version = `${version}.99`;
|
|
41
|
+
}
|
|
42
|
+
if (version.split('.').length === 3) {
|
|
43
|
+
version = `${version.split('.')[0]}.${version.split('.')[1]}.99`;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
let parsedVersionToCompareTo = '';
|
|
47
|
+
if (semver.valid(params.versionToCompareTo ?? '')) {
|
|
48
|
+
parsedVersionToCompareTo = params.versionToCompareTo ?? '';
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
const versionSplit = params.versionToCompareTo?.split(':') ?? [];
|
|
52
|
+
if (versionSplit.length > 1) {
|
|
53
|
+
parsedVersionToCompareTo = versionSplit[1];
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (params.trueForSnapshot && parsedVersionToCompareTo === 'SNAPSHOT') {
|
|
57
|
+
return true;
|
|
58
|
+
}
|
|
59
|
+
if (!semver.valid(version)) {
|
|
60
|
+
return params.trueOnInvalidVersion ? true : false;
|
|
61
|
+
}
|
|
62
|
+
switch (params.operator) {
|
|
63
|
+
case VersionCheckOperator.LessThan:
|
|
64
|
+
return semver.lt(version, parsedVersionToCompareTo);
|
|
65
|
+
case VersionCheckOperator.LessThanOrEqual:
|
|
66
|
+
return semver.lte(version, parsedVersionToCompareTo);
|
|
67
|
+
case VersionCheckOperator.GreaterThan:
|
|
68
|
+
return semver.gt(version, parsedVersionToCompareTo);
|
|
69
|
+
case VersionCheckOperator.GreaterThanOrEqual:
|
|
70
|
+
return semver.gte(version, parsedVersionToCompareTo);
|
|
71
|
+
case VersionCheckOperator.SameMajor:
|
|
72
|
+
return semver.major(version) === semver.major(parsedVersionToCompareTo);
|
|
73
|
+
case VersionCheckOperator.SameMinor:
|
|
74
|
+
return (semver.major(version) === semver.major(parsedVersionToCompareTo) &&
|
|
75
|
+
semver.minor(version) === semver.minor(parsedVersionToCompareTo));
|
|
76
|
+
default:
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@camunda/camunda-composite-components",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@babel/preset-typescript": "7.25.7",
|
|
18
18
|
"@carbon/react": "1.90.0",
|
|
19
19
|
"@mdx-js/react": "3.0.1",
|
|
20
|
-
"@playwright/test": "1.
|
|
20
|
+
"@playwright/test": "1.56.1",
|
|
21
21
|
"@storybook/addon-a11y": "9.1.4",
|
|
22
22
|
"@storybook/addon-docs": "^9.1.4",
|
|
23
23
|
"@storybook/addon-links": "9.1.4",
|
|
@@ -30,9 +30,10 @@
|
|
|
30
30
|
"@types/react-dom": "18.3.2",
|
|
31
31
|
"@types/mixpanel-browser": "2.49.0",
|
|
32
32
|
"@types/node": "22.13.14",
|
|
33
|
+
"@types/semver": "^7.5.8",
|
|
33
34
|
"@typescript-eslint/eslint-plugin": "7.17.0",
|
|
34
35
|
"@typescript-eslint/parser": "7.17.0",
|
|
35
|
-
"axe-playwright": "2.
|
|
36
|
+
"axe-playwright": "2.2.2",
|
|
36
37
|
"babel-loader": "9.2.1",
|
|
37
38
|
"conventional-changelog-conventionalcommits": "7.0.2",
|
|
38
39
|
"copyfiles": "2.4.1",
|
|
@@ -66,7 +67,8 @@
|
|
|
66
67
|
"dependencies": {
|
|
67
68
|
"jwt-decode": "4.0.0",
|
|
68
69
|
"react-error-boundary": "4.0.13",
|
|
69
|
-
"react-markdown": "8.0.7"
|
|
70
|
+
"react-markdown": "8.0.7",
|
|
71
|
+
"semver": "^7.7.3"
|
|
70
72
|
},
|
|
71
73
|
"peerDependencies": {
|
|
72
74
|
"@carbon/react": "1.x",
|