From 300bf883e3590708762d124807b585444f6a2bef Mon Sep 17 00:00:00 2001
From: Stanislav Romanov <kaermorchen@gmail.com>
Date: Sat, 15 Oct 2022 12:48:28 +0300
Subject: [PATCH] Clear code

---
 app/router.js                                  |  2 +-
 .../item/{settings/index.js => settings.js}    | 14 +++-----------
 app/templates/admin/indexes/item/settings.hbs  | 18 +++++++++++++-----
 .../admin/indexes/item/settings/index.hbs      | 14 --------------
 .../admin/indexes/item/settings/index-test.js  | 11 -----------
 5 files changed, 17 insertions(+), 42 deletions(-)
 rename app/routes/admin/indexes/item/{settings/index.js => settings.js} (91%)
 delete mode 100644 app/templates/admin/indexes/item/settings/index.hbs
 delete mode 100644 tests/unit/routes/admin/indexes/item/settings/index-test.js

diff --git a/app/router.js b/app/router.js
index 1a7fc9c..a2fa6c2 100644
--- a/app/router.js
+++ b/app/router.js
@@ -10,7 +10,7 @@ Router.map(function () {
   this.route('admin', function () {
     this.route('indexes', function () {
       this.route('item', { path: '/:index_uid' }, function () {
-        this.route('settings', function () {});
+        this.route('settings');
         this.route('info');
         this.route('edit');
         this.route('documents', function () {
diff --git a/app/routes/admin/indexes/item/settings/index.js b/app/routes/admin/indexes/item/settings.js
similarity index 91%
rename from app/routes/admin/indexes/item/settings/index.js
rename to app/routes/admin/indexes/item/settings.js
index 416585b..e90e73c 100644
--- a/app/routes/admin/indexes/item/settings/index.js
+++ b/app/routes/admin/indexes/item/settings.js
@@ -150,7 +150,7 @@ export const settings = [
   return item;
 });
 
-const allSettings = {
+settings.unshift({
   uri: urlSettingsPrefix,
   fileMatch: [urlSettingsPrefix],
   schema: {
@@ -163,17 +163,9 @@ const allSettings = {
     }, {}),
     additionalProperties: false,
   },
-};
+});
 
-settings.unshift(allSettings);
-
-// TODO: do it async, not in main stream
-// languages.json.jsonDefaults.setDiagnosticsOptions({
-//   validate: true,
-//   schemas: indexSettings,
-// });
-
-export default class AdminIndexesItemSettingsIndexRoute extends Route {
+export default class AdminIndexesItemSettingsRoute extends Route {
   model() {
     const index = this.modelFor('admin.indexes.item');
 
diff --git a/app/templates/admin/indexes/item/settings.hbs b/app/templates/admin/indexes/item/settings.hbs
index 4ee6c39..2d74990 100644
--- a/app/templates/admin/indexes/item/settings.hbs
+++ b/app/templates/admin/indexes/item/settings.hbs
@@ -1,6 +1,14 @@
-{{!-- <Tabs>
-  <Tab @route="admin.indexes.item.settings.index" @text="All" />
-  <Tab @route="admin.indexes.item.settings.specific" @text="Specific" />
-</Tabs> --}}
+<Form::Listbox
+  @value={{this.model.currentSetting}}
+  @values={{this.model.settings}}
+  @onChange={{set this.model 'currentSetting'}}
+  class="w-72"
+  as |setting|
+>
+  {{if setting.name (namelize setting.name) 'All settings'}}
+</Form::Listbox>
 
-{{outlet}}
+<IndexSetting
+  @setting={{this.model.currentSetting}}
+  @index={{this.model.index}}
+/>
diff --git a/app/templates/admin/indexes/item/settings/index.hbs b/app/templates/admin/indexes/item/settings/index.hbs
deleted file mode 100644
index 2d74990..0000000
--- a/app/templates/admin/indexes/item/settings/index.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<Form::Listbox
-  @value={{this.model.currentSetting}}
-  @values={{this.model.settings}}
-  @onChange={{set this.model 'currentSetting'}}
-  class="w-72"
-  as |setting|
->
-  {{if setting.name (namelize setting.name) 'All settings'}}
-</Form::Listbox>
-
-<IndexSetting
-  @setting={{this.model.currentSetting}}
-  @index={{this.model.index}}
-/>
diff --git a/tests/unit/routes/admin/indexes/item/settings/index-test.js b/tests/unit/routes/admin/indexes/item/settings/index-test.js
deleted file mode 100644
index 65344f3..0000000
--- a/tests/unit/routes/admin/indexes/item/settings/index-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'meiliadmin/tests/helpers';
-
-module('Unit | Route | admin/indexes/item/settings/index', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    let route = this.owner.lookup('route:admin/indexes/item/settings/index');
-    assert.ok(route);
-  });
-});