Skip to content

Commit c14ae0e

Browse files
committed
but-actions is no more
Remove the remnants of the but action. Puns intended
1 parent 045ee96 commit c14ae0e

File tree

21 files changed

+1
-2111
lines changed

21 files changed

+1
-2111
lines changed

apps/desktop/cypress/e2e/support/mock/settings.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ export const MOCK_FEATURE_FLAGS: FeatureFlags = {
1111
cv3: false,
1212
ws3: false,
1313
apply3: false,
14-
actions: false,
15-
butbot: false,
1614
rules: false,
1715
singleBranch: false
1816
};

apps/desktop/src/components/AnalyticsMonitor.svelte

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ attached to posthog events.
2727
2828
$effect(() => {
2929
eventContext.update({
30-
showActions: projectState.showActions.current,
3130
exclusiveAction: projectState.exclusiveAction.current?.type
3231
});
3332
});
@@ -63,7 +62,6 @@ attached to posthog events.
6362
$effect(() => {
6463
eventContext.update({
6564
v3: true,
66-
butlerActions: $settingsService?.featureFlags.actions,
6765
ws3: $settingsService?.featureFlags.ws3,
6866
rules: $settingsService?.featureFlags.rules
6967
});

apps/desktop/src/components/ChromeHeader.svelte

Lines changed: 1 addition & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import { MODE_SERVICE } from '$lib/mode/modeService';
1111
import { handleAddProjectOutcome } from '$lib/project/project';
1212
import { PROJECTS_SERVICE } from '$lib/project/projectsService';
13-
import { ircPath, projectPath, isWorkspacePath } from '$lib/routes/routes.svelte';
14-
import { UI_STATE } from '$lib/state/uiState.svelte';
13+
import { ircPath, projectPath } from '$lib/routes/routes.svelte';
1514
import { inject } from '@gitbutler/core/context';
1615
import {
1716
Button,
@@ -37,13 +36,10 @@
3736
const baseBranchService = inject(BASE_BRANCH_SERVICE);
3837
const ircService = inject(IRC_SERVICE);
3938
const settingsService = inject(SETTINGS_SERVICE);
40-
const uiState = inject(UI_STATE);
4139
const modeService = inject(MODE_SERVICE);
4240
const baseReponse = $derived(projectId ? baseBranchService.baseBranch(projectId) : undefined);
4341
const base = $derived(baseReponse?.response);
4442
const settingsStore = $derived(settingsService.appSettings);
45-
const isWorkspace = $derived(isWorkspacePath());
46-
const canUseActions = $derived($settingsStore?.featureFlags.actions ?? false);
4743
const singleBranchMode = $derived($settingsStore?.featureFlags.singleBranch ?? false);
4844
const useCustomTitleBar = $derived(!($settingsStore?.ui.useNativeTitleBar ?? false));
4945
const backend = inject(BACKEND);
@@ -97,13 +93,6 @@
9793
function openModal() {
9894
modal?.show();
9995
}
100-
101-
const projectState = $derived(uiState.project(projectId));
102-
const showingActions = $derived(projectState.showActions.current);
103-
104-
function toggleButActions() {
105-
uiState.project(projectId).showActions.set(!showingActions);
106-
}
10796
</script>
10897

10998
{#if projectId}
@@ -254,62 +243,6 @@
254243
}}
255244
/>
256245
{/if}
257-
{#if canUseActions}
258-
<Button
259-
kind="outline"
260-
class="actions-button"
261-
reversedDirection
262-
onclick={() => {
263-
toggleButActions();
264-
}}
265-
disabled={actionsDisabled || !isWorkspace}
266-
>
267-
{#snippet custom()}
268-
<svg
269-
width="20"
270-
height="18"
271-
class="actions-icon"
272-
viewBox="0 0 20 18"
273-
fill="none"
274-
xmlns="http://www.w3.org/2000/svg"
275-
class:activated={showingActions}
276-
>
277-
<path
278-
class="actions-icon__monitor"
279-
d="M4 16H16C17.6569 16 19 14.6569 19 13V11.8541C19 10.7178 18.358 9.679 17.3416 9.17082L15.5528 8.27639C15.214 8.107 15 7.76074 15 7.38197V5C15 3.34315 13.6569 2 12 2H4C2.34315 2 1 3.34315 1 5V13C1 14.6569 2.34315 16 4 16Z"
280-
stroke-width="1.5"
281-
/>
282-
<path
283-
class="actions-icon__star"
284-
d="M7.65242 4.74446C7.76952 4.41851 8.23048 4.41851 8.34758 4.74446L8.98803 6.52723C9.23653 7.21894 9.78106 7.76348 10.4728 8.01197L12.2555 8.65242C12.5815 8.76952 12.5815 9.23048 12.2555 9.34758L10.4728 9.98803C9.78106 10.2365 9.23653 10.7811 8.98803 11.4728L8.34758 13.2555C8.23048 13.5815 7.76952 13.5815 7.65242 13.2555L7.01197 11.4728C6.76347 10.7811 6.21894 10.2365 5.52723 9.98803L3.74446 9.34758C3.41851 9.23048 3.41851 8.76952 3.74446 8.65242L5.52723 8.01197C6.21894 7.76347 6.76348 7.21894 7.01197 6.52723L7.65242 4.74446Z"
285-
/>
286-
287-
<svg
288-
width="18"
289-
height="14"
290-
viewBox="0 0 18 14"
291-
fill="none"
292-
xmlns="http://www.w3.org/2000/svg"
293-
>
294-
<defs>
295-
<linearGradient
296-
id="activated-gradient"
297-
x1="7.5"
298-
y1="2"
299-
x2="16.3281"
300-
y2="10.6554"
301-
gradientUnits="userSpaceOnUse"
302-
>
303-
<stop stop-color="#816BDA" />
304-
<stop offset="1" stop-color="#2EDBD2" />
305-
</linearGradient>
306-
</defs>
307-
</svg>
308-
</svg>
309-
{/snippet}
310-
Actions
311-
</Button>
312-
{/if}
313246
</div>
314247
</div>
315248

@@ -322,42 +255,6 @@
322255
overflow: hidden;
323256
gap: 12px;
324257
}
325-
326-
.actions-icon {
327-
opacity: var(--opacity-btn-icon-outline);
328-
}
329-
330-
.actions-icon__star,
331-
.actions-icon__monitor {
332-
transform-box: fill-box;
333-
transform-origin: center;
334-
transition: transform 0.3s;
335-
}
336-
337-
.actions-icon__star {
338-
fill: var(--clr-text-1);
339-
}
340-
341-
.actions-icon__monitor {
342-
stroke: var(--clr-text-1);
343-
}
344-
345-
:global(.chrome-header .actions-button) {
346-
&:hover:not(:disabled) .actions-icon,
347-
.actions-icon.activated {
348-
opacity: 1;
349-
350-
& .actions-icon__star {
351-
fill: #fff;
352-
transform: rotate(90deg);
353-
}
354-
& .actions-icon__monitor {
355-
fill: url(#activated-gradient);
356-
stroke: url(#activated-gradient);
357-
}
358-
}
359-
}
360-
361258
.chrome-selector-wrapper {
362259
display: flex;
363260
position: relative;

0 commit comments

Comments
 (0)