Skip to content

Commit

Permalink
Show icons for components without flavors
Browse files Browse the repository at this point in the history
  • Loading branch information
@sh-csg
sh-csg committed Dec 9, 2024
1 parent eac0a18 commit 7ae47c8
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 29 deletions.
3 changes: 3 additions & 0 deletions classes/form/management_import_form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ public function process_dynamic_submission(): array {
$fp = get_file_packer('application/zip');
$fp->extract_to_storage($file, SYSCONTEXTID, 'tiny_c4l', 'import', $draftitemid, '/');
$xmlfile = $fs->get_file(SYSCONTEXTID, 'tiny_c4l', 'import', $draftitemid, '/', 'tiny_c4l_export.xml');
if (!$xmlfile) {
throw new \moodle_exception('errorbackupfile', 'tiny_c4l');
}
$xmlcontent = $xmlfile->get_content();
} else {
$xmlcontent = $file->get_content();
Expand Down
62 changes: 34 additions & 28 deletions classes/manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ public function importxml(string $xmlcontent): bool {
return false;
}

// Create mapping array for tiny_c4l_compcat table.
$categorymap = [];

// Create mapping array for tiny_c4l_component table.
$componentmap = [];

Expand All @@ -222,23 +225,23 @@ public function importxml(string $xmlcontent): bool {
// First process all component categories. We need the category ids for the components.
foreach ($data['tiny_c4l_compcat'] as $compcat) {
// Save new id for mapping.
$componentmap[$compcat->id] = self::import_category($compcat);
$categorymap[$compcat->id] = self::import_category($compcat);
}

foreach ($data['tiny_c4l_component'] as $component) {
self::import_component($component, $componentmap);
$componentmap[$component->id] = self::import_component($component, $categorymap);
}

foreach ($data['tiny_c4l_flavor'] as $flavor) {
self::import_flavor($flavor, $componentmap);
self::import_flavor($flavor, $categorymap);
}

foreach ($data['tiny_c4l_variant'] as $variant) {
self::import_variant($variant, $componentmap);
self::import_variant($variant, $categorymap);
}

foreach ($data['tiny_c4l_comp_flavor'] as $componentflavor) {
self::import_component_flavor($componentflavor, $componentmap);
self::import_component_flavor($componentflavor, $categorymap);
}

foreach ($data['tiny_c4l_comp_variant'] as $componentvariant) {
Expand Down Expand Up @@ -277,20 +280,20 @@ public static function import_category(array|object $record): int {
* Import a component.
*
* @param array|object $record
* @param array $componentmap
* @param array $categorymap
* @return int id of the imported component
*/
public static function import_component(array|object $record, array $componentmap): int {
public static function import_component(array|object $record, array $categorymap): int {
global $DB;
$record = (array) $record;
if (isset($componentmap[$record['compcat']])) {
$record['compcat'] = $componentmap[$record['compcat']];
if (isset($categorymap[$record['compcat']])) {
$record['compcat'] = $categorymap[$record['compcat']];
}

$record['css'] = self::update_pluginfile_tags_bulk($componentmap, $record['css'] ?? '');
$record['code'] = self::update_pluginfile_tags_bulk($componentmap, $record['code'] ?? '');
$record['js'] = self::update_pluginfile_tags_bulk($componentmap, $record['js'] ?? '');
$record['iconurl'] = self::update_pluginfile_tags_bulk($componentmap, $record['iconurl'] ?? '');
$record['css'] = self::update_pluginfile_tags_bulk($categorymap, $record['css'] ?? '');
$record['code'] = self::update_pluginfile_tags_bulk($categorymap, $record['code'] ?? '');
$record['js'] = self::update_pluginfile_tags_bulk($categorymap, $record['js'] ?? '');
$record['iconurl'] = self::update_pluginfile_tags_bulk($categorymap, $record['iconurl'] ?? '');

$current = $DB->get_record('tiny_c4l_component', ['name' => $record['name']]);
if ($current) {
Expand Down Expand Up @@ -337,16 +340,16 @@ public static function import_component(array|object $record, array $componentma
* Import a flavor.
*
* @param array|object $record
* @param array $componentmap
* @param array $categorymap
* @return int id of the imported flavor
*/
public static function import_flavor(array|object $record, array $componentmap): int {
public static function import_flavor(array|object $record, array $categorymap): int {
global $DB;
$record = (array) $record;
$current = $DB->get_record('tiny_c4l_flavor', ['name' => $record['name']]);

$record['css'] = self::update_pluginfile_tags_bulk($componentmap, $record['css'], 'import');
$record['content'] = self::update_pluginfile_tags_bulk($componentmap, $record['content'], 'import');
$record['css'] = self::update_pluginfile_tags_bulk($categorymap, $record['css'], 'import');
$record['content'] = self::update_pluginfile_tags_bulk($categorymap, $record['content'], 'import');

if ($current) {
$record['id'] = $current->id;
Expand All @@ -361,17 +364,17 @@ public static function import_flavor(array|object $record, array $componentmap):
* Import a variant.
*
* @param array|object $record
* @param array $componentmap
* @param array $categorymap
* @return int id of the imported variant
*/
public static function import_variant(array|object $record, array $componentmap): int {
public static function import_variant(array|object $record, array $categorymap): int {
global $DB;
$record = (array) $record;
$current = $DB->get_record('tiny_c4l_variant', ['name' => $record['name']]);

$record['css'] = self::update_pluginfile_tags_bulk($componentmap, $record['css'] ?? '');
$record['content'] = self::update_pluginfile_tags_bulk($componentmap, $record['content'] ?? '');
$record['iconurl'] = self::update_pluginfile_tags_bulk($componentmap, $record['iconurl'] ?? '');
$record['css'] = self::update_pluginfile_tags_bulk($categorymap, $record['css'] ?? '');
$record['content'] = self::update_pluginfile_tags_bulk($categorymap, $record['content'] ?? '');
$record['iconurl'] = self::update_pluginfile_tags_bulk($categorymap, $record['iconurl'] ?? '');

if ($current) {
$record['id'] = $current->id;
Expand All @@ -386,15 +389,15 @@ public static function import_variant(array|object $record, array $componentmap)
* Import a relation between component and flavor.
*
* @param array|object $record
* @param array $componentmap
* @param array $categorymap
* @return int id of the imported relation
*/
public static function import_component_flavor(array|object $record, array $componentmap): int {
public static function import_component_flavor(array|object $record, array $categorymap): int {
global $DB;
$record = (array) $record;
$current = $DB->get_record('tiny_c4l_comp_flavor', ['componentname' => $record['componentname'], 'flavorname' => $record['flavorname']]);

$record['iconurl'] = self::update_pluginfile_tags_bulk($componentmap, $record['iconurl'] ?? '');
$record['iconurl'] = self::update_pluginfile_tags_bulk($categorymap, $record['iconurl'] ?? '');

if ($current) {
$record['id'] = $current->id;
Expand All @@ -415,6 +418,9 @@ public static function import_component_flavor(array|object $record, array $comp
public static function import_component_variant(array|object $record, array $componentmap): int {
global $DB;
$record = (array) $record;
if (isset($componentmap[$record['component']])) {
$record['component'] = $componentmap[$record['component']];
}
$current = $DB->get_record('tiny_c4l_comp_variant', ['component' => $record['component'], 'variant' => $record['variant']]);
if (!$current) {
$record['id'] = $DB->insert_record('tiny_c4l_comp_variant', $record);
Expand All @@ -426,12 +432,12 @@ public static function import_component_variant(array|object $record, array $com
/**
* Update the pluginfile tags in the given subject.
*
* @param array $componentmap
* @param array $categorymap
* @param string $subject
* @return string
*/
public static function update_pluginfile_tags_bulk(array $componentmap, string $subject): string {
foreach ($componentmap as $oldid => $newid) {
public static function update_pluginfile_tags_bulk(array $categorymap, string $subject): string {
foreach ($categorymap as $oldid => $newid) {
$subject = self::update_pluginfile_tags($oldid, $newid, $subject, 'bulk');
}
$subject = self::remove_mark($subject, 'bulk');
Expand Down
6 changes: 5 additions & 1 deletion management.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@
}
}
$component[$key]->flavorsarr = $flavorsarr;
$component[$key]->flavorexamplesarr = $flavorexamplesarr;
if (empty($flavorexamplesarr)) {
$component[$key]->flavorexamplesarr = [utils::replace_pluginfile_urls($value->iconurl, true)];
} else {
$component[$key]->flavorexamplesarr = $flavorexamplesarr;
}
// Keep only the first two entries
if (count($component[$key]->flavorexamplesarr) > 2) {
$component[$key]->flavorexamplesarr = array_slice($component[$key]->flavorexamplesarr, 0, 2);
Expand Down

0 comments on commit 7ae47c8

Please sign in to comment.