Implemented block hierarchy feature

neo/elementtypes/Neo_BlockElementType.php

@@ -58,6 +58,7 @@ public function defineCriteriaAttributes()
 			'fieldId'     => AttributeType::Number,
 			'order'       => array(AttributeType::String, 'default' => 'neoblocks.sortOrder'),
 			'collapsed'   => array(AttributeType::String, 'default' => 'neoblocks.collapsed'),
+			'level'       => array(AttributeType::String, 'default' => 'neoblocks.level'),
 			'ownerId'     => AttributeType::Number,
 			'ownerLocale' => AttributeType::Locale,
 			'type'        => AttributeType::Mixed,
@@ -75,7 +76,7 @@ public function defineCriteriaAttributes()
 	public function modifyElementsQuery(DbCommand $query, ElementCriteriaModel $criteria)
 	{
 		$query
-			->addSelect('neoblocks.fieldId, neoblocks.ownerId, neoblocks.ownerLocale, neoblocks.typeId, neoblocks.sortOrder, neoblocks.collapsed')
+			->addSelect('neoblocks.fieldId, neoblocks.ownerId, neoblocks.ownerLocale, neoblocks.typeId, neoblocks.sortOrder, neoblocks.collapsed, neoblocks.level')
 			->join('neoblocks neoblocks', 'neoblocks.id = elements.id');
 
 		if ($criteria->fieldId)

neo/fieldtypes/NeoFieldType.php

@@ -84,6 +84,7 @@ public function getSettingsHtml()
 				'name' => $blockType->name,
 				'handle' => $blockType->handle,
 				'maxBlocks' => $blockType->maxBlocks,
+				'childBlocks' => $blockType->childBlocks,
 				'errors' => $blockType->getErrors(),
 				'fieldLayout' => $jsFieldLayout,
 			);
@@ -145,12 +146,13 @@ public function prepSettings($settings)
 			foreach($settings['blockTypes'] as $blockTypeId => $blockTypeSettings)
 			{
 				$blockType = new Neo_BlockTypeModel();
-				$blockType->id        = $blockTypeId;
-				$blockType->fieldId   = $this->model->id;
-				$blockType->name      = $blockTypeSettings['name'];
-				$blockType->handle    = $blockTypeSettings['handle'];
-				$blockType->maxBlocks = $blockTypeSettings['maxBlocks'];
-				$blockType->sortOrder = $blockTypeSettings['sortOrder'];
+				$blockType->id          = $blockTypeId;
+				$blockType->fieldId     = $this->model->id;
+				$blockType->name        = $blockTypeSettings['name'];
+				$blockType->handle      = $blockTypeSettings['handle'];
+				$blockType->maxBlocks   = $blockTypeSettings['maxBlocks'];
+				$blockType->sortOrder   = $blockTypeSettings['sortOrder'];
+				$blockType->childBlocks = $blockTypeSettings['childBlocks'];
 
 				if(!empty($blockTypeSettings['fieldLayout']))
 				{
@@ -344,12 +346,13 @@ public function getInputHtml($name, $value)
 		foreach($settings->getBlockTypes() as $blockType)
 		{
 			$blockTypeInfo[] = array(
-				'id'        => $blockType->id,
-				'sortOrder' => $blockType->sortOrder,
-				'handle'    => $blockType->handle,
-				'name'      => Craft::t($blockType->name),
-				'maxBlocks' => $blockType->maxBlocks,
-				'tabs'      => $this->_getBlockTypeHtml($blockType, null, $name),
+				'id'          => $blockType->id,
+				'sortOrder'   => $blockType->sortOrder,
+				'handle'      => $blockType->handle,
+				'name'        => Craft::t($blockType->name),
+				'maxBlocks'   => $blockType->maxBlocks,
+				'childBlocks' => $blockType->childBlocks,
+				'tabs'        => $this->_getBlockTypeHtml($blockType, null, $name),
 			);
 		}
 
@@ -371,6 +374,7 @@ public function getInputHtml($name, $value)
 				'sortOrder' => $block->sortOrder,
 				'collapsed' => (bool) $block->collapsed,
 				'enabled'   => (bool) $block->enabled,
+				'level'     => $block->level,
 				'tabs'      => $this->_getBlockHtml($block, $name),
 			);
 		}
