fix(persisted-queries): Fix query config problems (#1082)

Author: rthideaway

src/Entity/Server.php

@@ -503,8 +503,11 @@ protected function getValidationRules() {
    */
   public function preSave(EntityStorageInterface $storage) {
     // Write all the persisted queries configuration.
-    $this->persisted_queries_settings = [];
     $persistedQueryInstances = $this->getPersistedQueryInstances();
+    // Reset settings array after getting instances as it might be used when
+    // obtaining them. This would break a config import containing persisted
+    // queries settings as it would end up empty.
+    $this->persisted_queries_settings = [];
     if (!empty($persistedQueryInstances)) {
       foreach ($persistedQueryInstances as $plugin_id => $plugin) {
         $this->persisted_queries_settings[$plugin_id] = $plugin->getConfiguration();

src/Form/PersistedQueriesForm.php

@@ -172,7 +172,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
         $plugin_form_state = SubformState::createForSubform($form['settings'][$id], $form, $form_state);
         $plugin->submitConfigurationForm($form['settings'][$id], $plugin_form_state);
       }
-      if (!empty($values['weights']['order'][$id]['weight'])) {
+      // Use isset instead of empty to cover weight with zero index.
+      if (isset($values['weights']['order'][$id]['weight'])) {
         $plugin->setWeight((int) $values['weights']['order'][$id]['weight']);
       }
       $this->entity->addPersistedQueryInstance($plugin);