Skip to content

Show Custom Dialog InputFields converter + Explode XML hardening #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kirkabowman wants to merge 1 commit into from
+123 −2
Closed

Show Custom Dialog InputFields converter + Explode XML hardening #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 73 additions & 1 deletion agent/scripts/fm_xml_to_snippet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,9 @@ def tx_show_custom_dialog(step) -> str:
title_calc = ''
message_calc = ''
buttons = [] # list of (label_str, commit_state_str)
# input_fields[i] = {'use_password': str, 'kind': 'field'|'variable'|'empty',
# 'table': str, 'id': str, 'name': str, 'var': str, 'label': str}
input_fields = {1: None, 2: None, 3: None}

for p in all_params(step):
ptype = p.get('type', '')
Expand All @@ -353,6 +356,40 @@ def tx_show_custom_dialog(step) -> str:
if b is not None:
commit = b.get('value', 'False')
buttons.append((label, commit))
elif ptype in ('Field1', 'Field2', 'Field3'):
slot = int(ptype[-1])
entry = {
'use_password': 'False',
'kind': 'empty',
'table': '',
'id': '0',
'name': '',
'var': '',
'label': '',
}
# Password flag
for b in p.findall('Boolean'):
if b.get('type', '') == 'Password':
entry['use_password'] = b.get('value', 'False')
# Target (field or variable)
for sub in p.findall('Parameter'):
if sub.get('type', '') == 'Target':
var_el = sub.find('Variable')
if var_el is not None:
entry['kind'] = 'variable'
entry['var'] = var_el.get('value', '')
continue
fr = sub.find('FieldReference')
if fr is not None:
entry['kind'] = 'field'
entry['id'] = fr.get('id', '0')
entry['name'] = fr.get('name', '')
tor = fr.find('TableOccurrenceReference')
if tor is not None:
entry['table'] = tor.get('name', '')
elif sub.get('type', '') == 'Label':
entry['label'] = get_calc_text(sub)
input_fields[slot] = entry

parts = [
f'{S}<Step enable="{enable}" id="{sid}" name="Show Custom Dialog">',
Expand All @@ -375,7 +412,42 @@ def tx_show_custom_dialog(step) -> str:
]
else:
parts.append(f'{L2}<Button CommitState="{commit}"/>')
parts += [f'{L1}</Buttons>', f'{S}</Step>']
parts.append(f'{L1}</Buttons>')

# Emit InputFields only when at least one slot is populated. FM's
# canonical snippet shows three slots even when only one is used, so
# mirror that — empty slots become <Field table="" id="0" name=""/>.
if any(f is not None for f in input_fields.values()):
parts.append(f'{L1}<InputFields>')
for slot in (1, 2, 3):
f = input_fields[slot]
if f is None:
parts += [
f'{L2}<InputField UsePasswordCharacter="False">',
f'{L3}<Field table="" id="0" name=""/>',
f'{L2}</InputField>',
]
continue
parts.append(f'{L2}<InputField UsePasswordCharacter="{f["use_password"]}">')
if f['kind'] == 'variable':
parts.append(f'{L3}<Field>{escape_attr(f["var"])}</Field>')
elif f['kind'] == 'field':
parts.append(
f'{L3}<Field table="{escape_attr(f["table"])}" id="{f["id"]}"'
f' name="{escape_attr(f["name"])}"/>'
)
else:
parts.append(f'{L3}<Field table="" id="0" name=""/>')
if f['label']:
parts += [
f'{L3}<Label>',
f'{L1}{L3}<Calculation>{cdata(f["label"])}</Calculation>',
f'{L3}</Label>',
]
parts.append(f'{L2}</InputField>')
parts.append(f'{L1}</InputFields>')

parts.append(f'{S}</Step>')
return '\n'.join(parts)


Expand Down
51 changes: 50 additions & 1 deletion filemaker/agentic-fm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,20 +271,69 @@
<Step enable="True" id="103" name="Exit Script"/>
<Step enable="True" id="70" name="End If"/>
<Step enable="True" id="89" name="# (comment)"/>
<Step enable="True" id="89" name="# (comment)">
<Text>Ensure ~/Desktop/agentic-fm/ exists for the XML export.</Text>
</Step>
<Step enable="True" id="67" name="Perform AppleScript">
<ContentType value="Text"/>
<Text>do shell script "mkdir -p ~/Desktop/agentic-fm"</Text>
</Step>
<Step enable="True" id="141" name="Set Variable">
<Value>
<Calculation><![CDATA[Get ( DesktopPath ) & Get ( FileName ) & ".xml"]]></Calculation>
<Calculation><![CDATA[Get ( DesktopPath ) & "agentic-fm/" & Get ( FileName ) & ".xml"]]></Calculation>
</Value>
<Repetition>
<Calculation><![CDATA[1]]></Calculation>
</Repetition>
<Name>$output</Name>
</Step>
<Step enable="True" id="89" name="# (comment)">
<Text>Pre-clean: Save a Copy as XML won't overwrite an existing file.</Text>
</Step>
<Step enable="True" id="86" name="Set Error Capture">
<Set state="True"/>
</Step>
<Step enable="True" id="197" name="Delete File">
<UniversalPathList>$output</UniversalPathList>
</Step>
<Step enable="True" id="86" name="Set Error Capture">
<Set state="False"/>
</Step>
<Step enable="True" id="3" name="Save a Copy as XML">
<Option state="False"/>
<UniversalPathList>$output</UniversalPathList>
<Calculation><![CDATA[Get ( WindowName )]]></Calculation>
</Step>
<Step enable="True" id="141" name="Set Variable">
<Value>
<Calculation><![CDATA[Get ( LastError )]]></Calculation>
</Value>
<Repetition>
<Calculation><![CDATA[1]]></Calculation>
</Repetition>
<Name>$saveError</Name>
</Step>
<Step enable="True" id="68" name="If">
<Restore state="False"/>
<Calculation><![CDATA[$saveError ≠ 0]]></Calculation>
</Step>
<Step enable="True" id="87" name="Show Custom Dialog">
<Title>
<Calculation><![CDATA["Save as XML failed"]]></Calculation>
</Title>
<Message>
<Calculation><![CDATA["FileMaker could not write the XML export to:¶¶" & $output & "¶¶Error " & $saveError & ": " & Get ( LastErrorDetail ) & "¶¶Common causes: stale file at the target path, missing Files-and-Folders permission for FileMaker on Desktop, or read-only volume."]]></Calculation>
</Message>
<Buttons>
<Button CommitState="True">
<Calculation><![CDATA["OK"]]></Calculation>
</Button>
<Button CommitState="False"/>
<Button CommitState="False"/>
</Buttons>
</Step>
<Step enable="True" id="103" name="Exit Script"/>
<Step enable="True" id="70" name="End If"/>
<Step enable="True" id="89" name="# (comment)"/>
<Step enable="True" id="141" name="Set Variable">
<Value>
Expand Down