@@ -489,6 +493,7 @@ public function prepValueFromPost($data)
 			$block->setOwner($this->element);
 			$block->enabled = (isset($blockData['enabled']) ? (bool) $blockData['enabled'] : true);
 			$block->collapsed = (isset($blockData['collapsed']) ? (bool) $blockData['collapsed'] : false);
+			$block->level = (isset($blockData['level']) ? intval($blockData['level']) : 0);
 
 			// Set the content post location on the block if we can
 			$ownerContentPostLocation = $this->element->getContentPostLocation();
@@ -551,6 +556,8 @@ public function validate($blocks)
 			}
 		}
 
+		// TODO validate individual blocktype max blocks
+
 		if ($errors)
 		{
 			return $errors;
@@ -689,7 +696,7 @@ private function _getNamespaceDepth()
 	{
 		$namespace = craft()->templates->getNamespace();
 
-		return substr_count($namespace, '[') + 1;
+		return preg_match_all('/\\bfields\\b/', $namespace);
 	}
 
 	private function _getBlockTypeHtml(Neo_BlockTypeModel $blockType, Neo_BlockModel $block = null, $namespace = null)

neo/models/Neo_BlockTypeModel.php

@@ -72,6 +72,7 @@ protected function defineAttributes()
 			'name'          => AttributeType::String,
 			'handle'        => AttributeType::String,
 			'maxBlocks'     => AttributeType::Number,
+			'childBlocks'   => AttributeType::Mixed,
 			'sortOrder'     => AttributeType::Number,
 		);
 	}

neo/records/Neo_BlockRecord.php

@@ -55,6 +55,7 @@ public function defineIndexes()
 			array('columns' => array('typeId')),
 			array('columns' => array('sortOrder')),
 			array('columns' => array('collapsed')),
+			array('columns' => array('level')),
 		);
 	}
 
@@ -71,6 +72,7 @@ protected function defineAttributes()
 		return array(
 			'sortOrder'   => AttributeType::SortOrder,
 			'collapsed'   => AttributeType::Bool,
+			'level'       => AttributeType::Number,
 			'ownerLocale' => AttributeType::Locale,
 		);
 	}

neo/records/Neo_BlockTypeRecord.php

@@ -96,10 +96,11 @@ public function rules()
 	protected function defineAttributes()
 	{
 		return array(
-			'name'       => array(AttributeType::Name, 'required' => true),
-			'handle'     => array(AttributeType::Handle, 'required' => true),
-			'maxBlocks'  => array(AttributeType::Number, 'default' => 0),
-			'sortOrder'  => AttributeType::SortOrder,
+			'name'        => array(AttributeType::Name, 'required' => true),
+			'handle'      => array(AttributeType::Handle, 'required' => true),
+			'maxBlocks'   => array(AttributeType::Number, 'default' => 0),
+			'childBlocks' => AttributeType::Mixed,
+			'sortOrder'   => AttributeType::SortOrder,
 		);
 	}
 }

neo/services/NeoService.php

@@ -248,11 +248,12 @@ public function saveBlockType(Neo_BlockTypeModel $blockType, $validate = true)
 				}
 
 				// Set the basic info on the new block type record
-				$blockTypeRecord->fieldId   = $blockType->fieldId;
-				$blockTypeRecord->name      = $blockType->name;
-				$blockTypeRecord->handle    = $blockType->handle;
-				$blockTypeRecord->sortOrder = $blockType->sortOrder;
-				$blockTypeRecord->maxBlocks = $blockType->maxBlocks;
+				$blockTypeRecord->fieldId     = $blockType->fieldId;
+				$blockTypeRecord->name        = $blockType->name;
+				$blockTypeRecord->handle      = $blockType->handle;
+				$blockTypeRecord->sortOrder   = $blockType->sortOrder;
+				$blockTypeRecord->maxBlocks   = $blockType->maxBlocks;
+				$blockTypeRecord->childBlocks = $blockType->childBlocks;
 
 				// Save it, minus the field layout for now
 				$blockTypeRecord->save(false);
