You got an error!
diff --git a/Resources/views/Settings/enableProfile.html.twig b/Resources/views/Settings/enableProfile.html.twig
new file mode 100644
index 0000000..f32c59a
--- /dev/null
+++ b/Resources/views/Settings/enableProfile.html.twig
@@ -0,0 +1,70 @@
+
+
+
+ {% block settings_meta %}
+
+
+
+ {% endblock %}
+
{% block settings_title -%}{{ "Settings toggle"|trans }}{%- endblock %}
+ {% block settings_stylesheets %}
+
+
+
+
+ {% endblock %}
+
+
+{% block settings_body %}
+
+
+
{% block settings_header_title %}ONGR settings{% endblock %}
+ {% block settings_header_body %}
+
Good job! You just enabled {{ profile }} settings profile. See below the list of enabled settings.
+
Go to the website »
+ {% endblock %}
+
+
+ {% if profiles|length == 0 %}
+
Profile has no settings!
+ {% else %}
+ {% for index,profile in profiles %}
+
+
{{ profile.name }}
+
+ Value:
+ {% if profile.type == 'bool' %}
+ {% if profile.value %}TRUE{% else %}FALSE{% endif %}
+ {% elseif profile.type == 'yaml' %}
+
{{ profile.value|raw }}
+ {% else %}
+ {{ profile.value }}
+ {% endif %}
+
+
Description: {{ profile.description|default('') }}
+
+ {% if index % 2 %}
{% endif %}
+ {% endfor %}
+ {% endif %}
+
+
+
+{% endblock %}
+{% block settings_javascripts %}
+{% endblock %}
+
+
diff --git a/Resources/views/Settings/list.html.twig b/Resources/views/Settings/list.html.twig
index 9543ada..02a7c07 100644
--- a/Resources/views/Settings/list.html.twig
+++ b/Resources/views/Settings/list.html.twig
@@ -12,7 +12,7 @@
Value |
Description |
Profile |
-
Actions |
+
Actions |
diff --git a/Resources/views/base.html.twig b/Resources/views/base.html.twig
index adc944a..02c76e9 100644
--- a/Resources/views/base.html.twig
+++ b/Resources/views/base.html.twig
@@ -10,9 +10,9 @@
+
{% endblock %}
-
@@ -46,6 +46,8 @@
+
+
{% endblock %}
diff --git a/Service/SettingsManager.php b/Service/SettingsManager.php
index 2c86abe..a57da09 100644
--- a/Service/SettingsManager.php
+++ b/Service/SettingsManager.php
@@ -16,6 +16,7 @@
use ONGR\ElasticsearchBundle\Result\Aggregation\AggregationValue;
use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
use ONGR\ElasticsearchDSL\Aggregation\TopHitsAggregation;
+use ONGR\ElasticsearchDSL\Query\TermQuery;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use ONGR\ElasticsearchBundle\Service\Repository;
use ONGR\ElasticsearchBundle\Service\Manager;
@@ -68,6 +69,13 @@ class SettingsManager
*/
private $activeProfilesSettingName;
+ /**
+ * Active profiles list collected from es, cache and cookie.
+ *
+ * @var array
+ */
+ private $activeProfilesList = [];
+
/**
* @param Repository $repo
* @param EventDispatcherInterface $eventDispatcher
@@ -129,6 +137,30 @@ public function setActiveProfilesSettingName($activeProfilesSettingName)
$this->activeProfilesSettingName = $activeProfilesSettingName;
}
+ /**
+ * @return array
+ */
+ public function getActiveProfilesList()
+ {
+ return $this->activeProfilesList;
+ }
+
+ /**
+ * @param array $activeProfilesList
+ */
+ public function setActiveProfilesList(array $activeProfilesList)
+ {
+ $this->activeProfilesList = $activeProfilesList;
+ }
+
+ /**
+ * @param array $activeProfilesList
+ */
+ public function appendActiveProfilesList(array $activeProfilesList)
+ {
+ $this->activeProfilesList = array_merge($this->activeProfilesList, $activeProfilesList);
+ }
+
/**
* Creates setting.
*
@@ -254,7 +286,7 @@ public function has($name)
* @param string $name
* @param bool $default
*
- * @return mixed
+ * @return string|array|bool
*/
public function getValue($name, $default = null)
{
@@ -291,14 +323,11 @@ public function getCachedValue($name, $checkWithActiveProfiles = true)
}
if ($checkWithActiveProfiles) {
- $profilesFromEs = $this->getActiveProfiles();
- $profilesFromCookie = (array)$this->activeProfilesCookie->getValue();
-
- $profiles = array_merge($profilesFromEs, $profilesFromCookie);
- $settingProfiles = $setting['profiles'];
- if (count(array_intersect($profiles, $settingProfiles))) {
+ if (count(array_intersect($this->getActiveProfiles(), $setting['profiles']))) {
return $setting['value'];
}
+
+ return null;
}
return $setting['value'];
@@ -333,7 +362,7 @@ public function getAllProfiles()
}
$name = $agg->getValue('key');
$profiles[] = [
- 'active' => $activeProfiles ? in_array($agg->getValue('key'), $activeProfiles) : false,
+ 'active' => $activeProfiles ? in_array($agg->getValue('key'), (array)$activeProfiles) : false,
'name' => $name,
'settings' => implode(', ', $settings),
];
@@ -343,26 +372,22 @@ public function getAllProfiles()
}
/**
- * Get profile names, optionally can return only active ones.
+ * Returns profiles settings array
*
- * @param bool $onlyActive
+ * @param string $profile
*
* @return array
*/
- public function getAllProfilesNameList($onlyActive = false)
+ public function getProfileSettings($profile)
{
- $profiles = [];
- $allProfiles = $this->getAllProfiles();
-
- foreach ($allProfiles as $profile) {
- if ($onlyActive and !$profile['active']) {
- continue;
- }
+ $search = $this->repo->createSearch();
+ $termQuery = new TermQuery('profile', $profile);
+ $search->addQuery($termQuery);
+ $search->setSize(1000);
- $profiles[] = $profile['name'];
- }
+ $settings = $this->repo->findArray($search);
- return $profiles;
+ return $settings;
}
/**
@@ -373,12 +398,23 @@ public function getAllProfilesNameList($onlyActive = false)
public function getActiveProfiles()
{
if ($this->cache->contains($this->activeProfilesSettingName)) {
- return $this->cache->fetch($this->activeProfilesSettingName);
- }
+ $profiles = $this->cache->fetch($this->activeProfilesSettingName);
+ } else {
+ $profiles = [];
+ $allProfiles = $this->getAllProfiles();
- $profiles = $this->getAllProfilesNameList(true);
+ foreach ($allProfiles as $profile) {
+ if (!$profile['active']) {
+ continue;
+ }
+
+ $profiles[] = $profile['name'];
+ }
+
+ $this->cache->save($this->activeProfilesSettingName, $profiles);
+ }
- $this->cache->save($this->activeProfilesSettingName, $profiles);
+ $profiles = array_merge($profiles, $this->activeProfilesList);
return $profiles;
}
diff --git a/Tests/Unit/Service/SettingsManagerTest.php b/Tests/Unit/Service/SettingsManagerTest.php
index 37d4976..4915651 100644
--- a/Tests/Unit/Service/SettingsManagerTest.php
+++ b/Tests/Unit/Service/SettingsManagerTest.php
@@ -463,6 +463,7 @@ function ($arg) use ($activeProfilesSetting) {
$manager->setCache($this->cache);
$manager->setActiveProfilesSettingName($activeProfilesSetting);
$manager->setActiveProfilesCookie($this->cookie);
+ $manager->setActiveProfilesList(['default']);
$result = $manager->getCachedValue('acme');
$this->assertEquals('foo', $result);
@@ -541,8 +542,12 @@ public function testGetCachedValueWhenItsNotExist()
$this->assertNull($value);
}
- public function testGetAllProfilesNameList()
+ public function testGetAllActiveProfilesNameList()
{
+ $document = new Setting();
+ $document->setName('active_profiles');
+ $document->setValue(['kk']);
+ $this->repository->expects($this->any())->method('findOneBy')->willReturn($document);
$this->repository->expects($this->any())->method('execute')->willReturn($this->getDocumentIterator());
$manager = new SettingsManager(
$this->repository,
@@ -550,7 +555,7 @@ public function testGetAllProfilesNameList()
);
$manager->setCache($this->cache);
- $value = $manager->getAllProfilesNameList();
+ $value = $manager->getActiveProfiles();
$this->assertEquals(['kk'], $value);
}
}