{state.current === '' || state.current === null ?
: state.current}
{
props.onChange ?
diff --git a/website/src/components/extended-widget/ai-widget/index.tsx b/website/src/components/extended-widget/ai-widget/index.tsx
index 0698ca0..0267e54 100644
--- a/website/src/components/extended-widget/ai-widget/index.tsx
+++ b/website/src/components/extended-widget/ai-widget/index.tsx
@@ -7,6 +7,6 @@ export function AiWidget(props: {value: Component}) {
-
{props.value.properties["Prompt"]}
+
{props.value.properties["Prompt"].value}
}
\ No newline at end of file
diff --git a/website/src/components/extended-widget/index.tsx b/website/src/components/extended-widget/index.tsx
index 9cf1419..965ee2f 100644
--- a/website/src/components/extended-widget/index.tsx
+++ b/website/src/components/extended-widget/index.tsx
@@ -12,7 +12,7 @@ export function ExtendedWidget(props: {value: Component}) {
props.value.visibleProperties!.map(property => {
return
{property}
-
{`${props.value.properties[property]}`}
+
{`${props.value.properties[property].value}`}
})
}
diff --git a/website/src/components/flow-editor/index.scss b/website/src/components/flow-editor/index.scss
index 3f90aa8..1dbbedb 100644
--- a/website/src/components/flow-editor/index.scss
+++ b/website/src/components/flow-editor/index.scss
@@ -82,7 +82,7 @@
gap: 10px;
}
- .open-publish, .export-btn, .rearrange-btn {
+ .open-publish, .export-btn, .rearrange-btn, .upgrade-manifest-btn {
padding: 8px 20px;
border-radius: 5px;
color: var(--text-inactive-color);
@@ -91,7 +91,7 @@
cursor: pointer;
}
- .open-publish:hover, .export-btn:hover, .rearrange-btn:hover {
+ .open-publish:hover, .export-btn:hover, .rearrange-btn:hover, .upgrade-manifest-btn:hover {
color: var(--highlight-green);
background-color: var(--light-green);
border-color: var(--highlight-green);
diff --git a/website/src/components/flow-editor/index.tsx b/website/src/components/flow-editor/index.tsx
index 3c29c22..081434f 100644
--- a/website/src/components/flow-editor/index.tsx
+++ b/website/src/components/flow-editor/index.tsx
@@ -42,6 +42,7 @@ export type ResizeDir = 'top' | 'top-left' | 'left' | 'bottom-left' | 'bottom' |
interface FlowEditorState {
saved: boolean,
flow: FlowObject
+ classManifest: AgentManifest|null
menu: { position: { x: number, y: number }, items: { name: string, on: () => void }[] } | null
panning: boolean,
editingComponent: Uuid | null,
@@ -69,33 +70,16 @@ function createDefaultConnection(flow: FlowObject, src: Uuid, dst: Uuid, midPoin
x: number,
y: number
} | number | null): Connection {
- const proc = flow.processors.find(proc => proc.id === src)!;
- const rels: { [name: string]: boolean } = {};
- if (proc) {
- for (const rel in proc.autoterminatedRelationships) {
- rels[rel] = false;
- }
- const manifest = flow.manifest.processors.find(proc_manifest => proc_manifest.type === proc.type);
- if (manifest?.supportsDynamicRelationships) {
- for (const prop in proc.properties) {
- if (!manifest.propertyDescriptors || !(prop in manifest.propertyDescriptors)) {
- rels[prop] = false;
- }
- }
- }
- } else {
- rels['success'] = true;
- }
+ const proc = flow.processors.find(proc => proc.id === src);
return {
id: uuid.v4() as Uuid,
name: null,
source: {id: src, port: null},
- sourceRelationships: rels,
+ sourceRelationships: proc ? [] : ['success'],
destination: {id: dst, port: null},
flowFileExpiration: "0 seconds",
backpressureThreshold: {count: "10000", size: "10 MB"},
swapThreshold: null,
- errors: [],
attributes: [],
midPoint: midPoint ?? undefined
}
@@ -152,7 +136,7 @@ export function FlowEditor(props: { id: string, flow: FlowObject }) {
const [state, setState] = useState
({
saved: true, publish: {agents: [], classes: [], targetFlow: null, modal: false, pending: false},
flow: props.flow, panning: false, menu: null, editingComponent: null, newConnection: null, newComponent: null,
- resizeGroup: null, movingComponent: null, newProcessGroup: null, selected: []
+ resizeGroup: null, movingComponent: null, newProcessGroup: null, selected: [], classManifest: null
});
const [errors, setErrors] = useState([]);
const areaRef = React.useRef(null);
@@ -256,44 +240,50 @@ export function FlowEditor(props: { id: string, flow: FlowObject }) {
const isSavePending = React.useRef(false);
+ React.useEffect(() => {
+ if (!props.flow.className) return;
+ let mounted = true;
+ let fn = () => {
+ if (!mounted) return;
+ services?.agents.fetchManifestForClass(props.flow.className!).then(manifest => {
+ if (!mounted || !manifest?.hash || manifest?.hash === props.flow.manifest.hash) return;
+ setState(st => ({...st, classManifest: manifest!}));
+ })
+ };
+ fn();
+ const timer = setInterval(fn, 2000);
+ return () => {
+ mounted = false;
+ clearInterval(timer);
+ }
+ }, [props.flow.className, props.flow.manifest.hash])
+
React.useEffect(() => {
let errors: ErrorObject[] = [];
- for (let proc of state.flow.processors) {
- const proc_manifest = state.flow.manifest.processors.find(proc_manifest => proc_manifest.type === proc.type)!;
- for (let rel in proc.autoterminatedRelationships) {
- const conn = state.flow.connections.find(conn => conn.source.id === proc.id && (rel in conn.sourceRelationships) && conn.sourceRelationships[rel]);
- if (conn && proc.autoterminatedRelationships[rel]) {
- errors.push({
- component: proc.id,
- type: "RELATIONSHIP",
- target: rel,
- message: `Relationship '${rel}' is both connected and auto-terminated`
- });
- }
- if (!conn && (!(rel in proc.autoterminatedRelationships) || !proc.autoterminatedRelationships[rel])) {
+ const report_property_errors = (item: Component, manifest: ComponentManifest) => {
+ for (let property_key in item.properties) {
+ if (!manifest.propertyDescriptors?.[property_key] && !manifest.supportsDynamicProperties) {
errors.push({
- component: proc.id,
- type: "RELATIONSHIP",
- target: rel,
- message: `Relationship '${rel}' has to be either connected or auto-terminated`
+ component: item.id,
+ type: "PROPERTY",
+ target: property_key,
+ message: `Property '${property_key}' is not supported`
});
}
- }
- for (let property_key in proc.properties) {
- let is_required = proc_manifest.propertyDescriptors?.[property_key].required ?? false;
- let is_null = proc.properties[property_key] === null;
+ let is_required = manifest.propertyDescriptors?.[property_key]?.required ?? false;
+ let is_null = item.properties[property_key].value === null;
if (is_required && is_null) {
errors.push({
- component: proc.id,
+ component: item.id,
type: "PROPERTY",
target: property_key,
message: `Property '${property_key}' is required`
});
}
- if (proc.properties[property_key]) {
+ if (item.properties[property_key].value) {
const asset_pattern = /@\{asset-id:([^}]*)\}/g;
- const ms = proc.properties[property_key]?.matchAll?.(asset_pattern);
+ const ms = item.properties[property_key].value?.matchAll?.(asset_pattern);
if (ms) {
for (const m of ms) {
const find_asset: (entries: FlowAssetDirectory['entries'])=>boolean = (entries) => {
@@ -306,7 +296,7 @@ export function FlowEditor(props: { id: string, flow: FlowObject }) {
}
if (!find_asset(state.flow.assets ?? [])) {
errors.push({
- component: proc.id,
+ component: item.id,
type: "PROPERTY",
target: property_key,
message: `No such asset '${m[1]}' id`
@@ -315,7 +305,73 @@ export function FlowEditor(props: { id: string, flow: FlowObject }) {
}
}
}
-
+ }
+ }
+ for (let proc of state.flow.processors) {
+ const proc_manifest = state.flow.manifest.processors.find(proc_manifest => proc_manifest.type === proc.type);
+ if (!proc_manifest) {
+ errors.push({
+ component: proc.id,
+ type: "PROPERTY",
+ target: "PROCESSOR-TYPE",
+ message: `This processor type is not available`
+ });
+ continue;
+ }
+ for (let rel in proc.autoterminatedRelationships) {
+ const conn = state.flow.connections.find(conn => conn.source.id === proc.id && conn.sourceRelationships.includes(rel));
+ if (conn && proc.autoterminatedRelationships[rel]) {
+ errors.push({
+ component: proc.id,
+ type: "RELATIONSHIP",
+ target: rel,
+ message: `Relationship '${rel}' is both connected and auto-terminated`
+ });
+ }
+ if (!conn && (!(rel in proc.autoterminatedRelationships) || !proc.autoterminatedRelationships[rel])) {
+ errors.push({
+ component: proc.id,
+ type: "RELATIONSHIP",
+ target: rel,
+ message: `Relationship '${rel}' has to be either connected or auto-terminated`
+ });
+ }
+ if (!proc_manifest.supportsDynamicRelationships && !proc_manifest.supportedRelationships.find(sup_rel => sup_rel.name === rel)) {
+ errors.push({
+ component: proc.id,
+ type: "RELATIONSHIP",
+ target: rel,
+ message: `Relationship '${rel}' is not supported`
+ });
+ }
+ }
+ report_property_errors(proc, proc_manifest);
+ }
+ for (let service of state.flow.services) {
+ const service_manifest = state.flow.manifest.controllerServices.find(serv_manifest => serv_manifest.type === service.type);
+ if (!service_manifest) {
+ errors.push({
+ component: service.id,
+ type: "PROPERTY",
+ target: "SERVICE-TYPE",
+ message: `This service type is not available`
+ });
+ continue;
+ }
+ report_property_errors(service, service_manifest);
+ }
+ for (const conn of state.flow.connections) {
+ const src_proc = state.flow.processors.find(proc => proc.id === conn.source.id);
+ const supported_rels = src_proc ? Object.keys(src_proc.autoterminatedRelationships) : ['success'];
+ for (const rel of conn.sourceRelationships) {
+ if (!supported_rels.includes(rel)) {
+ errors.push({
+ component: conn.id,
+ type: "RELATIONSHIP",
+ target: rel,
+ message: `Relationship '${rel}' is not available on source`
+ });
+ }
}
}
setErrors(errors);
@@ -995,7 +1051,7 @@ export function FlowEditor(props: { id: string, flow: FlowObject }) {
} else {
to = {...state.newConnection.to, w: 0, h: 0, circular: true};
}
- return
Rearrange
+ {
+ state.classManifest && state.flow.manifest.hash !== state.classManifest?.hash ?
+
{
+ setState(st => {
+ let new_processors: Processor[] = [];
+ for (const proc of st.flow.processors) {
+ const procManifest = st.classManifest!.processors.find(proc_manifest => proc_manifest.type === proc.type);
+ if (!procManifest) {
+ // this processor is no longer supported, use as-is
+ new_processors.push(proc);
+ continue;
+ }
+ let autoterminatedRelationships = {...createDefaultRelationshipStatus(procManifest.supportedRelationships), ...proc.autoterminatedRelationships};
+ let properties = createDefaultProperties(procManifest.propertyDescriptors ?? {});
+ for (const prop_name in proc.properties) {
+ if (proc.properties[prop_name].type === "custom") {
+ properties[prop_name] = proc.properties[prop_name];
+ }
+ }
+ new_processors.push({...proc, properties, autoterminatedRelationships});
+ }
+ let new_services: MiNiFiService[] = [];
+ for (const service of st.flow.services) {
+ const service_manifest = st.classManifest!.controllerServices.find(serv_manifest => serv_manifest.type === service.type);
+ if (!service_manifest) {
+ // this service is no longer supported, use as-is
+ new_services.push(service);
+ continue;
+ }
+ let properties = createDefaultProperties(service_manifest.propertyDescriptors ?? {});
+ for (const prop_name in service.properties) {
+ if (service.properties[prop_name].type === "custom") {
+ properties[prop_name] = service.properties[prop_name];
+ }
+ }
+ new_services.push({...service, properties});
+ }
+ return {...st, flow: {...st.flow, processors: new_processors, services: new_services, manifest: st.classManifest!}}
+ });
+ notif.emit('Manifest successfully upgraded', 'success');
+ }}>
+ Upgrade manifest
+