Commit dc08e262cd53a48480a88235aa58500f0638ad79 - mmm

allow adding and removing of facets s-ol 3 years ago

5 changed file(s) with 48 addition(s) and 25 deletion(s). Raw diff Collapse all Expand all

+26

-13

mmm/mmmfs/browser.moon less more

42	42
43	43	-- active fileder
44	44	-- (re)set every time @path changes
45		@active = @path\map @root\walk
	45	@fileder = @path\map @root\walk
46	46
47	47	-- currently active facet
48		-- (re)set to default when @active changes
	48	-- (re)set to default when @fileder changes
49	49	@facet = ReactiveVar Key facet, 'mmm/dom'
50	50	if MODE == 'CLIENT'
51		@active\subscribe (fileder) ->
	51	@fileder\subscribe (fileder) ->
52	52	return unless fileder
53	53	last = @facet and @facet\get!
54	54	@facet\set Key if last then last.type else 'mmm/dom'

118	118	\append path_segment name, href
119	119
120	120	\append span 'view facet:', style: { 'margin-right': '0' }
121		\append @active\map (fileder) ->
	121	\append @fileder\map (fileder) ->
122	122	onchange = (_, e) ->
123	123	{ :type } = @facet\get!
124	124	@facet\set Key name: e.target.value, :type

177	177	warn "ERROR rendering content: #{msg}"
178	178	div!
179	179
180		active = @active\get!
	180	active = @fileder\get!
181	181
182	182	return disp_error "fileder not found!" unless active
183	183	return disp_error "facet not found!" unless prop

200	200	-- active facet in inspect tab
201	201	-- (re)set to match when @facet changes
202	202	@inspect_prop = @facet\map (prop) ->
203		active = @active\get!
	203	active = @fileder\get!
204	204	key = active and active\find prop
205	205	key = key.original if key and key.original
206	206	key

212	212	span 'inspector'
213	213	@inspect_prop\map (current) ->
214	214	current = current and current\tostring!
215		fileder = @active\get!
	215	fileder = @fileder\get!
216	216
217	217	onchange = (_, e) ->
218		return if e.target.value == ''
219		{ :name } = @facet\get!
220		@inspect_prop\set Key e.target.value
	218	facet = e.target.value
	219	return if facet == ''
	220	@inspect_prop\set Key facet
221	221
222	222	with elements.select :onchange
223	223	\append option '(none)', value: '', disabled: true, selected: not value
224	224	if fileder
225	225	for value in pairs fileder.facet_keys
226	226	\append option value, :value, selected: value == current
227		@inspect\map (enabled) ->
228		if enabled
229		button 'close', onclick: (_, e) -> @inspect\set false
	227
	228	button 'rm', class: 'tight', onclick: (_, e) ->
	229	if window\confirm "continuing will permanently remove the facet '#{@inspect_prop\get!}'."
	230	fileder = @fileder\get!
	231	fileder\set @inspect_prop\get!, nil
	232	@fileder\set fileder -- trigger re-selection of active facet & inspector
	233
	234	button 'add', class: 'tight', onclick: (_, e) ->
	235	facet = window\prompt "please enter the facet string ('name: type' or 'type'):", 'text/markdown'
	236	return if not facet or facet == '' or facet == js.null
	237	fileder = @fileder\get!
	238	fileder\set facet, ''
	239	@inspect_prop\set Key facet
	240	@refresh!
	241
	242	button 'close', onclick: (_, e) -> @inspect\set false
230	243	}
231	244	\append with div class: @inspect_err\map (e) -> if e then 'error-wrap' else 'error-wrap empty'
232	245	\append span "an error occured while rendering this view:"

+17

-10

mmm/mmmfs/fileder.moon less more

134	134
135	135	__newindex: (t, k, v) ->
136	136	-- get canonical Key instance
137		k = @facet_keys[k]
138		return unless k
139
140		rawset t, k, v
141
	137	key = @facet_keys[k]
	138
	139	-- new creating, also create canonical Key
	140	if not key
	141	key = Key k
	142	@facet_keys[key] = key
	143
	144	rawset t, key, v
	145
	146	-- when deleting, also delete canonical Key
142	147	if not v
143		@facet_keys[k] = nil
	148	@facet_keys[key] = nil
144	149	}
145	150
146	151	-- this fails with JS objects from JSON.parse

242	247
243	248	-- find facet and type according to criteria, nil if no value or conversion path
244	249	-- * ... - arguments like Key
245		find: (...) =>
246		want = Key ...
	250	find: (key, key2, ...) =>
	251	want = Key key, key2
247	252
248	253	-- filter facets by name
249	254	matching = [ key for str, key in pairs @facet_keys when key.name == want.name ]
250	255	return unless #matching > 0
251	256
252	257	-- get shortest conversion path
253		shortest_path, start = get_conversions want.type, [ key.type for key in *matching ]
	258	shortest_path, start = get_conversions want.type, [ key.type for key in *matching ], ...
254	259
255	260	if start
256	261	for key in *matching

291	296	key = Key key
292	297	value = key2
293	298
294		if @facet_keys[key]
	299	if value == nil
	300	@store\remove_facet @path, key.name, key.type
	301	elseif @facet_keys[key]
295	302	@store\update_facet @path, key.name, key.type, value
296	303	else
297	304	@store\create_facet @path, key.name, key.type, value

-1

mmm/mmmfs/init.moon less more

1	1
2	2	export ^
3	3	PLUGINS = require '.plugins'
4		print "PLUGINS = ", PLUGINS

-1

mmm/mmmfs/plugins/init.moon less more

55	55	{
56	56	inp: 'text/html%+frag',
57	57	out: 'mmm/dom',
58		cost: 1
	58	cost: 0.1
59	59	transform: if MODE == 'SERVER'
60	60	(html, fileder) =>
61	61	html = html\gsub '<mmm%-link%s+(.-)>(.-)</mmm%-link>', (attrs, text) ->

-0

scss/_browser.scss less more

71	71	> .inspect-btn {
72	72	@include media-small() { display: none; }
73	73	}
	74
	75	.tight {
	76	margin-left: 0;
	77	}
74	78	}
75	79
76	80	.error-wrap {