From 3eeefd0b519d3ca36bfda7942e628864aeca7fba Mon Sep 17 00:00:00 2001
From: Stanislav Romanov <kaermorchen@gmail.com>
Date: Thu, 24 Mar 2022 12:57:48 +0300
Subject: [PATCH] Refactore index request

---
 app/router.js                             |  2 +-
 app/routes/admin.js                       |  2 +-
 app/routes/admin/indexes.js               | 10 +++++-----
 app/routes/admin/indexes/item.js          |  6 ++----
 app/routes/admin/indexes/item/settings.js | 11 +----------
 app/templates/admin.hbs                   |  4 ++--
 app/templates/admin/indexes/item.hbs      |  6 +++---
 7 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/app/router.js b/app/router.js
index 4ff7c97..43e692f 100644
--- a/app/router.js
+++ b/app/router.js
@@ -9,7 +9,7 @@ export default class Router extends EmberRouter {
 Router.map(function () {
   this.route('admin', function () {
     this.route('indexes', function () {
-      this.route('item', { path: '/:index_id' }, function () {
+      this.route('item', { path: '/:uid' }, function () {
         this.route('settings');
         this.route('data');
       });
diff --git a/app/routes/admin.js b/app/routes/admin.js
index 6256d24..34e2216 100644
--- a/app/routes/admin.js
+++ b/app/routes/admin.js
@@ -5,6 +5,6 @@ export default class AdminRoute extends Route {
   @service meilisearch;
 
   async model() {
-    return this.meilisearch.getRawIndexes();
+    return this.meilisearch.getIndexes();
   }
 }
diff --git a/app/routes/admin/indexes.js b/app/routes/admin/indexes.js
index 42aaab4..7a7b9e3 100644
--- a/app/routes/admin/indexes.js
+++ b/app/routes/admin/indexes.js
@@ -1,10 +1,10 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+// import { inject as service } from '@ember/service';
 
 export default class AdminIndexesRoute extends Route {
-  @service meilisearch;
+  // @service meilisearch;
 
-  async model() {
-    return this.meilisearch.getRawIndexes();
-  }
+  // async model() {
+  //   return this.modelFor('admin');
+  // }
 }
diff --git a/app/routes/admin/indexes/item.js b/app/routes/admin/indexes/item.js
index 42c50bd..1fc3228 100644
--- a/app/routes/admin/indexes/item.js
+++ b/app/routes/admin/indexes/item.js
@@ -1,9 +1,7 @@
 import Route from '@ember/routing/route';
 
 export default class AdminIndexesItemRoute extends Route {
-  model({ index_id }) {
-    return this.modelFor('admin.indexes').find(
-      (item) => item.name === index_id
-    );
+  model({ uid }) {
+    return this.modelFor('admin').find((item) => item.uid === uid);
   }
 }
diff --git a/app/routes/admin/indexes/item/settings.js b/app/routes/admin/indexes/item/settings.js
index 05d4a28..5be6546 100644
--- a/app/routes/admin/indexes/item/settings.js
+++ b/app/routes/admin/indexes/item/settings.js
@@ -1,12 +1,3 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
-export default class AdminIndexesItemSettingsRoute extends Route {
-  @service meilisearch;
-
-  async model() {
-    const item = this.modelFor('admin.indexes.item');
-
-    return this.meilisearch.index(item);
-  }
-}
+export default class AdminIndexesItemSettingsRoute extends Route {}
diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index 2843b87..4ed81ba 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -10,8 +10,8 @@
         {{#each @model as |item|}}
           <MenuItem
             @route="admin.indexes.item"
-            @model={{item.name}}
-            @name={{capitalize item.name}}
+            @model={{item}}
+            @name={{capitalize item.uid}}
             class="flex flex-row items-center h-12 px-base"
           />
         {{/each}}
diff --git a/app/templates/admin/indexes/item.hbs b/app/templates/admin/indexes/item.hbs
index a51a20f..ee89379 100644
--- a/app/templates/admin/indexes/item.hbs
+++ b/app/templates/admin/indexes/item.hbs
@@ -1,10 +1,10 @@
 {{page-title "Item"}}
 
-<h1 class="text-2xl mb-4">{{capitalize @model.name}}</h1>
+<h1 class="text-2xl mb-4">{{capitalize @model.uid}}</h1>
 
 <div class="flex mb-4">
-  <Tab @route="admin.indexes.item.data" @text="Data" @icon="database-outline" @model={{@model.name}} />
-  <Tab @route="admin.indexes.item.settings" @text="Settings" @icon="cog-outline" @model={{@model.name}} />
+  <Tab @route="admin.indexes.item.data" @text="Data" @icon="database-outline" @model={{@model}} />
+  <Tab @route="admin.indexes.item.settings" @text="Settings" @icon="cog-outline" @model={{@model}} />
 </div>
 
 {{outlet}}