@camunda/camunda-composite-components 0.2.18-rc.5 → 0.2.18-rc.6

package/lib/esm/components/c3-navigation/c3-navigation-sidebar/c3-org-sidebar.js

@@ -9,8 +9,8 @@ import { useC3UserConfiguration } from "../../c3-user-configuration/c3-user-conf
 const C3OrgSidebar = ({ sideBar }) => {
     const { customElements, switchToOrg, elements, ...sideBarProps } = sideBar;
     const { isOpen, setIsOpen } = useOrgSidebarState();
-    const { decodedAudience, setActiveOrgId, analyticsTrack } = useC3UserConfiguration();
-    const { activeOrg, orgs } = useC3Profile();
+    const { decodedAudience, analyticsTrack } = useC3UserConfiguration();
+    const { activeOrg, orgs, setActiveOrg } = useC3Profile();
     const isCustomized = Boolean(customElements?.activeOrganization);
     const onManageOrg = () => {
         if (!isCustomized) {
@@ -29,7 +29,7 @@ const C3OrgSidebar = ({ sideBar }) => {
         otherLabel: "Other Organizations",
     };
     const switchOrg = (orgId) => {
-        setActiveOrgId(orgId);
+        setActiveOrg(orgId);
         analyticsTrack?.("navBar:orgSwitch:click", { orgId });
         switchToOrg?.(orgId);
         setIsOpen(false);

package/lib/esm/components/c3-user-configuration/c3-profile-provider/c3-profile-provider.d.ts

@@ -8,6 +8,8 @@ export type C3ProfileContextValue = {
     theme: Theme;
     orgs: Organization[] | null;
     activeOrg: Organization | null;
+    setActiveOrg: (orgId: string) => void;
+    reloadOrgs: () => void;
     clusters: Cluster[] | null;
     reloadClusters: () => void;
     resolvedTheme: ResolvedTheme;

package/lib/esm/components/c3-user-configuration/c3-profile-provider/c3-profile-provider.js

@@ -8,6 +8,8 @@ export const C3ProfileContext = createContext({
     theme: defaultTheme,
     orgs: null,
     activeOrg: null,
+    setActiveOrg: () => undefined,
+    reloadOrgs: () => undefined,
     clusters: null,
     reloadClusters: () => undefined,
     resolvedTheme: defaultTheme,
@@ -21,21 +23,24 @@ export const C3ProfileProvider = ({ children }) => {
     const [orgs, setOrgs] = useState(null);
     const [activeOrg, setActiveOrg] = useState(null);
     const [clusters, setClusters] = useState(null);
+    const isConfigValid = config.userToken && config.activeOrganizationId && decodedAudience;
     const loadClusters = () => {
-        if (!config.userToken || !decodedAudience || !config.activeOrganizationId)
+        if (!isConfigValid)
             return;
         getClusters(decodedAudience, config.userToken, config.activeOrganizationId).then((res) => {
             setClusters(res);
         });
     };
-    useEffect(() => {
-        if (!decodedToken || !decodedAudience || !config.activeOrganizationId) {
+    const loadOrgs = () => {
+        if (!isConfigValid)
             return;
-        }
         getOrgs(decodedAudience, config.userToken).then((res) => {
             setOrgs(res);
             setActiveOrg(res?.find((org) => org.uuid === config.activeOrganizationId) || null);
         });
+    };
+    useEffect(() => {
+        loadOrgs();
         loadClusters();
     }, [
         config?.activeOrganizationId,
@@ -81,6 +86,14 @@ export const C3ProfileProvider = ({ children }) => {
             resolvedTheme,
             orgs,
             activeOrg,
+            setActiveOrg: (orgId) => {
+                if (orgs) {
+                    const org = orgs.find((org) => org.uuid === orgId);
+                    if (org)
+                        setActiveOrg(org);
+                }
+            },
+            reloadOrgs: loadOrgs,
             clusters,
             reloadClusters: loadClusters,
             onThemeChange,

package/lib/esm/components/c3-user-configuration/c3-user-configuration-provider.d.ts

@@ -21,7 +21,6 @@ export type C3UserConfiguration = C3UserConfigurationWithEndpoints | C3UserConfi
 export type C3UserConfigurationContextValue = C3UserConfiguration & {
     decodedToken: DecodedToken | null;
     decodedAudience: string | null;
-    setActiveOrgId: (newOrg: string) => void;
     analyticsTrack?: MixPanelTrack;
 };
 export declare const C3UserConfigurationContext: React.Context<C3UserConfigurationContextValue>;

package/lib/esm/components/c3-user-configuration/c3-user-configuration-provider.js

@@ -9,7 +9,6 @@ export const C3UserConfigurationContext = React.createContext({
     decodedToken: null,
     decodedAudience: null,
     getNewUserToken: () => Promise.resolve(""),
-    setActiveOrgId: () => undefined,
 });
 const C3UserConfigurationProvider = ({ children, activeOrganizationId, ...config }) => {
     const [decodedToken, setDecodedToken] = useState(null);
@@ -29,7 +28,6 @@ const C3UserConfigurationProvider = ({ children, activeOrganizationId, ...config
     return (React.createElement(C3UserConfigurationContext.Provider, { value: {
             ...config,
             activeOrganizationId: activeOrgId,
-            setActiveOrgId,
             decodedToken,
             decodedAudience,
         } },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@camunda/camunda-composite-components",
-	"version": "0.2.18-rc.5",
+	"version": "0.2.18-rc.6",
 	"scripts": {
 		"clean": "rimraf lib/",
 		"build": "yarn clean && tsc",