A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/signumsoftware/framework/commit/7fc7c5efa2c39cdd881d6d6dd0bc57caa7da9f08 below:

fix children structure · signumsoftware/framework@7fc7c5e · GitHub

File tree Expand file treeCollapse file tree 34 files changed

+237

-204

lines changed

Filter options

Expand file treeCollapse file tree 34 files changed

+237

-204

lines changed Original file line number Diff line number Diff line change

@@ -41,13 +41,14 @@ export default function Alert(p: { ctx: TypeContext<AlertEntity> }) {

41 41

<ValueLine ctx={ctx.subCtx(n => n.titleField)} label={AlertMessage.Title.niceToString()} valueHtmlAttributes={{ placeholder: (ctx.value.alertType && AlertsClient.getTitle(null, ctx.value.alertType)) ?? undefined }} />

42 42

{

43 43

!ctx.value.isNew && !edit ?

44 -

<FormGroup ctx={ctx.subCtx(n => n.titleField)} label={AlertMessage.Text.niceToString()}

45 -

children={() => <div style={{ whiteSpace: "pre-wrap" }}>

44 +

<FormGroup ctx={ctx.subCtx(n => n.titleField)} label={AlertMessage.Text.niceToString()} >

45 +

{() => <div style={{ whiteSpace: "pre-wrap" }}>

46 46

{AlertsClient.format(ctx.value.textField || ctx.value.textFromAlertType || "", ctx.value)}

47 47

<br />

48 48

<a href="#" className="text-muted" onClick={e => { e.preventDefault(); setEdit(true) }}>Edit</a>

49 49

</div>}

50 -

/>

50 +

</FormGroup>

51 + 51 52

:

52 53

<ValueLine ctx={ctx.subCtx(n => n.textField)} label={AlertMessage.Text.niceToString()} valueHtmlAttributes={{ style: { height: "180px" } }} />

53 54

}

Original file line number Diff line number Diff line change

@@ -32,22 +32,22 @@ export function DoublePassword(p: { ctx: TypeContext<string>, initialOpen: boole

32 32 33 33

if (!isOpen) {

34 34

return (

35 -

<FormGroup label={LoginAuthMessage.NewPassword.niceToString()} ctx={p.ctx}

36 -

children={() => <a className="btn btn-light btn-sm" onClick={() => setIsOpen(true)}>

37 -

<FontAwesomeIcon icon="key" /> {LoginAuthMessage.ChangePassword.niceToString()}

38 -

</a>}

39 -

/>

35 +

<FormGroup label={LoginAuthMessage.NewPassword.niceToString()} ctx={p.ctx}>

36 +

{() => <a className="btn btn-light btn-sm" onClick={() => setIsOpen(true)}>

37 +

<FontAwesomeIcon icon="key" /> {LoginAuthMessage.ChangePassword.niceToString()}

38 +

</a>}

39 +

</FormGroup>

40 40

);

41 41

}

42 42 43 43

return (

44 44

<div>

45 -

<FormGroup ctx={p.ctx} label={LoginAuthMessage.NewPassword.niceToString()}

46 -

children={inputId => <input id={inputId} type="password" ref={newPass} autoComplete="off" placeholder={LoginAuthMessage.NewPassword.niceToString()} className={classes(p.ctx.formControlClass, p.mandatory && !newPass.current?.value ? "sf-mandatory" : null)} onBlur={handlePasswordBlur} />}

47 -

/>

48 -

<FormGroup ctx={p.ctx} label={LoginAuthMessage.ConfirmNewPassword.niceToString()}

49 -

children={inputId => <input id={inputId} type="password" ref={newPass2} autoComplete="off" placeholder={LoginAuthMessage.ConfirmNewPassword.niceToString()} className={classes(p.ctx.formControlClass, p.mandatory && !newPass2.current?.value ? "sf-mandatory" : null)} onBlur={handlePasswordBlur} />}

50 -

/>

45 +

<FormGroup ctx={p.ctx} label={LoginAuthMessage.NewPassword.niceToString()}>

46 +

{inputId => <input id={inputId} type="password" ref={newPass} autoComplete="off" placeholder={LoginAuthMessage.NewPassword.niceToString()} className={classes(p.ctx.formControlClass, p.mandatory && !newPass.current?.value ? "sf-mandatory" : null)} onBlur={handlePasswordBlur} />}

47 +

</FormGroup>

48 +

<FormGroup ctx={p.ctx} label={LoginAuthMessage.ConfirmNewPassword.niceToString()}>

49 +

{inputId => <input id={inputId} type="password" ref={newPass2} autoComplete="off" placeholder={LoginAuthMessage.ConfirmNewPassword.niceToString()} className={classes(p.ctx.formControlClass, p.mandatory && !newPass2.current?.value ? "sf-mandatory" : null)} onBlur={handlePasswordBlur} />}

50 +

</FormGroup>

51 51

</div>

52 52

);

53 53

}

Original file line number Diff line number Diff line change

@@ -29,14 +29,14 @@ export function IconTypeaheadLine(p : IconTypeaheadLineProps){

29 29

var ctx = p.ctx;

30 30 31 31

return (

32 -

<FormGroup ctx={ctx} label={ctx.niceName()}

33 -

children={inputId => <IconTypeahead icon={ctx.value}

32 +

<FormGroup ctx={ctx} label={ctx.niceName()}>

33 +

{inputId => <IconTypeahead icon={ctx.value}

34 34

placeholder={p.ctx.placeholderLabels ? p.ctx.niceName() : undefined}

35 35

extraIcons={p.extraIcons}

36 36

formControlClass={ctx.formControlClass}

37 37

inputAttrs={p.inputAttrs}

38 38

onChange={handleChange} />}

39 -

/>

39 +

</FormGroup>

40 40

);

41 41

}

42 42 Original file line number Diff line number Diff line change

@@ -197,9 +197,8 @@ export function ChartPaletteLink(p: ChartPaletteLinkProps) {

197 197

const [palette, reload] = useAPIWithReload(() => ColorPaletteClient.getColorPalette(p.type.name), [p.type.name]);

198 198 199 199

return (

200 -

<FormGroup ctx={p.ctx}

201 -

label={ChartMessage.ColorsFor0.niceToString(p.type.niceName)}

202 -

children={() => palette === undefined ?

200 +

<FormGroup ctx={p.ctx} label={ChartMessage.ColorsFor0.niceToString(p.type.niceName)}>

201 +

{() => palette === undefined ?

203 202

<span className={p.ctx.formControlPlainTextClass}>

204 203

{JavascriptMessage.loading.niceToString()}

205 204

</span> :

@@ -219,7 +218,7 @@ export function ChartPaletteLink(p: ChartPaletteLinkProps) {

219 218

{palette ? ChartMessage.ViewPalette.niceToString() : ChartMessage.CreatePalette.niceToString()}

220 219

</a>

221 220

}

222 -

/>

221 +

</FormGroup>

223 222

);

224 223

}

225 224 Original file line number Diff line number Diff line change

@@ -41,13 +41,13 @@ export default function UserChart(p : { ctx: TypeContext<UserChartEntity> }){

41 41

<div>

42 42

<EntityLine ctx={ctx.subCtx(e => e.owner)} />

43 43

<ValueLine ctx={ctx.subCtx(e => e.displayName)} />

44 -

<FormGroup ctx={ctx.subCtx(e => e.query)}

45 -

children={() =>

44 +

<FormGroup ctx={ctx.subCtx(e => e.query)}>

45 +

{() =>

46 46

Finder.isFindable(queryKey, true) ?

47 47

<a className="form-control-static" href={Finder.findOptionsPath({ queryName: queryKey })}>{getQueryNiceName(queryKey)}</a> :

48 48

<span>{getQueryNiceName(queryKey)}</span>

49 49

}

50 -

/>

50 +

</FormGroup>

51 51

<EntityLine ctx={ctx.subCtx(e => e.entityType)} onChange={() => forceUpdate()}

52 52

helpText={

53 53

<div>

Original file line number Diff line number Diff line change

@@ -54,8 +54,8 @@ export function ValueUserQueryElement(p: ValueUserQueryElementProps) {

54 54 55 55

return (

56 56

<div>

57 -

<FormGroup ctx={ctx} label={ctx.value.label ?? getQueryNiceName(fo.queryName)}

58 -

children={() =>

57 +

<FormGroup ctx={ctx} label={ctx.value.label ?? getQueryNiceName(fo.queryName)}>

58 +

{() =>

59 59

<div className="row align-items-center">

60 60

<div className="col-auto">

61 61

<span>{ctx.value.label ?? getQueryNiceName(fo!.queryName)}</span>

@@ -65,7 +65,7 @@ export function ValueUserQueryElement(p: ValueUserQueryElementProps) {

65 65

customRequest={p.cachedQuery && ((qr, fo, token) => p.cachedQuery!.then(cq => executeQueryValueCached(qr, fo, token, cq)))} />

66 66

</div>

67 67

</div>}

68 -

/>

68 +

</FormGroup>

69 69

</div>

70 70

);

71 71

}

Original file line number Diff line number Diff line change

@@ -144,8 +144,8 @@ export function CheckEvalType(p: CheckEvalTypeProps) {

144 144

}

145 145 146 146

return (

147 -

<FormGroup ctx={p.ctx} label={getQueryNiceName(p.findOptions.queryName)}

148 -

children={() => <>

147 +

<FormGroup ctx={p.ctx} label={getQueryNiceName(p.findOptions.queryName)}>

148 +

{() => <>

149 149

<SearchValue findOptions={p.findOptions} isLink={true} />

150 150

{

151 151

state == "loading" ?

@@ -174,7 +174,7 @@ export function CheckEvalType(p: CheckEvalTypeProps) {

174 174 175 175

}

176 176

</>}

177 -

/>

177 +

</FormGroup>

178 178

);

179 179

}

180 180 Original file line number Diff line number Diff line change

@@ -145,9 +145,9 @@ export default function DynamicValidation(p: DynamicValidationProps) {

145 145

<div>

146 146

<ValueLine ctx={ctx.subCtx(d => d.name)} />

147 147

<EntityLine ctx={ctx.subCtx(d => d.entityType)} onChange={handleEntityTypeChange} />

148 -

<FormGroup ctx={ctx.subCtx(d => d.subEntity)}

149 -

children={() => ctx.value.entityType && <PropertyRouteCombo ctx={ctx.subCtx(d => d.subEntity)} type={ctx.value.entityType} onChange={forceUpdate} routes={PropertyRoute.generateAll(ctx.value.entityType.cleanName).filter(a => a.propertyRouteType == "Mixin" || a.typeReference().isEmbedded && !a.typeReference().isCollection)} />}

150 -

/>

148 +

<FormGroup ctx={ctx.subCtx(d => d.subEntity)}>

149 +

{() => ctx.value.entityType && <PropertyRouteCombo ctx={ctx.subCtx(d => d.subEntity)} type={ctx.value.entityType} onChange={forceUpdate} routes={PropertyRoute.generateAll(ctx.value.entityType.cleanName).filter(a => a.propertyRouteType == "Mixin" || a.typeReference().isEmbedded && !a.typeReference().isCollection)} />}

150 +

</FormGroup>

151 151

{ctx.value.entityType &&

152 152

<div>

153 153

<br />

Original file line number Diff line number Diff line change

@@ -261,13 +261,13 @@ export default function DynamicViewOverrideComponent(p: DynamicViewOverrideCompo

261 261

<EntityLine ctx={ctx.subCtx(a => a.entityType)} onChange={forceUpdate} onRemove={handleTypeRemove} />

262 262

{

263 263

ctx.value.entityType && viewNames &&

264 -

<FormGroup ctx={ctx.subCtx(d => d.viewName)} label={ctx.niceName(d => d.viewName)}

265 -

children={inputId => <select id={inputId} value={ctx.value.viewName ? ctx.value.viewName : ""} className="form-select" onChange={handleViewNameChange}>

264 +

<FormGroup ctx={ctx.subCtx(d => d.viewName)} label={ctx.niceName(d => d.viewName)}>

265 +

{inputId => <select id={inputId} value={ctx.value.viewName ? ctx.value.viewName : ""} className="form-select" onChange={handleViewNameChange}>

266 266

<option value="">{" - "}</option>

267 267

{(viewNames ?? []).map((v, i) => <option key={i} value={v}>{v}</option>)}

268 268

</select>

269 269

}

270 -

/>

270 +

</FormGroup>

271 271

}

272 272 273 273

{ctx.value.entityType &&

Original file line number Diff line number Diff line change

@@ -68,8 +68,8 @@ export const FileImageLine = React.forwardRef(function FileImageLine(props: File

68 68

<FormGroup ctx={p.ctx} label={p.label}

69 69

labelHtmlAttributes={p.labelHtmlAttributes}

70 70

htmlAttributes={{ ...c.baseHtmlAttributes(), ...EntityBaseController.entityHtmlAttributes(p.ctx.value), ...p.formGroupHtmlAttributes }}

71 -

helpText={c.props.helpText}

72 -

children={() => hasValue ? renderImage() : p.ctx.readOnly ? undefined :

71 +

helpText={c.props.helpText}>

72 +

{() => hasValue ? renderImage() : p.ctx.readOnly ? undefined :

73 73

<FileUploader

74 74

accept={p.accept}

75 75

maxSizeInBytes={p.maxSizeInBytes}

@@ -81,7 +81,7 @@ export const FileImageLine = React.forwardRef(function FileImageLine(props: File

81 81

buttonCss={p.ctx.buttonClass}

82 82

divHtmlAttributes={{ className: "sf-file-line-new" }} />

83 83

}

84 -

/>

84 +

</FormGroup>

85 85

);

86 86 87 87

function renderImage() {

You can’t perform that action at this time.


RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4