Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,9 @@ protected function renderFilePreview(
): Template {
$template->setCurrentBlock('block_file_preview');
$template->setVariable('REMOVAL_GLYPH', $default_renderer->render(
$this->getUIFactory()->symbol()->glyph()->close()->withAction("#")
$this->getUIFactory()->button()->shy('', '#')
->withSymbol($this->getUIFactory()->symbol()->glyph()->close())
->withAriaLabel('close')
));

if (null !== $file_info) {
Expand Down
110 changes: 59 additions & 51 deletions components/ILIAS/UI/tests/Component/Input/Field/FileInputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,19 @@ protected function brutallyTrimHTML(string $html): string
return parent::brutallyTrimHTML($html);
}

private function getCloseButtonHtml(string $id): string
{
$html = $this->brutallyTrimHTML(
$this->getDefaultRenderer()->render(
$this->getUIFactory()->button()->shy('', '#')
->withSymbol($this->getUIFactory()->symbol()->glyph()->close())
->withAriaLabel('close')
)
);

return str_replace('id="id_1"', 'id="' . $id . '"', $html);
}

private function getUploadHandler(?FileInfoResult $file = null): Field\UploadHandler
{
return new class ($file) implements Field\UploadHandler {
Expand Down Expand Up @@ -146,21 +159,21 @@ public function testRender(): void
$label = "label";
$byline = "byline";
$file_input = $f->file($this->getUploadHandler(), $label, $byline)->withNameFrom($this->name_source);
$close_button = $this->getCloseButtonHtml('id_1');

$expected = $this->getFormWrappedHtml(
'file-field-input',
$label,
'
<<<HTML
<div class="ui-input-file">
<div class="ui-input-file-input-list">
<template>
<div class="ui-input-file-input">
<div class="ui-input-file-info"><span data-action="expand"></span><span
data-action="collapse"></span><span data-dz-name></span><span data-dz-size></span><span
data-action="remove"><a tabindex="0" class="glyph" href="#" aria-label="close"><span
class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></span><span
data-action="collapse"></span><span data-dz-name></span><span data-dz-size></span><span
data-action="remove">{$close_button}</span><span
class="ui-input-file-input-error-msg" data-dz-error-msg></span></div>
<div class="ui-input-file-metadata" style="display: none;"><input id="id_1" type="hidden"
<div class="ui-input-file-metadata" style="display: none;"><input id="id_2" type="hidden"
name="name_0[input_0][]" value="" /></div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -169,15 +182,15 @@ class="ui-input-file-input-error-msg" data-dz-error-msg></span></div>
</template>
</div>
<div class="ui-input-file-input-dropzone">
<button class="btn btn-link" data-action="#" id="id_2">select_file_from_computer</button>
<button class="btn btn-link" data-action="#" id="id_3">select_file_from_computer</button>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="help-block"> file_notice 0 B | ui_file_upload_max_nr 1</div>
</div>
',
HTML,
$byline,
null,
'id_3'
'id_4'
);
$this->assertEquals($expected, $this->render($file_input));
}
Expand Down Expand Up @@ -210,11 +223,13 @@ public function testRenderValue(): void
)->withValue([
$test_file_id,
])->withNameFrom($this->name_source);
$close_button = $this->getCloseButtonHtml('id_1');
$close_button_template = $this->getCloseButtonHtml('id_3');

$expected = $this->getFormWrappedHtml(
'file-field-input',
'',
'
<<<HTML
<div class="ui-input-file">
<div class="ui-input-file-input-list">
<div class="ui-input-file-input">
Expand All @@ -224,14 +239,12 @@ public function testRenderValue(): void
<span data-dz-name>test file name 1</span>
<span data-dz-size>1 KB</span>
<span data-action="remove">
<a tabindex="0" class="glyph" href="#" aria-label="close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</a>
{$close_button}
</span>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="ui-input-file-metadata" style="display: none;">
<input id="id_1" type="hidden" name="name_0[input_0][]" value="test_file_id_1"/>
<input id="id_2" type="hidden" name="name_0[input_0][]" value="test_file_id_1"/>
</div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -241,10 +254,9 @@ public function testRenderValue(): void
<div class="ui-input-file-input">
<div class="ui-input-file-info"><span data-action="expand"></span><span
data-action="collapse"></span><span data-dz-name></span><span data-dz-size></span><span
data-action="remove"><a tabindex="0" class="glyph" href="#" aria-label="close"><span
class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></span><span
data-action="remove">{$close_button_template}</span><span
class="ui-input-file-input-error-msg" data-dz-error-msg></span></div>
<div class="ui-input-file-metadata" style="display: none;"><input id="id_2" type="hidden"
<div class="ui-input-file-metadata" style="display: none;"><input id="id_4" type="hidden"
name="name_0[input_0][]" value="" /></div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -253,15 +265,15 @@ class="ui-input-file-input-error-msg" data-dz-error-msg></span></div>
</template>
</div>
<div class="ui-input-file-input-dropzone">
<button class="btn btn-link" data-action="#" id="id_3">select_file_from_computer</button>
<button class="btn btn-link" data-action="#" id="id_5">select_file_from_computer</button>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="help-block"> file_notice 0 B | ui_file_upload_max_nr 1</div>
</div>
',
HTML,
null,
null,
'id_4'
'id_6'
);
$this->assertEquals($expected, $this->render($file_input));
}
Expand All @@ -283,11 +295,13 @@ public function testRenderWithMetadata(): void
""
]
])->withNameFrom($this->name_source);
$close_button = $this->getCloseButtonHtml('id_1');
$close_button_template = $this->getCloseButtonHtml('id_4');

