feat(studio): pass store catalog to editor + Add-module-source dialog
Some checks failed
Security / Security check (push) Failing after 1s
Some checks failed
Security / Security check (push) Failing after 1s
Two host-side pieces that complete the editor 0.18 quick-fix
loop:
- FlowsPage now fetches the store catalog (`searchStore` with
a 500-item ceiling) on open and hands it as `storeCapabilities`
to the FlowEditorPage. The editor's analyzer uses it to
decide whether an unknown-cap fix shows "Install …" or the
Add-source alternative.
- New `_AddModuleSourceDialog` — wired through the editor's
`onAddModuleSource` callback. Asks the operator for a URL
or local .fai bundle path; passes the value into
`HubService.installModule(source: …)`. Honest about its
limits: includes a card pointing the operator at
`fai install --link <path>` for unpacked module source
directories (which the gRPC install API doesn't currently
support — that's CLI-only).
Studio bumped to 0.65.0; editor path-override pulls in 0.18.0.
Signed-off-by: flemming-it <stefan.a.flemming@googlemail.com>
This commit is contained in:
parent
0cc527b07c
commit
63985267d5
4 changed files with 164 additions and 9 deletions
|
|
@ -27,7 +27,7 @@ import 'widgets/widgets.dart';
|
||||||
/// Studio's own build version. Bump on every UI commit so the
|
/// Studio's own build version. Bump on every UI commit so the
|
||||||
/// running app self-identifies — visible in the sidebar header
|
/// running app self-identifies — visible in the sidebar header
|
||||||
/// and quick-glance proof that you're seeing the current build.
|
/// and quick-glance proof that you're seeing the current build.
|
||||||
const String kStudioVersion = '0.64.0';
|
const String kStudioVersion = '0.65.0';
|
||||||
|
|
||||||
Future<void> main() async {
|
Future<void> main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
|
||||||
|
|
@ -32,11 +32,40 @@ class _FlowsPageState extends State<FlowsPage> {
|
||||||
late Future<List<String>> _capabilities;
|
late Future<List<String>> _capabilities;
|
||||||
late final StudioFlowRunDriver _driver;
|
late final StudioFlowRunDriver _driver;
|
||||||
|
|
||||||
|
/// Snapshot of bare capability names the public store can
|
||||||
|
/// install. Refreshed once at open so the editor's analyzer
|
||||||
|
/// can decide between "Install" (in store) and "Add source"
|
||||||
|
/// (not in store) without a per-keystroke network call.
|
||||||
|
List<String> _storeCaps = const [];
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_driver = StudioFlowRunDriver();
|
_driver = StudioFlowRunDriver();
|
||||||
_capabilities = _loadCapabilities();
|
_capabilities = _loadCapabilities();
|
||||||
|
_loadStoreCapabilities();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _loadStoreCapabilities() async {
|
||||||
|
try {
|
||||||
|
final items = await HubService.instance.searchStore(limit: 500);
|
||||||
|
if (!mounted) return;
|
||||||
|
// Store items carry a list of provided capabilities. We
|
||||||
|
// ingest all of them flat so a single store entry
|
||||||
|
// shipping multiple caps still reports each as installable.
|
||||||
|
// Falls back to the item name for legacy entries.
|
||||||
|
final caps = <String>{};
|
||||||
|
for (final item in items) {
|
||||||
|
if (item.requiresCapabilities.isNotEmpty) {
|
||||||
|
caps.addAll(item.requiresCapabilities);
|
||||||
|
}
|
||||||
|
caps.add(item.name);
|
||||||
|
}
|
||||||
|
setState(() => _storeCaps = caps.toList()..sort());
|
||||||
|
} catch (_) {
|
||||||
|
// Soft-fail: empty list disables the Install button on
|
||||||
|
// unknown-cap fixes, but Add-source remains available.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Pulls the capability identifiers the picker dialog
|
/// Pulls the capability identifiers the picker dialog
|
||||||
|
|
@ -64,11 +93,22 @@ class _FlowsPageState extends State<FlowsPage> {
|
||||||
/// list so the editor can re-analyze without waiting for the
|
/// list so the editor can re-analyze without waiting for the
|
||||||
/// parent widget rebuild.
|
/// parent widget rebuild.
|
||||||
Future<List<String>?> _onInstallCapability(String capability) async {
|
Future<List<String>?> _onInstallCapability(String capability) async {
|
||||||
|
return _runInstall(source: capability);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `Add source for <cap>…` handler. Prompts the operator
|
||||||
|
/// for a local path or URL, then routes through the same
|
||||||
|
/// install RPC. Returns the refreshed capability list on
|
||||||
|
/// success, null on cancel / failure.
|
||||||
|
Future<List<String>?> _onAddModuleSource(String capability) async {
|
||||||
|
final source = await _AddModuleSourceDialog.show(context, capability);
|
||||||
|
if (source == null || source.isEmpty) return null;
|
||||||
|
return _runInstall(source: source);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<String>?> _runInstall({required String source}) async {
|
||||||
try {
|
try {
|
||||||
// Editor passes the raw `use:` value (e.g.
|
await HubService.instance.installModule(source: source);
|
||||||
// `text.classify@^1`). HubService.installModule resolves
|
|
||||||
// any version spec the hub's registry accepts.
|
|
||||||
await HubService.instance.installModule(source: capability);
|
|
||||||
final caps = await HubService.instance.allCapabilities();
|
final caps = await HubService.instance.allCapabilities();
|
||||||
final updated = caps
|
final updated = caps
|
||||||
.map((c) => '${c.capability}@${c.version}')
|
.map((c) => '${c.capability}@${c.version}')
|
||||||
|
|
@ -76,8 +116,6 @@ class _FlowsPageState extends State<FlowsPage> {
|
||||||
.toList()
|
.toList()
|
||||||
..sort();
|
..sort();
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
// Refresh the cached capability future so subsequent
|
|
||||||
// FutureBuilder rebuilds also see the new list.
|
|
||||||
setState(() => _capabilities = Future.value(updated));
|
setState(() => _capabilities = Future.value(updated));
|
||||||
}
|
}
|
||||||
return updated;
|
return updated;
|
||||||
|
|
@ -110,9 +148,126 @@ class _FlowsPageState extends State<FlowsPage> {
|
||||||
locale: editorLocale,
|
locale: editorLocale,
|
||||||
runDriver: _driver,
|
runDriver: _driver,
|
||||||
availableCapabilities: caps,
|
availableCapabilities: caps,
|
||||||
|
storeCapabilities: _storeCaps,
|
||||||
onInstallCapability: _onInstallCapability,
|
onInstallCapability: _onInstallCapability,
|
||||||
|
onAddModuleSource: _onAddModuleSource,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Modal asking the operator where a missing capability can be
|
||||||
|
/// installed from — either a local module directory (the
|
||||||
|
/// `--link` install path) or a remote URL the hub can resolve.
|
||||||
|
/// Returns the typed source string on submit, null on cancel.
|
||||||
|
class _AddModuleSourceDialog extends StatefulWidget {
|
||||||
|
final String capability;
|
||||||
|
const _AddModuleSourceDialog({required this.capability});
|
||||||
|
|
||||||
|
static Future<String?> show(BuildContext context, String capability) {
|
||||||
|
return showDialog<String>(
|
||||||
|
context: context,
|
||||||
|
builder: (_) => _AddModuleSourceDialog(capability: capability),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<_AddModuleSourceDialog> createState() => _AddModuleSourceDialogState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AddModuleSourceDialogState extends State<_AddModuleSourceDialog> {
|
||||||
|
final TextEditingController _ctrl = TextEditingController();
|
||||||
|
String _source = '';
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_ctrl.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final theme = Theme.of(context);
|
||||||
|
return AlertDialog(
|
||||||
|
title: const Text('Add module source'),
|
||||||
|
content: SizedBox(
|
||||||
|
width: 480,
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'`${widget.capability}` is not in the public store. '
|
||||||
|
'Point the hub at a `.fai` bundle URL or a local bundle path '
|
||||||
|
'and the hub will install + verify it.',
|
||||||
|
style: theme.textTheme.bodySmall?.copyWith(
|
||||||
|
color: theme.colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
TextField(
|
||||||
|
controller: _ctrl,
|
||||||
|
autofocus: true,
|
||||||
|
onChanged: (v) => setState(() => _source = v.trim()),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: 'URL or path to .fai bundle',
|
||||||
|
hintText: 'https://example.com/foo-0.1.0.fai',
|
||||||
|
border: OutlineInputBorder(),
|
||||||
|
isDense: true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.all(10),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: theme.colorScheme.surfaceContainerHigh,
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'Developing a local module?',
|
||||||
|
style: theme.textTheme.labelMedium?.copyWith(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
'Studio installs from URLs + packed bundles only. For an '
|
||||||
|
'unpacked source directory, use the CLI:',
|
||||||
|
style: theme.textTheme.bodySmall?.copyWith(
|
||||||
|
color: theme.colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
SelectableText(
|
||||||
|
'fai install --link /path/to/module',
|
||||||
|
style: theme.textTheme.bodySmall?.copyWith(
|
||||||
|
fontFamily: 'JetBrains Mono',
|
||||||
|
fontSize: 11,
|
||||||
|
color: theme.colorScheme.onSurface,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.of(context).pop(),
|
||||||
|
child: const Text('Cancel'),
|
||||||
|
),
|
||||||
|
FilledButton(
|
||||||
|
onPressed: _source.isEmpty
|
||||||
|
? null
|
||||||
|
: () => Navigator.of(context).pop(_source),
|
||||||
|
child: const Text('Install'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ packages:
|
||||||
path: "../fai_studio_flow_editor"
|
path: "../fai_studio_flow_editor"
|
||||||
relative: true
|
relative: true
|
||||||
source: path
|
source: path
|
||||||
version: "0.16.0"
|
version: "0.17.0"
|
||||||
fake_async:
|
fake_async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
name: fai_studio
|
name: fai_studio
|
||||||
description: "F∆I Studio — desktop GUI for the F∆I hub"
|
description: "F∆I Studio — desktop GUI for the F∆I hub"
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
version: 0.64.0
|
version: 0.65.0
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.11.0-200.1.beta
|
sdk: ^3.11.0-200.1.beta
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue