Merge pull request #10389 from gitbutlerapp/move-clipboard-to-ui-package

Move clipboard to UI package

Author: estib-vega

apps/desktop/src/components/InfoMessage.svelte

@@ -4,9 +4,9 @@
 </script>
 
 <script lang="ts">
-	import { copyToClipboard } from '@gitbutler/shared/clipboard';
-
 	import { Button, Icon } from '@gitbutler/ui';
+	import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
+
 	import type iconsJson from '@gitbutler/ui/data/icons.json';
 	import type { Snippet } from 'svelte';
 

apps/desktop/src/components/RuleFiltersEditor.svelte

@@ -12,8 +12,8 @@
 		type RuleFilterMap
 	} from '$lib/rules/rule';
 	import { typedKeys } from '$lib/utils/object';
-	import { copyToClipboard } from '@gitbutler/shared/clipboard';
 	import { Button, Select, SelectItem, Textbox, Icon, FileStatusBadge } from '@gitbutler/ui';
+	import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
 	import type { FileStatus } from '@gitbutler/ui/components/file/types';
 
 	const FILE_STATUS_OPTIONS: FileStatus[] = ['addition', 'modification', 'deletion', 'rename'];

apps/desktop/src/components/profileSettings/CliSymLink.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { CLI_MANAGER } from '$lib/cli/cli';
 	import { inject } from '@gitbutler/core/context';
-	import { copyToClipboard } from '@gitbutler/shared/clipboard';
 	import { Icon } from '@gitbutler/ui';
+	import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
 
 	interface Props {
 		class?: string;

apps/web/src/lib/components/chat/MessageContextMenu.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import RulesModal from '$lib/components/rules/RulesModal.svelte';
-	import { copyToClipboard } from '@gitbutler/shared/clipboard';
-
 	import { ContextMenu, ContextMenuItem, ContextMenuSection } from '@gitbutler/ui';
+	import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
+
 	import type { ChatMessage } from '@gitbutler/shared/chat/types';
 
 	type Props = {

apps/web/src/lib/components/review/ReviewInfo.svelte

@@ -4,7 +4,6 @@
 	import { inject } from '@gitbutler/core/context';
 	import { getChatChannelParticipants } from '@gitbutler/shared/chat/chatChannelsPreview.svelte';
 	import { CHAT_CHANNELS_SERVICE } from '@gitbutler/shared/chat/chatChannelsService';
-	import { copyToClipboard } from '@gitbutler/shared/clipboard';
 	import {
 		getUsersWithAvatars,
 		getPatchApproversWithAvatars,
@@ -15,6 +14,7 @@
 	import { type PatchCommit } from '@gitbutler/shared/patches/types';
 	import { APP_STATE } from '@gitbutler/shared/redux/store.svelte';
 	import { AvatarGroup, Icon } from '@gitbutler/ui';
+	import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
 
 	const NO_REVIEWERS = 'Not reviewed yet';
 	const NO_CONTRIBUTORS = 'No contributors';

apps/web/src/lib/diff/lineSelection.svelte.ts

@@ -1,4 +1,4 @@
-import { copyToClipboard } from '@gitbutler/shared/clipboard';
+import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
 import {
 	readDiffLineKey,
 	type DiffLineKey,

apps/web/src/routes/(app)/[ownerSlug]/[projectSlug]/reviews/[branchId]/+page.svelte

@@ -14,7 +14,6 @@
 	import { lookupLatestBranchUuid } from '@gitbutler/shared/branches/latestBranchLookup.svelte';
 	import { LATEST_BRANCH_LOOKUP_SERVICE } from '@gitbutler/shared/branches/latestBranchLookupService';
 	import { BranchStatus, type Branch } from '@gitbutler/shared/branches/types';
-	import { copyToClipboard } from '@gitbutler/shared/clipboard';
 	import { getContributorsWithAvatars } from '@gitbutler/shared/contributors';
 	import Loading from '@gitbutler/shared/network/Loading.svelte';
 	import { isFound, and, isError, map } from '@gitbutler/shared/network/loadable';
@@ -38,6 +37,7 @@
 	import FileUploadPlugin, {
 		type DropFileResult
 	} from '@gitbutler/ui/richText/plugins/FileUpload.svelte';
+	import { copyToClipboard } from '@gitbutler/ui/utils/clipboard';
 	import dayjs from 'dayjs';
 	import relativeTime from 'dayjs/plugin/relativeTime';
 

crates/gitbutler-branch-actions/src/upstream_integration.rs

@@ -3,6 +3,7 @@ use crate::{r#virtual::IsCommitIntegrated, BranchManagerExt, VirtualBranchesExt
 use anyhow::{anyhow, bail, Context, Result};
 use but_core::Reference;
 use but_rebase::{RebaseOutput, RebaseStep};
+use but_workspace::ref_info::Options;
 use but_workspace::stack_ext::StackExt;
 use gitbutler_command_context::CommandContext;
 use gitbutler_commit::commit_ext::CommitExt as _;
@@ -185,6 +186,17 @@ impl<'a> UpstreamIntegrationContext<'a> {
         permission: &'a mut WorktreeWritePermission,
         gix_repo: &'a gix::Repository,
     ) -> Result<Self> {
+        let meta = ctx.meta(permission.read_permission())?;
+        let repo = ctx.gix_repo()?;
+        let _ref_info = but_workspace::head_info(
+            &repo,
+            &*meta,
+            Options {
+                expensive_commit_info: true,
+                traversal: meta.graph_options(),
+            },
+        )?;
+
         let virtual_branches_handle = ctx.project().virtual_branches();
         let target = virtual_branches_handle.get_default_target()?;
         let repo = ctx.repo();

packages/shared/src/lib/clipboard.ts renamed to packages/ui/src/lib/utils/clipboard.ts

@@ -1,4 +1,4 @@
-import { chipToasts } from '@gitbutler/ui';
+import { chipToasts } from '$components/chipToast/chipToastStore';
 
 export function copyToClipboard(text: string) {
 	if (!navigator.clipboard) {