Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

feat(new-service): add scoped resource selection

Juan Denis988cb659d0da
diff --git a/frontend/src/components/ResourcePicker.jsx b/frontend/src/components/ResourcePicker.jsx
index 80fa7934..2c885b0f 100644
--- a/frontend/src/components/ResourcePicker.jsx
+++ b/frontend/src/components/ResourcePicker.jsx
@@ -11,6 +11,7 @@ import { useResourceOptions } from '../hooks/useResourceOptions';
import { normalizeResourceRef, resourceKey } from '../utils/resourceRefs';
const normalizeList = (options) => options.map(normalizeResourceRef).filter(Boolean);
+const allowOption = () => true;
export default function ResourcePicker({
value,
@@ -19,7 +20,8 @@ export default function ResourcePicker({
scope,
capabilities,
staticOptions = [],
- filterOption = () => true,
+ filterOption = allowOption,
+ icon: ResourceIcon = Server,
disabled = false,
label,
placeholder,
@@ -68,7 +70,7 @@ export default function ResourcePicker({
value={resourceKey(option)}
onSelect={() => select(option)}
>
- <Server className="sk-resource-picker__option-icon" aria-hidden="true" />
+ <ResourceIcon className="sk-resource-picker__option-icon" aria-hidden="true" />
<span className="sk-resource-picker__option-copy">
<span>{option.label}</span>
{option.sublabel && <small>{option.sublabel}</small>}
@@ -99,7 +101,7 @@ export default function ResourcePicker({
aria-label={label}
aria-expanded={open}
>
- <Server aria-hidden="true" />
+ <ResourceIcon aria-hidden="true" />
<span>{triggerLabel}</span>
<ChevronDown className="sk-resource-picker__chevron" aria-hidden="true" />
</Button>
diff --git a/frontend/src/pages/new-service/ReviewStep.jsx b/frontend/src/pages/new-service/ReviewStep.jsx
index d7be1c91..a45af9c0 100644
--- a/frontend/src/pages/new-service/ReviewStep.jsx
+++ b/frontend/src/pages/new-service/ReviewStep.jsx
@@ -1,10 +1,14 @@
+import { useMemo } from 'react';
import {
- ChevronDown, Database, Globe, Lock, Network, Settings2, Zap, CheckCircle2,
+ ChevronDown, Database, FolderKanban, Globe, Layers3, Lock, Network,
+ Settings2, Zap, CheckCircle2,
} from 'lucide-react';
import { Label } from '@/components/ui/label';
import { Input } from '@/components/ui/input';
import { Switch } from '@/components/ui/switch';
import BuildpackPreview from '@/components/buildpack/BuildpackPreview';
+import ResourcePicker from '@/components/ResourcePicker';
+import { useWorkspace } from '@/contexts/WorkspaceContext';
import { useTranslation } from 'react-i18next';
import {
APP_TYPE_OPTIONS, BUILD_METHOD_OPTIONS, formatAppType, formatBuildMethod,
@@ -14,6 +18,7 @@ import {
// fields live in one grid, Advanced keeps the genuinely rare bits.
const ReviewStep = ({ form }) => {
const { t } = useTranslation();
+ const { activeWorkspaceId, isAllWorkspaces } = useWorkspace();
const {
sourceMode, activeManifest, activeManifestLoading, recommended,
buildpackEligible, buildpack, buildpackLoading, buildpackOverrides, setBuildpackOverrides,
@@ -28,6 +33,55 @@ const ReviewStep = ({ form }) => {
const envList = activeManifest?.manifest_v1
? (activeManifest.manifest_v1.env_required || [])
: (activeManifest?.env || []);
+ const resourceScope = useMemo(() => ({
+ workspaceId: isAllWorkspaces ? null : activeWorkspaceId,
+ }), [activeWorkspaceId, isAllWorkspaces]);
+ const noProjectOption = useMemo(() => ({
+ type: 'project-option',
+ id: 'none',
+ label: t('app.reviewStep.noProject', 'No project'),
+ sublabel: '',
+ path: '/projects',
+ scope: {},
+ status: null,
+ capabilities: [],
+ }), [t]);
+ const selectedProject = projects.find((project) => String(project.id) === selectedProjectId);
+ const selectedProjectResource = selectedProjectId ? {
+ type: 'project',
+ id: selectedProjectId,
+ label: selectedProject?.name || selectedProjectId,
+ sublabel: selectedProject?.description || '',
+ path: `/projects/${selectedProjectId}`,
+ scope: {
+ workspaceId: selectedProject?.workspace_id ?? resourceScope.workspaceId,
+ projectId: Number(selectedProjectId),
+ },
+ status: null,
+ capabilities: [],
+ } : noProjectOption;
+ const selectedEnvironment = projectEnvironments.find((environment) => (
+ String(environment.id) === selectedEnvironmentId
+ ));
+ const selectedEnvironmentResource = selectedEnvironmentId ? {
+ type: 'environment',
+ id: selectedEnvironmentId,
+ label: selectedEnvironment?.name || selectedEnvironmentId,
+ sublabel: selectedProject?.name || '',
+ path: `/projects/${selectedProjectId}`,
+ scope: {
+ ...resourceScope,
+ projectId: Number(selectedProjectId),
+ environmentId: Number(selectedEnvironmentId),
+ },
+ status: null,
+ capabilities: [],
+ } : null;
+
+ const handleProjectChange = (resource) => {
+ setSelectedEnvironmentId('');
+ setSelectedProjectId(resource.type === 'project' ? resource.id : '');
+ };
return (
<div className="new-service-page__step new-service-page__review">
@@ -222,29 +276,41 @@ const ReviewStep = ({ form }) => {
)}
</div>
- {projects.length > 0 && (
- <div className="new-service-page__fields-grid">
+ <div className="new-service-page__fields-grid">
+ <div className="new-service-page__field">
+ <Label>
+ {t('app.reviewStep.project', 'Project')} <span className="new-service-page__optional">(optional)</span>
+ </Label>
+ <ResourcePicker
+ value={selectedProjectResource}
+ onChange={handleProjectChange}
+ types={['project']}
+ scope={resourceScope}
+ staticOptions={[noProjectOption]}
+ icon={FolderKanban}
+ label={t('app.reviewStep.project', 'Project')}
+ placeholder={t('app.reviewStep.noProject', 'No project')}
+ searchPlaceholder={t('app.projects.searchProjects', 'Search projects…')}
+ className="new-service-page__resource-picker"
+ />
+ </div>
+ {selectedProjectId && (
<div className="new-service-page__field">
- <Label htmlFor="review-project">
- {t('app.reviewStep.project', 'Project')} <span className="new-service-page__optional">(optional)</span>
- </Label>
- <select id="review-project" value={selectedProjectId} onChange={(e) => setSelectedProjectId(e.target.value)}>
- <option value="">{t('app.reviewStep.noProject', 'No project')}</option>
- {projects.map(p => <option key={p.id} value={p.id}>{p.name}</option>)}
- </select>
+ <Label>{t('app.reviewStep.environment2', 'Environment')}</Label>
+ <ResourcePicker
+ value={selectedEnvironmentResource}
+ onChange={(resource) => setSelectedEnvironmentId(resource.id)}
+ types={['environment']}
+ scope={{ ...resourceScope, projectId: selectedProjectId }}
+ icon={Layers3}
+ label={t('app.reviewStep.environment2', 'Environment')}
+ placeholder={t('app.reviewStep.environment2', 'Environment')}
+ searchPlaceholder={t('app.reviewStep.environment2', 'Environment')}
+ className="new-service-page__resource-picker"
+ />
</div>
- {selectedProjectId && (
- <div className="new-service-page__field">
- <Label htmlFor="review-env">{t('app.reviewStep.environment2', 'Environment')}</Label>
- <select id="review-env" value={selectedEnvironmentId} onChange={(e) => setSelectedEnvironmentId(e.target.value)}>
- {projectEnvironments.map(env => (
- <option key={env.id} value={env.id}>{env.name}</option>
- ))}
- </select>
- </div>
- )}
- </div>
- )}
+ )}
+ </div>
{/* Advanced keeps only the genuinely rare bits. */}
{showBuild && (
diff --git a/frontend/src/pages/new-service/useNewServiceForm.js b/frontend/src/pages/new-service/useNewServiceForm.js
index c7a9aa98..c6b76188 100644
--- a/frontend/src/pages/new-service/useNewServiceForm.js
+++ b/frontend/src/pages/new-service/useNewServiceForm.js
@@ -211,9 +211,9 @@ export function useNewServiceForm() {
}, []);
useEffect(() => {
+ setProjectEnvironments([]);
+ setSelectedEnvironmentId('');
if (!selectedProjectId) {
- setProjectEnvironments([]);
- setSelectedEnvironmentId('');
return undefined;
}
let cancelled = false;
diff --git a/frontend/src/styles/pages/_new-service.scss b/frontend/src/styles/pages/_new-service.scss
index d4600bb9..20fb8c00 100644
--- a/frontend/src/styles/pages/_new-service.scss
+++ b/frontend/src/styles/pages/_new-service.scss
@@ -647,6 +647,11 @@
}
}
+ &__resource-picker {
+ width: 100%;
+ max-width: none;
+ }
+
&__optional {
color: $text-tertiary;
font-weight: $font-weight-normal;