From d050b99fb218ae31dfd0ec7dea88884e14021495 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 27 Jul 2023 12:11:43 +0200
Subject: [PATCH] fix: Display source control buttons properly (#6756)

---
 .../src/components/MainSidebarSourceControl.vue      |  9 ++-------
 .../__tests__/MainSidebarSourceControl.test.ts       | 12 +++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index e04e64907..6fd0a1d66 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -31,11 +31,6 @@ const tooltipOpenDelay = ref(300);
 const currentBranch = computed(() => {
 	return sourceControlStore.preferences.branchName;
 });
-const featureEnabled = computed(() => window.localStorage.getItem('source-control'));
-// TODO: use this for release
-// const featureEnabled = computed(
-// 	() => sourceControlStore.preferences.connected && sourceControlStore.preferences.branchName,
-// );
 const isInstanceOwner = computed(() => usersStore.isInstanceOwner);
 const setupButtonTooltipPlacement = computed(() => (props.isCollapsed ? 'right' : 'top'));
 
@@ -125,11 +120,11 @@ const goToSourceControlSetup = async () => {
 
 <template>
 	<div
-		v-if="featureEnabled && isInstanceOwner"
+		v-if="sourceControlStore.isEnterpriseSourceControlEnabled && isInstanceOwner"
 		:class="{
 			[$style.sync]: true,
 			[$style.collapsed]: isCollapsed,
-			[$style.isConnected]: featureEnabled,
+			[$style.isConnected]: sourceControlStore.isEnterpriseSourceControlEnabled,
 		}"
 		:style="{ borderLeftColor: sourceControlStore.preferences.branchColor }"
 		data-test-id="main-sidebar-source-control"
diff --git a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
index c25b64f7c..e8c19daf3 100644
--- a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
@@ -31,10 +31,7 @@ const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) => {
 };
 
 describe('MainSidebarSourceControl', () => {
-	const getItemSpy = vi.spyOn(Storage.prototype, 'getItem');
-
 	beforeEach(() => {
-		getItemSpy.mockReturnValue('true');
 		pinia = createTestingPinia({
 			initialState: {
 				[STORES.SETTINGS]: {
@@ -44,20 +41,21 @@ describe('MainSidebarSourceControl', () => {
 		});
 
 		usersStore = useUsersStore(pinia);
-
 		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(true);
 
 		sourceControlStore = useSourceControlStore();
+		vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
+
 		uiStore = useUIStore();
 	});
 
-	it('should render nothing', async () => {
-		getItemSpy.mockReturnValue(null);
+	it('should render nothing when not instance owner', async () => {
+		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(false);
 		const { container } = renderComponent({ props: { isCollapsed: false } });
 		expect(container).toBeEmptyDOMElement();
 	});
 
-	it('should render empty content', async () => {
+	it('should render empty content when instance owner but not connected', async () => {
 		const { getByTestId } = renderComponent({ props: { isCollapsed: false } });
 		expect(getByTestId('main-sidebar-source-control')).toBeInTheDocument();
 		expect(getByTestId('main-sidebar-source-control')).toBeEmptyDOMElement();