Skip to content

Commit 5928926

Browse files
lijkbezorgerlijkbezorger
committed
Multiple selection for block migration generator using fancy tree with block type as nodes (#8 and #9)
1 parent a642477 commit 5928926

File tree

9 files changed

+333
-51
lines changed

9 files changed

+333
-51
lines changed

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"nullref/yii2-core": "*",
1717
"bower-asset/owl.carousel": "2.*",
1818
"trntv/yii2-aceeditor": "*",
19-
"unclead/yii2-multiple-input": ">=1.2.10"
19+
"unclead/yii2-multiple-input": ">=1.2.10",
20+
"wbraganca/yii2-fancytree-widget": "1.0.1"
2021
},
2122
"autoload": {
2223
"psr-4": {

‎src/assets/TreeAsset.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
/**
3+
* @link http://www.yiiframework.com/
4+
* @copyright Copyright (c) 2008 Yii Software LLC
5+
* @license http://www.yiiframework.com/license/
6+
*/
7+
8+
namespace nullref\cms\assets;
9+
10+
use yii\web\AssetBundle;
11+
12+
class TreeAsset extends AssetBundle
13+
{
14+
public $sourcePath = '@nullref/cms/assets';
15+
public $js = [
16+
'js/main.js',
17+
'js/fancytree.js',
18+
];
19+
public $css = [
20+
'css/fancytree.css',
21+
];
22+
public $depends = [
23+
'yii\web\YiiAsset',
24+
'yii\bootstrap\BootstrapAsset',
25+
];
26+
}

‎src/assets/css/fancytree.css‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
span.fancytree-node.fancytree-active.fancytree-selected span.fancytree-title {
2+
color: #008cba;
3+
}
4+
5+
.ui-fancytree.fancytree-container {
6+
font-size: 15px;
7+
}
8+
9+
.ui-fancytree .fa {
10+
color: #222222;
11+
}
12+
13+
.fancytree-container {
14+
overflow-y: scroll;
15+
max-height: 200px;
16+
}
17+
18+
.fancytree-container.fancytree-treefocus span.fancytree-node.fancytree-selected span.fancytree-title,
19+
.fancytree-container.fancytree-treefocus span.fancytree-title:hover {
20+
background: transparent;
21+
border-color: transparent;
22+
}
23+
24+
span.fancytree-node.fancytree-selected span.fancytree-title {
25+
background-color: transparent;
26+
border-color: transparent;
27+
}
28+
span.fancytree-node.fancytree-partsel span.fancytree-checkbox {
29+
background-position: 0 -32px;
30+
}
31+
32+
.fancytree-container.fancytree-treefocus span.fancytree-title:focus {
33+
outline: none;
34+
}
35+
36+
ul.fancytree-container {
37+
border: 1px solid #626262;
38+
border-radius: 4px;
39+
margin-bottom: 5px;
40+
}
41+
42+
span.fancytree-title {
43+
border-radius: 0;
44+
color: #535353;
45+
}
46+
47+
.fancytree-container .fancytree-checkbox,
48+
.fancytree-container .fancytree-expander,
49+
.fancytree-container .fancytree-icon {
50+
margin-top: 5px;
51+
cursor: pointer;
52+
}
53+
54+
.fancytree-container.fancytree-treefocus span.fancytree-node.fancytree-active .fa,
55+
span.fancytree-active.fancytree-selected .fancytree-title,
56+
.fancytree-container.fancytree-treefocus span.fancytree-node.fancytree-active.fancytree-selected span.fancytree-title,
57+
.fancytree-container.fancytree-treefocus span.fancytree-node.fancytree-active,
58+
.fancytree-container.fancytree-treefocus span.fancytree-node.fancytree-active span.fancytree-title {
59+
color: #fff;
60+
}
61+
62+
.fancytree-container.fancytree-treefocus span.fancytree-node.fancytree-active span.fancytree-title {
63+
background-color: #008cba;
64+
border-color: #008cba;
65+
}
66+
67+
.fancytree-container span.fancytree-checkbox.fa {
68+
margin-left: 5px;
69+
}
70+
71+
.fancytree-container span.fancytree-node {
72+
padding-left: 2px;
73+
}
74+
75+
span.fancytree-icon.fa.fa-folder-o {
76+
background-image: none;
77+
}
78+
79+
span.fancytree-expander.fa.fa-plus-square-o {
80+
background-image: none;
81+
}
82+
83+
span.fancytree-expander.fa.fa-minus-square-o {
84+
background-image: none;
85+
}
86+
87+
span.fancytree-icon.fa.fa-file-o {
88+
background-image: none;
89+
}
90+
91+
span.fancytree-checkbox.fa.fa-check-square-o {
92+
background-image: none;
93+
}
94+
95+
span.fancytree-checkbox.fa.fa-square-o {
96+
background-image: none;
97+
}
98+
99+
span.fancytree-node.fancytree-folder > span.fancytree-icon {
100+
background-position: 0 0;
101+
background-image: none;
102+
}
103+
104+
span.fancytree-node.fancytree-folder.fancytree-expanded > span.fancytree-icon {
105+
background-image: none;
106+
}
107+
108+
.fancytree-treefocus span.fancytree-selected span.fancytree-title, .fancytree-treefocus span.fancytree-active span.fancytree-title {
109+
color: black !important;
110+
}

‎src/assets/js/fancytree.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/**
2+
* @author Yaroslav Velychko
3+
*/
4+
jQuery(function () {
5+
var tree = jQuery("#fancyree_blocksTree");
6+
app.initTree = function () {
7+
tree.fancytree("getTree").generateFormElements("Generator[blocks][]");
8+
};
9+
app.selectTreeNode = app.initTree;
10+
});

‎src/assets/js/main.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* @author Yaroslav Velychko
3+
*/
4+
var app = {};

‎src/generators/migration/Generator.php‎

Lines changed: 99 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,59 @@
77
use Yii;
88
use yii\gii\CodeFile;
99
use yii\gii\Generator as BaseGenerator;
10-
10+
use yii\helpers\ArrayHelper;
1111

1212
class Generator extends BaseGenerator
1313
{
1414
use VariableExportTrait;
1515

1616
public $path = '@app/migrations';
1717

18-
public $block;
18+
public $blocks;
1919

20-
public static function getBlocks()
20+
public function generate()
2121
{
22-
return Block::find()->all();
23-
}
22+
$blockIds = self::getBlockIds($this->blocks);
2423

24+
/** @var Block[] $selectedBlocks */
25+
$selectedBlocks = Block::find()->where(['id' => $blockIds])->all();
26+
27+
$name = 'm' . gmdate('ymd_Hi') . '00_blocks_' . count($selectedBlocks);
2528

26-
public function generate()
27-
{
28-
/** @var Block $selectedBlock */
29-
$selectedBlock = Block::find()->where(['id' => $this->block])->one();
3029
$time = new \DateTime();
3130
$time = $time->getTimestamp();
3231

33-
$resultConfig = 'serialize(' . $this->varExport(unserialize($selectedBlock->config)) . ')';
34-
35-
$offset = "\n\t\t\t";
36-
$commands = "[{$offset}'id' => '$selectedBlock->id'," .
37-
"{$offset}'class_name' => '$selectedBlock->class_name'," .
38-
"{$offset}'name' => '$selectedBlock->name'," .
39-
"{$offset}'visibility' => '$selectedBlock->visibility'," .
40-
"{$offset}'config' => $resultConfig," .
41-
"{$offset}'created_at' => $time," .
42-
"{$offset}'updated_at' => $time,{$offset}]";
43-
32+
$blocksToMigrate = [];
33+
34+
foreach ($selectedBlocks as $key => $selectedBlock) {
35+
$resultConfig = 'serialize(' . $this->varExport(unserialize($selectedBlock->config)) . ')';
36+
$time += $key;
37+
$offset = "\n\t\t\t";
38+
$commands = "[{$offset}'id' => '$selectedBlock->id'," .
39+
"{$offset}'class_name' => '$selectedBlock->class_name'," .
40+
"{$offset}'name' => '$selectedBlock->name'," .
41+
"{$offset}'visibility' => '$selectedBlock->visibility'," .
42+
"{$offset}'config' => $resultConfig," .
43+
"{$offset}'created_at' => $time," .
44+
"{$offset}'updated_at' => $time,{$offset}]";
45+
46+
$blocksToMigrate[$key] = [
47+
'blockId' => $selectedBlock->id,
48+
'commands' => $commands,
49+
];
50+
}
4451
$files = [];
45-
$name = 'm' . gmdate('ymd_Hi') . '00_block_' . str_replace('-', '_', $selectedBlock->id);
52+
4653
$code = $this->render('migration.php', [
4754
'name' => $name,
48-
'blockId' => $selectedBlock->id,
49-
'commands' => $commands,
55+
'blocksToMigrate' => $blocksToMigrate,
5056
]);
57+
5158
$files[] = new CodeFile(
5259
Yii::getAlias($this->path) . '/' . $name . '.php',
5360
$code
5461
);
62+
5563
return $files;
5664
}
5765

@@ -61,7 +69,7 @@ public function generate()
6169
public function rules()
6270
{
6371
return [
64-
[['block', 'path'], 'required'],
72+
[['blocks', 'path'], 'required'],
6573
];
6674
}
6775

@@ -92,4 +100,71 @@ public function hints()
92100
]);
93101
}
94102