@@ -667,6 +668,7 @@ public function saveBlock(Neo_BlockModel $block, $validate = true)
 			$blockRecord->typeId      = $block->typeId;
 			$blockRecord->sortOrder   = $block->sortOrder;
 			$blockRecord->collapsed   = $block->collapsed;
+			$blockRecord->level       = $block->level;
 
 			$transaction = craft()->db->getCurrentTransaction() === null ? craft()->db->beginTransaction() : null;
 			try
@@ -882,7 +884,7 @@ public function requirePlugin($plugin)
 	private function _createBlockTypeQuery()
 	{
 		return craft()->db->createCommand()
-			->select('id, fieldId, fieldLayoutId, name, handle, maxBlocks, sortOrder')
+			->select('id, fieldId, fieldLayoutId, name, handle, maxBlocks, childBlocks, sortOrder')
 			->from('neoblocktypes')
 			->order('sortOrder');
 	}

src/configurator/BlockTypeSettings.js

@@ -8,6 +8,7 @@ import NS from '../namespace'
 import Settings from './Settings'
 
 import renderTemplate from './templates/blocktype_settings.twig'
+import renderCheckbox from './templates/blocktype_settings_checkbox.twig'
 import '../twig-extensions'
 
 const _defaults = {
@@ -18,12 +19,14 @@ const _defaults = {
 	handle: '',
 	maxBlocks: 0,
 	childBlocks: null,
+	childBlockTypes: [],
 	errors: {}
 }
 
 export default Settings.extend({
 
 	_templateNs: [],
+	_childBlockTypes: [],
 
 	$sortOrderInput: new $,
 	$nameInput: new $,
@@ -35,6 +38,7 @@ export default Settings.extend({
 		settings = Object.assign({}, _defaults, settings)
 
 		this._templateNs = NS.parse(settings.namespace)
+		this._childBlockTypes = []
 		this._id = settings.id
 		this._errors = settings.errors
 
@@ -61,12 +65,24 @@ export default Settings.extend({
 		this.$nameInput = $neo.filter('[data-neo-bts="input.name"]')
 		this.$handleInput = $neo.filter('[data-neo-bts="input.handle"]')
 		this.$maxBlocksInput = $neo.filter('[data-neo-bts="input.maxBlocks"]')
+		this.$childBlocksInput = $neo.filter('[data-neo-bts="input.childBlocks"]')
+		this.$childBlocksContainer = $neo.filter('[data-neo-bts="container.childBlocks"]')
 		this.$deleteButton = $neo.filter('[data-neo-bts="button.delete"]')
 
+		this.$childBlocksInput.checkboxselect()
+
+		this._childBlocksSelect = this.$childBlocksInput.data('checkboxSelect')
 		this._handleGenerator = new Craft.HandleGenerator(this.$nameInput, this.$handleInput)
 
+		for(let blockType of settings.childBlockTypes)
+		{
+			this.addChildBlockType(blockType)
+		}
+
+		this.setChildBlocks(settings.childBlocks)
+
 		this.addListener(this.$nameInput, 'keyup change', () => this.setName(this.$nameInput.val()))
-		this.addListener(this.$handleInput, 'keyup change', () => this.setHandle(this.$handleInput.val()))
+		this.addListener(this.$handleInput, 'keyup change textchange', () => this.setHandle(this.$handleInput.val()))
 		this.addListener(this.$maxBlocksInput, 'keyup change', () => this.setMaxBlocks(this.$maxBlocksInput.val()))
 		this.addListener(this.$deleteButton, 'click', () => this.destroy())
 	},
@@ -141,6 +157,139 @@ export default Settings.extend({
 			oldValue: oldMaxBlocks,
 			newValue: this._maxBlocks
 		})
+	},
+
+	getChildBlocks()
+	{
+		const select = this._childBlocksSelect
+		const childBlocks = []
+
+		if(select.$all.prop('checked'))
+		{
+			return true
+		}
+
+		select.$options.each(function(index)
+		{
+			const $option = $(this)
+			childBlocks.push($option.prop('checked'))
+		})
+
+		return childBlocks
+	},
+
+	setChildBlocks(childBlocks)
+	{
+		const select = this._childBlocksSelect
+
+		if(childBlocks === true || childBlocks === '*')
+		{
+			select.$all.prop('checked', true)
+			select.onAllChange()
+		}
+		else if(Array.isArray(childBlocks))
+		{
+			select.$all.prop('checked', false)
+
+			for(let handle of childBlocks)
+			{
+				select.$options.filter(`[value="${handle}"]`).prop('checked', true)
+			}
+		}
+		else
+		{
+			select.$all.prop('checked', false)
+			select.$options.prop('checked', false)
+		}
+	},
+
+	addChildBlockType(blockType, index = -1)
+	{
+		if(!this._childBlockTypes.includes(blockType))
+		{
+			NS.enter(this._templateNs)
+
+			const settings = blockType.getSettings()
+			const $checkbox = $(renderCheckbox({
+				id: 'childBlock-' + settings.getId(),
+				name: 'childBlocks',
+				value: settings.getHandle(),
+				label: settings.getName()
+			}))
+
+			NS.leave()
+
+			if(index < 0 || index >= this._childBlockTypes.length)
+			{
+				this._childBlockTypes.push(blockType)
+				this.$childBlocksContainer.append($checkbox)
+			}
+			else
+			{
+				this._childBlockTypes.splice(index, 0, blockType)
+				$checkbox.insertAt(index, this.$childBlocksContainer)
+			}
+
+			const select = this._childBlocksSelect
+			const allChecked = select.$all.prop('checked')
+			select.$options = select.$options.add($checkbox.find('input'))
+			if(allChecked) select.onAllChange()
+
+			const eventNs = '.childBlock' + this.getId()
+			settings.on('change' + eventNs, e => this['@onChildBlockTypeChange'](e, blockType, $checkbox))
+			settings.on('destroy' + eventNs, e => this.removeChildBlockType(blockType))
+		}
+	},
+
+	removeChildBlockType(blockType)
+	{
+		const index = this._childBlockTypes.indexOf(blockType)
+		if(index >= 0)
+		{
+			this._childBlockTypes.splice(index, 1)
+
+			const settings = blockType.getSettings()
+			const $checkbox = this.$childBlocksContainer.children().eq(index)
+
+			$checkbox.remove()
+
+			const select = this._childBlocksSelect
+			select.$options = select.$options.remove($checkbox.find('input'))
+
+			const eventNs = '.childBlock' + this.getId()
+			settings.off(eventNs)
+		}
+	},
+
+	'@onChildBlockTypeChange'(e, blockType, $checkbox)
+	{
+		const settings = blockType.getSettings()
+
+		const $neo = $checkbox.find('[data-neo-btsc]')
+		const $input = $neo.filter('[data-neo-btsc="input"]')
+		const $labelText = $neo.filter('[data-neo-btsc="text.label"]')
+
+		switch(e.property)
+		{
+			case 'name':
+				$labelText.text(e.newValue)
+				break
+
+			case 'handle':
+				$input.val(e.newValue)
+				break;
+
+			case 'sortOrder':
+				const oldIndex = this._childBlockTypes.indexOf(blockType)
+				const newIndex = settings.getSortOrder() - 1
+
+				this._childBlockTypes.splice(oldIndex, 1)
+				this._childBlockTypes.splice(newIndex, 0, blockType)
+
+				$checkbox.insertAt(newIndex, this.$childBlocksContainer)
+
+				break
+		}
 	}
 },
 {