@hyvor/design 2.0.8-beta.1 → 2.0.8-beta.3

package/dist/cloud/HyvorBar/BarNotice/BarLicense.svelte

@@ -1,22 +1,13 @@
 <script lang="ts">
-	import { getCloudContext, type ResolvedLicense } from '../../CloudContext/cloudContextState.svelte.js';
+	import { getCloudContext } from '../../CloudContext/cloudContextState.svelte.js';
 	import Tag from '../../../components/Tag/Tag.svelte';
-	import type { TagSize } from '../../../components/Tag/tag.types.js';
 	import Tooltip from '../../../components/Tooltip/Tooltip.svelte';
 	import IconBuilding from '@hyvor/icons/IconBuilding';
 	import type { Component } from 'svelte';
 
-	interface Props {
-		name: string; // product name like Hyvor Talk
-		customLicense?: ResolvedLicense;
-		size?: TagSize;
-		tooltip?: boolean;
-		href?: string | null;
-	}
-
-	let { name, customLicense, size = 'medium', tooltip: showTooltip = true, href = "/console/billing" }: Props = $props();
+	let { name } = $props();
 
-	const license = $derived(customLicense || getCloudContext().license);
+	const { license } = $derived(getCloudContext());
 
 	function daysDiff(unix: number) {
 		const date = new Date(unix * 1000);
@@ -81,7 +72,7 @@
 			const s = trialDays === 1 ? '' : 's';
 
 			return {
-				name: `Trial (${trialDays}d)`,
+				name: `Trial License (${trialDays}d)`,
 				tooltip: `You organization is currently using a trial license for ${name}. It will expire in ${trialDays} day${s}.`,
 				tagColor: 'orange'
 			};
@@ -100,12 +91,12 @@
 </script>
 
 {#if config}
-	<a class="wrap" href={href}>
-		<Tooltip position="bottom" disabled={showTooltip === false}>
+	<a class="wrap" href="/console/billing">
+		<Tooltip position="bottom">
 			{#snippet tooltip()}
 				{config.tooltip}
 			{/snippet}
-			<Tag color={config.tagColor} {size}>
+			<Tag color={config.tagColor}>
 				{#snippet start()}
 					{#if config.tagIcon}
 						<config.tagIcon size={10} />

package/dist/cloud/HyvorBar/BarNotice/BarLicense.svelte.d.ts

@@ -1,13 +1,6 @@
-import { type ResolvedLicense } from '../../CloudContext/cloudContextState.svelte.js';
-import type { TagSize } from '../../../components/Tag/tag.types.js';
 import type { Component } from 'svelte';
-interface Props {
-    name: string;
-    customLicense?: ResolvedLicense;
-    size?: TagSize;
-    tooltip?: boolean;
-    href?: string | null;
-}
-declare const BarLicense: Component<Props, {}, "">;
+declare const BarLicense: Component<{
+    name: any;
+}, {}, "">;
 type BarLicense = ReturnType<typeof BarLicense>;
 export default BarLicense;

package/dist/cloud/OrganizationMembers/OrganizationMembersSearch.svelte

@@ -16,7 +16,7 @@
 	}
 	let { selectedUserId = $bindable(undefined) }: Props = $props();
 
-	const { instance, organization } = getCloudContext();
+	const { instance, organization, deployment } = getCloudContext();
 
 	let search = $state('');
 	let role = $derived(organization?.role);
@@ -138,16 +138,18 @@
 			</div>
 		{/if}
 	</div>
-	<div class="invite-note">
-		Looking for a user outside your organization?
-		{#if role === 'admin' || role === 'manager'}
-			<a href={instance + '/account/org/members?invite'} target="_blank" class="hds-link">
-				Invite them
-			</a>
-		{:else}
-			Ask an admin to invite them
-		{/if} to your organization first.
-	</div>
+	{#if deployment === 'cloud'}
+		<div class="invite-note">
+			Looking for a user outside your organization?
+			{#if role === 'admin' || role === 'manager'}
+				<a href={instance + '/account/org/members?invite'} target="_blank" class="hds-link">
+					Invite them
+				</a>
+			{:else}
+				Ask an admin to invite them
+			{/if} to your organization first.
+		</div>
+	{/if}
 {/if}
 
 <style>

package/dist/cloud/OrganizationMembers/members.js

@@ -1,11 +1,18 @@
 import { getCloudContext } from '../CloudContext/cloudContextState.svelte.js';
 export async function searchMembers(search) {
-    const { instance, organization } = getCloudContext();
+    const { instance, organization, deployment } = getCloudContext();
     const query = new URLSearchParams({
         organization_id: organization?.id.toString() || '',
         search
     });
-    const response = await fetch(instance + '/api/v2/cloud/members/search?' + query.toString(), {
+    let url;
+    if (deployment === 'cloud') {
+        url = instance + '/api/v2/cloud/members/search?' + query.toString();
+    }
+    else {
+        url = '/api/oidc/search?' + query.toString();
+    }
+    const response = await fetch(url, {
         method: 'GET',
         credentials: 'include'
     });

package/dist/cloud/OrganizationSwitcher/organizationSwitcherState.svelte.js

@@ -15,7 +15,11 @@ export async function getMyOrganizations() {
     // 	{ id: 3, name: 'Org 3', member_role: 'billing' },
     // 	{ id: 4, name: 'Org 4', member_role: 'manager' }
     // ];
-    const { instance } = getCloudContext();
+    const { instance, deployment, organization } = getCloudContext();
+    if (deployment !== 'cloud') {
+        loadedOrganizations = organization ? [organization] : [];
+        return loadedOrganizations;
+    }
     const response = await fetch(instance + '/api/v2/cloud/organizations/my', {
         credentials: 'include'
     });
@@ -24,7 +28,10 @@ export async function getMyOrganizations() {
     return data;
 }
 export async function switchOrganization(orgId) {
-    const { instance } = getCloudContext();
+    const { instance, deployment, organization } = getCloudContext();
+    if (deployment !== 'cloud') {
+        return organization;
+    }
     const response = await fetch(instance + '/api/v2/cloud/organizations/switch', {
         method: 'POST',
         credentials: 'include',

package/dist/cloud/index.d.ts

@@ -2,7 +2,6 @@ export { default as CloudContext } from './CloudContext/CloudContext.svelte';
 export { getCloudContext, setCloudContext, type CloudContext as CloudContextType, type CloudContextUser, type CloudContextOrganization, type OrganizationRole, type OrganizationMember, type ResolvedLicense } from './CloudContext/cloudContextState.svelte.js';
 export { default as HyvorBar } from './HyvorBar/HyvorBar.svelte';
 export { bar as hyvorBar } from './HyvorBar/bar.js';
-export { default as BarLicense } from './HyvorBar/BarNotice/BarLicense.svelte';
 export { default as ResourceCreator } from './ResourceCreator/ResourceCreator.svelte';
 export { default as OrganizationMemberSearch } from './OrganizationMembers/OrganizationMembersSearch.svelte';
 export { default as OrganizationCreator } from './OrganizationCreator/OrganizationCreator.svelte';

package/dist/cloud/index.js

@@ -2,7 +2,6 @@ export { default as CloudContext } from './CloudContext/CloudContext.svelte';
 export { getCloudContext, setCloudContext } from './CloudContext/cloudContextState.svelte.js';
 export { default as HyvorBar } from './HyvorBar/HyvorBar.svelte';
 export { bar as hyvorBar } from './HyvorBar/bar.js';
-export { default as BarLicense } from './HyvorBar/BarNotice/BarLicense.svelte';
 export { default as ResourceCreator } from './ResourceCreator/ResourceCreator.svelte';
 export { default as OrganizationMemberSearch } from './OrganizationMembers/OrganizationMembersSearch.svelte';
 export { default as OrganizationCreator } from './OrganizationCreator/OrganizationCreator.svelte';

package/dist/components/Tag/Tag.svelte

@@ -1,12 +1,11 @@
 <script lang="ts">
 	import { createBubbler } from 'svelte/legacy';
-	import type { TagSize } from './tag.types.js';
 
 	const bubble = createBubbler();
 
 	interface Props {
 		as?: 'button' | 'a' | 'span';
-		size?: TagSize;
+		size?: 'x-small' | 'small' | 'medium' | 'large';
 		color?:
 			| 'default' // default tag (categories)
 			| 'accent'

package/dist/components/Tag/Tag.svelte.d.ts

@@ -1,7 +1,6 @@
-import type { TagSize } from './tag.types.js';
 interface Props {
     as?: 'button' | 'a' | 'span';
-    size?: TagSize;
+    size?: 'x-small' | 'small' | 'medium' | 'large';
     color?: 'default' | 'accent' | 'green' | 'red' | 'blue' | 'orange';
     interactive?: boolean;
     outline?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hyvor/design",
-	"version": "2.0.8-beta.1",
+	"version": "2.0.8-beta.3",
 	"license": "MIT",
 	"private": false,
 	"repository": {

package/dist/components/Tag/tag.types.d.ts

@@ -1 +0,0 @@
-export type TagSize = 'x-small' | 'small' | 'medium' | 'large';

package/dist/components/Tag/tag.types.js

@@ -1 +0,0 @@
-export {};