103+
public static function getBlocks()
104+
{
105+
return Block::find()->all();
106+
}
107+
108+
public static function getBlockIds($blocks)
109+
{
110+
$blockIds = [];
111+
$blockTypes = [];
112+
113+
foreach ($blocks as $block) {
114+
$typePosition = strpos($block, '-type');
115+
if ($typePosition) {
116+
array_push($blockTypes, substr($block, 0, $typePosition));
117+
} else {
118+
array_push($blockIds, $block);
119+
}
120+
}
121+
$otherIds = Block::find()->select(['id'])->where(['class_name' => $blockTypes])->column();
122+
123+
return ArrayHelper::merge($blockIds, $otherIds);
124+
}
125+
126+
public static function getNestedList($blockIds)
127+
{
128+
if (!empty($blockIds)) {
129+
$blockIds = self::getBlockIds($blockIds);
130+
}
131+
132+
$blocks = Block::find()->orderBy(['id' => SORT_ASC])->orderBy(['class_name' => SORT_ASC])->asArray()->all();
133+
134+
$key = -1;
135+
$names = [];
136+
$result = [];
137+
foreach ($blocks as $block) {
138+
$name = $block['class_name'];
139+
if (!in_array($name, $names)) {
140+
$groupName = $name;
141+
$key++;
142+
array_push($names, $name);
143+
144+
$result[$key] = [
145+
'title' => $groupName,
146+
'key' => $groupName . '-type',
147+
'selected' => false,
148+
'folder' => true,
149+
'children' => [],
150+
'expanded' => true,
151+
];
152+
}
153+
154+
$selected = false;
155+
if (!empty($blockIds)) {
156+
$selected = (in_array($block['id'], $blockIds)) ? true : false;
157+
}
158+
159+
$block = [
160+
'title' => $block['id'],
161+
'key' => $block['id'],
162+
'selected' => $selected
163+
];
164+
$result[$key]['children'][] = $block;
165+
166+
}
167+
return $result;
168+
}
169+
95170
}

0 commit comments

Comments
 (0)