$expected = $this->getFormWrappedHtml(
'file-field-input',
$label,
'
<<<HTML
<div class="ui-input-file">
<div class="ui-input-file-input-list">
<div class="ui-input-file-input">
Expand All @@ -305,20 +319,18 @@ public function testRenderWithMetadata(): void
<span data-dz-name></span>
<span data-dz-size></span>
<span data-action="remove">
<a tabindex="0" class="glyph" href="#" aria-label="close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</a>
{$close_button}
</span>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="ui-input-file-metadata" style="display: none;">
<fieldset class="c-input" data-il-ui-component="text-field-input" data-il-ui-input-name="name_0[input_1][]">
<label for="id_1">text_input</label>
<label for="id_2">text_input</label>
<div class="c-input__field">
<input id="id_1" type="text" name="name_0[input_1][]" class="c-field-text"/>
<input id="id_2" type="text" name="name_0[input_1][]" class="c-field-text"/>
</div>
</fieldset>
<input id="id_2" type="hidden" name="name_0[input_2][]" value="file_id"/>
<input id="id_3" type="hidden" name="name_0[input_2][]" value="file_id"/>
</div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -333,16 +345,14 @@ class="glyphicon glyphicon-triangle-right"
tabindex="0" class="glyph" href="#" aria-label="collapse_content"><span
class="glyphicon glyphicon-triangle-bottom"
aria-hidden="true"></span></a></span><span data-dz-name></span><span
data-dz-size></span><span data-action="remove"><a tabindex="0" class="glyph" href="#"
aria-label="close"><span class="glyphicon glyphicon-remove"
aria-hidden="true"></span></a></span><span class="ui-input-file-input-error-msg"
data-dz-size></span><span data-action="remove">{$close_button_template}</span><span class="ui-input-file-input-error-msg"
data-dz-error-msg></span></div>
<div class="ui-input-file-metadata" style="display: none;">
<fieldset class="c-input" data-il-ui-component="text-field-input"
data-il-ui-input-name="name_0[input_1][]"><label for="id_3">text_input</label>
<div class="c-input__field"><input id="id_3" type="text" name="name_0[input_1][]"
data-il-ui-input-name="name_0[input_1][]"><label for="id_5">text_input</label>
<div class="c-input__field"><input id="id_5" type="text" name="name_0[input_1][]"
class="c-field-text" /></div>
</fieldset><input id="id_4" type="hidden" name="name_0[input_2][]" value="" />
</fieldset><input id="id_6" type="hidden" name="name_0[input_2][]" value="" />
</div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -351,15 +361,15 @@ class="c-field-text" /></div>
</template>
</div>
<div class="ui-input-file-input-dropzone">
<button class="btn btn-link" data-action="#" id="id_5">select_file_from_computer</button>
<button class="btn btn-link" data-action="#" id="id_7">select_file_from_computer</button>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="help-block"> file_notice 0 B | ui_file_upload_max_nr 1</div>
</div>
',
HTML,
null,
null,
'id_6',
'id_8',
);
$this->assertEquals($expected, $this->render($file_input));
}
Expand Down Expand Up @@ -389,12 +399,14 @@ public function testRenderWithMetadataValue(): void
"test",
]
])->withNameFrom($this->name_source);
$close_button = $this->getCloseButtonHtml('id_1');
$close_button_template = $this->getCloseButtonHtml('id_4');


