Merge branch 'main' into ecosystem-prototype

This commit is contained in:
Arjun Patel
2026-06-12 11:01:10 -07:00
committed by GitHub
3 changed files with 3 additions and 10 deletions
+1 -1
View File
@@ -79,7 +79,7 @@ jobs:
run: | run: |
if [ "${{ inputs.module }}" = "migrations" ]; then if [ "${{ inputs.module }}" = "migrations" ]; then
kubectl delete job migrations --ignore-not-found kubectl delete job migrations --ignore-not-found
skaffold run -p migrations --tail skaffold run -p migrations
else else
skaffold run -p ${{ inputs.environment }} -m ${{ inputs.module }} skaffold run -p ${{ inputs.environment }} -m ${{ inputs.module }}
fi fi
+2 -2
View File
@@ -38,12 +38,12 @@ PROD_REPO := us-west2-docker.pkg.dev/flowy-prod-440017/deployments
.PHONY: migrate-dev .PHONY: migrate-dev
migrate-dev: migrate-dev:
kubectl delete job migrations --ignore-not-found --context=dev kubectl delete job migrations --ignore-not-found --context=dev
SKAFFOLD_DEFAULT_REPO=$(DEV_REPO) skaffold run -p migrations --kube-context dev --tail SKAFFOLD_DEFAULT_REPO=$(DEV_REPO) skaffold run -p migrations --kube-context dev
.PHONY: migrate-prod .PHONY: migrate-prod
migrate-prod: migrate-prod:
kubectl delete job migrations --ignore-not-found --context=prod kubectl delete job migrations --ignore-not-found --context=prod
SKAFFOLD_DEFAULT_REPO=$(PROD_REPO) skaffold run -p migrations --kube-context prod --tail SKAFFOLD_DEFAULT_REPO=$(PROD_REPO) skaffold run -p migrations --kube-context prod
# ---- Deploy ---- # ---- Deploy ----
# Use MODULE=orion or MODULE=particleprocessor or MODULE=pusher or MODULE=emailnotifierjob to deploy a single service, e.g.: # Use MODULE=orion or MODULE=particleprocessor or MODULE=pusher or MODULE=emailnotifierjob to deploy a single service, e.g.:
@@ -1,5 +1,4 @@
import { useState } from 'react'; import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useAuthStore } from '@/stores/auth-store'; import { useAuthStore } from '@/stores/auth-store';
import { apiClient } from '@/api/client'; import { apiClient } from '@/api/client';
import { isParticleDeleted, isStreamOpen, type Particle } from '@/api/types'; import { isParticleDeleted, isStreamOpen, type Particle } from '@/api/types';
@@ -19,7 +18,6 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu'; } from '@/components/ui/dropdown-menu';
import { import {
Settings,
EllipsisVertical, EllipsisVertical,
Pencil, Pencil,
Lock, Lock,
@@ -56,7 +54,6 @@ interface TopBarProps {
} }
export function TopBar({ networkId, particle, streamParticle }: TopBarProps) { export function TopBar({ networkId, particle, streamParticle }: TopBarProps) {
const navigate = useNavigate();
const network = useNetwork(networkId); const network = useNetwork(networkId);
const userId = useAuthStore((s) => s.user?.id); const userId = useAuthStore((s) => s.user?.id);
const isCreator = !!userId && userId === streamParticle.created_by_human_id; const isCreator = !!userId && userId === streamParticle.created_by_human_id;
@@ -209,10 +206,6 @@ export function TopBar({ networkId, particle, streamParticle }: TopBarProps) {
Delete particle Delete particle
</DropdownMenuItem> </DropdownMenuItem>
)} )}
<DropdownMenuItem onSelect={() => navigate('/settings')}>
<Settings className="size-4" />
Settings
</DropdownMenuItem>
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>