@camunda/camunda-composite-components 0.2.18-rc.0 → 0.2.18-rc.2

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.
@@ -8,9 +8,9 @@ import { useC3UserConfiguration } from "../c3-user-configuration/c3-user-configu
8
8
  import { defaultTheme, useC3Profile, } from "../c3-user-configuration/c3-profile-provider/c3-profile-provider";
9
9
  import { resolveTheme, } from "../c3-user-configuration/c3-profile-provider/carbon-theme-provider";
10
10
  import { useC3HelpCenter } from "./c3-help-center-provider";
11
- export const C3HelpCenter = ({ autoStartSurvey, origin, flags, onRequestClose, mixpanelTrack: customMixpanelTrack, onRequestOpen, theme, onPersonaChange, activeTab, }) => {
11
+ export const C3HelpCenter = ({ autoStartSurvey, origin, flags, onRequestClose, mixpanelTrack, onRequestOpen, theme, onPersonaChange, activeTab, }) => {
12
12
  const { isHelpCenterOpen: isOpen, setIsHelpCenterOpen } = useC3HelpCenter();
13
- const { userToken, decodedToken, activeOrganizationId, handleTheme, decodedAudience, mixPanelTrack: configMixpanelTrack, } = useC3UserConfiguration() || {};
13
+ const { userToken, decodedToken, activeOrganizationId, handleTheme, decodedAudience, } = useC3UserConfiguration() || {};
14
14
  const { theme: themeConfig, isEnabled, reloadClusters } = useC3Profile();
15
15
  const themeHandlingEnabled = isEnabled && !!handleTheme && !!themeConfig;
16
16
  const themeRef = useRef();
@@ -20,14 +20,6 @@ export const C3HelpCenter = ({ autoStartSurvey, origin, flags, onRequestClose, m
20
20
  const [helpCenterConfig, setHelpCenterConfig] = useState(defaultHelpCenterConfig);
21
21
  const [email, setEmail] = useState("");
22
22
  const [showSurvey, setShowSurvey] = useState(autoStartSurvey);
23
- const mixpanelTrack = (event, data) => {
24
- if (customMixpanelTrack) {
25
- customMixpanelTrack(event, data);
26
- }
27
- else if (configMixpanelTrack) {
28
- configMixpanelTrack(event, data);
29
- }
30
- };
31
23
  useEffect(() => {
32
24
  const updateResolvedTheme = ({ matches }) => {
33
25
  if (themeRef.current === "system") {
@@ -100,7 +92,7 @@ export const C3HelpCenter = ({ autoStartSurvey, origin, flags, onRequestClose, m
100
92
  });
101
93
  setPersona({ wasShown: true });
102
94
  }
103
- mixpanelTrack?.("helpcenter:open", {
95
+ mixpanelTrack?.(`helpcenter:open`, {
104
96
  to: activeTab ?? firstTab,
105
97
  from: origin,
106
98
  });
@@ -49,7 +49,6 @@ export type Tab = {
49
49
  };
50
50
  export type Organization = {
51
51
  uuid: string;
52
- name: string;
53
52
  salesPlan?: {
54
53
  type: string;
55
54
  };
@@ -73,9 +73,6 @@ export const HelpCenter = ({ configuration, persona, email, audience, flags = []
73
73
  }, [showTabId]);
74
74
  if (activeTab === "feedback") {
75
75
  header = "Share your feedback";
76
- content = (React.createElement(Feedback, { audience: audience, theme: theme, mixpanelTrack: mixpanelTrack, setHeader: (head) => {
77
- header = head;
78
- }, salesPlanType: organization?.salesPlan?.type ?? "" }));
79
76
  }
80
77
  else if (activeTab === "recommendations" &&
81
78
  Object.keys(tabTiles).length === 0 &&
@@ -176,7 +173,11 @@ export const HelpCenter = ({ configuration, persona, email, audience, flags = []
176
173
  }))),
177
174
  React.createElement("div", { style: { position: "absolute", bottom: "20px" } }, configuration.links.map((link) => (React.createElement(SideNavMenuItem, { key: link.label.split(" ").join("-").toLowerCase(), href: link.link, target: "_blank" },
178
175
  React.createElement("span", { className: "cds--link" }, link.label))))))),
179
- content)),
176
+ content,
177
+ React.createElement("div", { style: { display: activeTab === "feedback" ? "block" : "none" } },
178
+ React.createElement(Feedback, { audience: audience, theme: theme, mixpanelTrack: mixpanelTrack, setHeader: (head) => {
179
+ header = head;
180
+ }, salesPlanType: organization?.salesPlan?.type ?? "" })))),
180
181
  persona.complete && activeTab === "recommendations" && (React.createElement(ModalFooter, { style: {
181
182
  height: "62px",
182
183
  paddingRight: "16px",
@@ -10,21 +10,19 @@ export type C3NavigationSideBarBaseProps = {
10
10
  elements?: C3NavigationElementProps[];
11
11
  bottomElements?: C3NavigationElementProps[];
12
12
  };
13
- export type CamundaOrg = {
14
- activeLabel: string;
15
- otherLabel: string;
16
- orgName: string;
17
- action: {
18
- label: string;
19
- onClick: () => void;
20
- };
21
- };
22
13
  export type C3NavigationOrgSideBarProps = C3NavigationSideBarBaseProps & {
23
14
  type: "org";
24
15
  customElements?: {
25
- activeOrganization?: CamundaOrg;
16
+ activeOrganization?: {
17
+ activeLabel: string;
18
+ otherLabel: string;
19
+ orgName: string;
20
+ action: {
21
+ label: string;
22
+ onClick: () => void;
23
+ };
24
+ };
26
25
  };
27
- switchToOrg?: (orgId: string) => void;
28
26
  };
29
27
  export type C3NavigationInfoSideBarProps = C3NavigationSideBarBaseProps & {
30
28
  type: "info";
@@ -4,47 +4,15 @@ import { Enterprise } from "@carbon/react/icons";
4
4
  import C3NavigationSideBar from "./c3-navigation-sidebar";
5
5
  import { SwitcherDivider } from "./components";
6
6
  import { useOrgSidebarState } from "./c3-sidebar-state-provider";
7
- import { useC3Profile } from "../../c3-user-configuration/c3-profile-provider/c3-profile-provider";
8
- import { useC3UserConfiguration } from "../../c3-user-configuration/c3-user-configuration-provider";
9
7
  const C3OrgSidebar = ({ sideBar }) => {
10
- const { customElements, switchToOrg, elements, ...sideBarProps } = sideBar;
8
+ const { customElements, ...sideBarProps } = sideBar;
9
+ const activeOrganization = customElements?.activeOrganization;
11
10
  const { isOpen, setIsOpen } = useOrgSidebarState();
12
- const { decodedAudience, setActiveOrgId, mixPanelTrack } = useC3UserConfiguration();
13
- const { activeOrg, orgs } = useC3Profile();
14
- const isCustomized = Boolean(customElements?.activeOrganization);
15
- const onManageOrg = () => {
16
- if (!isCustomized) {
17
- mixPanelTrack?.("navBar:orgSettings:click", { orgId: activeOrg?.uuid });
18
- }
19
- if (sideBar.closeOnClick !== false)
20
- setIsOpen(false);
21
- };
22
- const activeOrganization = customElements?.activeOrganization || {
23
- activeLabel: "Active Organization",
24
- orgName: activeOrg?.name || "",
25
- action: {
26
- onClick: onManageOrg,
27
- label: "Manage",
28
- },
29
- otherLabel: "Other Organizations",
30
- };
31
- const switchOrg = (orgId) => {
32
- setActiveOrgId(orgId);
33
- mixPanelTrack?.("navBar:orgSwitch:click", { orgId });
34
- switchToOrg?.(orgId);
35
- setIsOpen(false);
36
- };
37
- const orgElements = orgs?.map((org) => ({
38
- key: org.uuid,
39
- label: org.name,
40
- onClick: () => switchOrg(org.uuid),
41
- }));
42
11
  const itemTabIndex = isOpen ? undefined : -1;
43
12
  return (React.createElement(C3NavigationSideBar, { sideBar: {
44
13
  ...sideBarProps,
45
- elements: elements || orgElements,
46
14
  ariaLabel: sideBarProps.ariaLabel || "Organization Sidebars",
47
- }, icon: React.createElement(Enterprise, { size: 20 }) }, (customElements?.activeOrganization || activeOrg) && (React.createElement(React.Fragment, null,
15
+ }, icon: React.createElement(Enterprise, { size: 20 }) }, activeOrganization && (React.createElement(React.Fragment, null,
48
16
  React.createElement("div", { style: {
49
17
  padding: "1rem",
50
18
  paddingTop: "1.5rem",
@@ -67,11 +35,12 @@ const C3OrgSidebar = ({ sideBar }) => {
67
35
  overflow: "hidden",
68
36
  whiteSpace: "nowrap",
69
37
  }, title: activeOrganization.orgName }, activeOrganization.orgName)),
70
- isCustomized ? (React.createElement(Button, { size: "md", kind: "ghost", onClick: () => {
38
+ React.createElement(Button, { size: "md", kind: "ghost", key: "org-management", onClick: () => {
71
39
  activeOrganization.action.onClick();
72
- onManageOrg();
73
- }, tabIndex: itemTabIndex }, activeOrganization.action?.label)) : (activeOrg?.uuid &&
74
- decodedAudience && (React.createElement(Button, { as: "a", size: "md", kind: "ghost", key: "org-management", href: `https://console.${decodedAudience}/org/${activeOrg?.uuid}/management`, onClick: onManageOrg, tabIndex: itemTabIndex }, activeOrganization.action?.label)))),
40
+ if (sideBar.closeOnClick !== false) {
41
+ setIsOpen(false);
42
+ }
43
+ }, tabIndex: itemTabIndex }, activeOrganization.action.label)),
75
44
  sideBar.elements && sideBar.elements.length > 0 && (React.createElement(React.Fragment, null,
76
45
  React.createElement(SwitcherDivider, null),
77
46
  React.createElement(FormLabel, { style: {
@@ -15,8 +15,7 @@ export declare function createInfoSideBarProps(options: {
15
15
  }): C3NavigationProps["infoSideBar"];
16
16
  export declare function createOrgSideBarProps(options: {
17
17
  isOpen: boolean;
18
- orgCount?: number;
19
- useConfig?: boolean;
18
+ orgCount: number;
20
19
  }): C3NavigationProps["orgSideBar"];
21
20
  export declare function createUserSideBarProps(options: {
22
21
  isOpen: boolean;
@@ -125,45 +125,36 @@ export function createInfoSideBarProps(options) {
125
125
  }
126
126
  export function createOrgSideBarProps(options) {
127
127
  const elements = [];
128
- if (options.orgCount !== undefined) {
129
- for (let i = 0; i < options.orgCount; i++) {
130
- elements.push({
131
- key: `org-${i}`,
132
- label: `Organization ${i}`,
133
- });
134
- }
128
+ for (let i = 0; i < options.orgCount; i++) {
129
+ elements.push({
130
+ key: `org-${i}`,
131
+ label: `Organization ${i}`,
132
+ });
135
133
  }
136
134
  return {
137
135
  isOpen: options.isOpen,
138
- customElements: options.useConfig
139
- ? undefined
140
- : {
141
- activeOrganization: {
142
- activeLabel: "Active Organization",
143
- otherLabel: "Other Organization",
144
- orgName: "Camunda",
145
- action: {
146
- label: "Manage",
147
- onClick: () => console.log("Manage organization"),
148
- },
136
+ customElements: {
137
+ activeOrganization: {
138
+ activeLabel: "Active Organization",
139
+ otherLabel: "Other Organization",
140
+ orgName: "Camunda",
141
+ action: {
142
+ label: "Manage",
143
+ onClick: () => console.log("Manage organization"),
149
144
  },
150
145
  },
151
- elements: options.useConfig ? undefined : elements,
152
- bottomElements: options.useConfig
153
- ? undefined
154
- : [
155
- {
156
- key: "createTrial",
157
- label: "Create new Trial Org",
158
- renderIcon: Add,
159
- onClick: () => {
160
- console.log("clicked");
161
- },
146
+ },
147
+ elements,
148
+ bottomElements: [
149
+ {
150
+ key: "createTrial",
151
+ label: "Create new Trial Org",
152
+ renderIcon: Add,
153
+ onClick: () => {
154
+ console.log("clicked");
162
155
  },
163
- ],
164
- switchToOrg: options.useConfig
165
- ? (orgId) => console.log("Switch to org: ", orgId)
166
- : undefined,
156
+ },
157
+ ],
167
158
  };
168
159
  }
169
160
  export function createUserSideBarProps(options) {
@@ -1,12 +1,12 @@
1
1
  import { FC } from "react";
2
2
  import { Persona } from "../c3-help-center/c3-help-center.types";
3
- import { MixPanelTrack } from "../c3-user-configuration/c3-user-configuration-provider";
3
+ import { Dict } from "mixpanel-browser";
4
4
  export type C3OnboardingSurveyProps = {
5
5
  onRequestClose: () => void;
6
6
  onRequestSkip: () => void;
7
7
  personaCallback: (persona: Persona) => void;
8
8
  theme: "light" | "dark";
9
- mixpanelTrack?: MixPanelTrack;
9
+ mixpanelTrack?: (event: string, data: Dict | undefined) => void;
10
10
  origin: "console" | "webmodeler" | "operate" | "tasklist" | "optimize";
11
11
  modal: boolean;
12
12
  persona: Persona | undefined;
@@ -2,7 +2,7 @@ import React, { useState } from "react";
2
2
  import { OnboardingSurvey } from "./onboardingSurvey";
3
3
  import { defaultOnboardingConfig } from "./defaultOnboardingConfig";
4
4
  import { getOnboardingConfig, submitSurvey, updatePersona, } from "../../api/help-center";
5
- import { useC3UserConfiguration, } from "../c3-user-configuration/c3-user-configuration-provider";
5
+ import { useC3UserConfiguration } from "../c3-user-configuration/c3-user-configuration-provider";
6
6
  export const C3OnboardingSurvey = (props) => {
7
7
  const { userToken, decodedToken, activeOrganizationId, decodedAudience } = useC3UserConfiguration() || {};
8
8
  const [persona, setPersona] = useState(props.persona);
@@ -37,11 +37,7 @@ export const C3ProfileProvider = ({ children }) => {
37
37
  setActiveOrg(res?.find((org) => org.uuid === config.activeOrganizationId) || null);
38
38
  });
39
39
  loadClusters();
40
- }, [
41
- config?.activeOrganizationId,
42
- JSON.stringify(decodedToken),
43
- decodedAudience,
44
- ]);
40
+ }, [config?.activeOrganizationId, decodedToken, decodedAudience]);
45
41
  useEffect(() => {
46
42
  const updateSystemTheme = ({ matches }) => {
47
43
  if (themeRef.current === "system")
@@ -1,13 +1,10 @@
1
1
  import React, { FC, ReactNode } from "react";
2
2
  import { Endpoints, Stage } from "../../api/endpoints.const";
3
3
  import { DecodedToken } from "./authToken";
4
- import { Dict } from "mixpanel-browser";
5
- export type MixPanelTrack = (event: string, data?: Dict) => void;
6
4
  type C3UserConfigurationBase = {
7
5
  activeOrganizationId: string;
8
6
  userToken: string;
9
7
  getNewUserToken: () => Promise<string>;
10
- mixPanelTrack?: MixPanelTrack;
11
8
  };
12
9
  type C3UserConfigurationWithEndpoints = C3UserConfigurationBase & {
13
10
  endpoints: Endpoints;
@@ -21,8 +18,6 @@ export type C3UserConfiguration = C3UserConfigurationWithEndpoints | C3UserConfi
21
18
  export type C3UserConfigurationContextValue = C3UserConfiguration & {
22
19
  decodedToken: DecodedToken | null;
23
20
  decodedAudience: string | null;
24
- setActiveOrgId: (newOrg: string) => void;
25
- mixPanelTrack?: MixPanelTrack;
26
21
  };
27
22
  export declare const C3UserConfigurationContext: React.Context<C3UserConfigurationContextValue>;
28
23
  declare const C3UserConfigurationProvider: FC<C3UserConfiguration & {
@@ -9,30 +9,19 @@ export const C3UserConfigurationContext = React.createContext({
9
9
  decodedToken: null,
10
10
  decodedAudience: null,
11
11
  getNewUserToken: () => Promise.resolve(""),
12
- setActiveOrgId: () => undefined,
13
12
  });
14
- const C3UserConfigurationProvider = ({ children, activeOrganizationId, ...config }) => {
13
+ const C3UserConfigurationProvider = ({ children, ...config }) => {
15
14
  const [decodedToken, setDecodedToken] = useState(null);
16
15
  const [decodedAudience, setDecodedAudience] = useState(null);
17
- const [activeOrgId, setActiveOrgId] = useState(activeOrganizationId);
18
16
  useEffect(() => {
19
17
  if (config.userToken)
20
18
  setDecodedToken(decodeJWT(config.userToken));
21
19
  }, [config.userToken]);
22
- useEffect(() => {
23
- setActiveOrgId(activeOrganizationId);
24
- }, [activeOrganizationId]);
25
20
  useEffect(() => {
26
21
  const { audience } = decodedToken || {};
27
22
  setDecodedAudience((typeof audience === "string" ? audience : audience?.[0]) || null);
28
23
  }, [decodedToken]);
29
- return (React.createElement(C3UserConfigurationContext.Provider, { value: {
30
- ...config,
31
- activeOrganizationId: activeOrgId,
32
- setActiveOrgId,
33
- decodedToken,
34
- decodedAudience,
35
- } },
24
+ return (React.createElement(C3UserConfigurationContext.Provider, { value: { ...config, decodedToken, decodedAudience } },
36
25
  React.createElement(C3ProfileProvider, null,
37
26
  React.createElement(C3HelpCenterProvider, null, children))));
38
27
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@camunda/camunda-composite-components",
3
- "version": "0.2.18-rc.0",
3
+ "version": "0.2.18-rc.2",
4
4
  "scripts": {
5
5
  "clean": "rimraf lib/",
6
6
  "build": "yarn clean && tsc",
@@ -26,23 +26,23 @@
26
26
  "test": "yarn test:ts && yarn test:storybook && yarn test:visual-regression:docker"
27
27
  },
28
28
  "devDependencies": {
29
- "@babel/core": "7.23.0",
30
- "@babel/preset-env": "7.22.20",
29
+ "@babel/core": "7.23.2",
30
+ "@babel/preset-env": "7.23.2",
31
31
  "@babel/preset-react": "7.22.15",
32
- "@babel/preset-typescript": "7.23.0",
32
+ "@babel/preset-typescript": "7.23.2",
33
33
  "@carbon/react": "1.37.0",
34
34
  "@mdx-js/react": "2.3.0",
35
35
  "@playwright/test": "1.37.1",
36
- "@storybook/addon-a11y": "7.4.6",
37
- "@storybook/addon-actions": "7.4.6",
38
- "@storybook/addon-docs": "7.4.6",
39
- "@storybook/addon-essentials": "7.4.6",
40
- "@storybook/addon-interactions": "7.4.6",
41
- "@storybook/addon-links": "7.4.6",
42
- "@storybook/blocks": "7.4.6",
36
+ "@storybook/addon-a11y": "7.5.1",
37
+ "@storybook/addon-actions": "7.5.1",
38
+ "@storybook/addon-docs": "7.5.1",
39
+ "@storybook/addon-essentials": "7.5.1",
40
+ "@storybook/addon-interactions": "7.5.1",
41
+ "@storybook/addon-links": "7.5.1",
42
+ "@storybook/blocks": "7.5.1",
43
43
  "@storybook/preset-scss": "1.0.3",
44
- "@storybook/react": "7.4.6",
45
- "@storybook/react-webpack5": "7.4.6",
44
+ "@storybook/react": "7.5.1",
45
+ "@storybook/react-webpack5": "7.5.1",
46
46
  "@storybook/test-runner": "0.13.0",
47
47
  "@storybook/testing-library": "0.2.2",
48
48
  "@types/carbon-components-react": "7.55.3",
@@ -65,7 +65,7 @@
65
65
  "eslint-plugin-prettier": "5.0.1",
66
66
  "eslint-plugin-react": "7.33.2",
67
67
  "eslint-plugin-react-hooks": "4.6.0",
68
- "eslint-plugin-storybook": "0.6.14",
68
+ "eslint-plugin-storybook": "0.6.15",
69
69
  "event-source-polyfill": "1.0.31",
70
70
  "husky": "8.0.3",
71
71
  "mixpanel-browser": "2.47.0",
@@ -76,7 +76,7 @@
76
76
  "sass": "1.66.1",
77
77
  "sass-loader": "13.3.2",
78
78
  "serve": "14.2.1",
79
- "storybook": "7.4.6",
79
+ "storybook": "7.5.1",
80
80
  "style-loader": "3.3.3",
81
81
  "styled-components": "6.0.7",
82
82
  "typescript": "5.2.2",