$expected = $this->getFormWrappedHtml(
'file-field-input',
$label,
'
<<<HTML
<div class="ui-input-file">
<div class="ui-input-file-input-list">
<div class="ui-input-file-input">
Expand All @@ -412,20 +424,18 @@ public function testRenderWithMetadataValue(): void
<span data-dz-name>test file name 1</span>
<span data-dz-size>1 MB</span>
<span data-action="remove">
<a tabindex="0" class="glyph" href="#" aria-label="close">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
</a>
{$close_button}
</span>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="ui-input-file-metadata" style="display: none;">
<fieldset class="c-input" data-il-ui-component="text-field-input" data-il-ui-input-name="name_0[input_1][]">
<label for="id_1">text_input</label>
<label for="id_2">text_input</label>
<div class="c-input__field">
<input id="id_1" type="text" value="test" name="name_0[input_1][]" class="c-field-text"/>
<input id="id_2" type="text" value="test" name="name_0[input_1][]" class="c-field-text"/>
</div>
</fieldset>
<input id="id_2" type="hidden" name="name_0[input_2][]" value="test_file_id_1"/>
<input id="id_3" type="hidden" name="name_0[input_2][]" value="test_file_id_1"/>
</div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -446,16 +456,14 @@ public function testRenderWithMetadataValue(): void
</span>
<span data-dz-name></span>
<span data-dz-size></span>
<span
data-action="remove"><a tabindex="0" class="glyph" href="#" aria-label="close"><span
class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></span><span
<span data-action="remove">{$close_button_template}</span><span
class="ui-input-file-input-error-msg" data-dz-error-msg></span></div>
<div class="ui-input-file-metadata" style="display: none;">
<fieldset class="c-input" data-il-ui-component="text-field-input"
data-il-ui-input-name="name_0[input_1][]"><label for="id_3">text_input</label>
<div class="c-input__field"><input id="id_3" type="text" name="name_0[input_1][]"
data-il-ui-input-name="name_0[input_1][]"><label for="id_5">text_input</label>
<div class="c-input__field"><input id="id_5" type="text" name="name_0[input_1][]"
class="c-field-text" /></div>
</fieldset><input id="id_4" type="hidden" name="name_0[input_2][]" value="" />
</fieldset><input id="id_6" type="hidden" name="name_0[input_2][]" value="" />
</div>
<div class="ui-input-file-input-progress-container">
<div class="ui-input-file-input-progress-indicator"></div>
Expand All @@ -464,15 +472,15 @@ class="c-field-text" /></div>
</template>
</div>
<div class="ui-input-file-input-dropzone">
<button class="btn btn-link" data-action="#" id="id_5">select_file_from_computer</button>
<button class="btn btn-link" data-action="#" id="id_7">select_file_from_computer</button>
<span class="ui-input-file-input-error-msg" data-dz-error-msg></span>
</div>
<div class="help-block"> file_notice 0 B | ui_file_upload_max_nr 1</div>
</div>
',
HTML,
null,
null,
'id_6'
'id_8'
);
$this->assertEquals($expected, $this->render($file_input));
}
Expand Down
Loading