on change of store now reading correct entry

extiverse · Nov 22, 2018 · b742956 · b742956
1 parent accaa74
commit b742956
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/extend.php b/extend.php
@@ -12,15 +12,15 @@
 
 return [
     (new Routes('api'))
-        ->get('/bazaar/extensions', 'bazaar.extensions.index', Controllers\ListExtensionController::class)
-        ->post('/bazaar/extensions', 'bazaar.extensions.install', Controllers\InstallExtensionController::class)
-        ->patch('/bazaar/extensions/{id}', 'bazaar.extensions.update', Controllers\UpdateExtensionController::class)
-        ->patch('/bazaar/extensions/{id}/toggle', 'bazaar.extensions.toggle', Controllers\ToggleExtensionController::class)
-        ->post('/bazaar/extensions/{id}/favorite', 'bazaar.extensions.favorite', Controllers\FavoriteExtensionController::class)
+        ->get('/bazaar-extensions', 'bazaar.extensions.index', Controllers\ListExtensionController::class)
+        ->post('/bazaar-extensions', 'bazaar.extensions.install', Controllers\InstallExtensionController::class)
+        ->patch('/bazaar-extensions/{id}', 'bazaar.extensions.update', Controllers\UpdateExtensionController::class)
+        ->patch('/bazaar-extensions/{id}/toggle', 'bazaar.extensions.toggle', Controllers\ToggleExtensionController::class)
+        ->post('/bazaar-extensions/{id}/favorite', 'bazaar.extensions.favorite', Controllers\FavoriteExtensionController::class)
+        ->delete('/bazaar-extensions/{id}', 'bazaar.extensions.delete', Controllers\UninstallExtensionController::class)
         ->get('/bazaar/redirect/subscribe/{id}', 'bazaar.redirect.subscribe', Controllers\SubscriptionRedirectSubscribeController::class)
         ->get('/bazaar/redirect/unsubscribe/{id}', 'bazaar.redirect.unsubscribe', Controllers\SubscriptionRedirectUnsubscribeController::class)
         ->get('/bazaar/callback/subscription', 'bazaar.callback.subscription', Controllers\SubscriptionRedirectCallbackController::class)
-        ->delete('/bazaar/extensions/{id}', 'bazaar.extensions.delete', Controllers\UninstallExtensionController::class)
         ->get('/bazaar/connect', 'bazaar.connect', Controllers\ConnectController::class)
         ->get('/bazaar/tasks', 'bazaar.tasks.index', Controllers\ListTaskController::class)
         ->get('/bazaar/sync/composer-lock', 'bazaar.composer-lock', Controllers\RetrieveComposerLockController::class)
@@ -30,7 +30,7 @@
         ->js(__DIR__ . '/js/dist/admin.js'),
     new Locales(__DIR__ . '/resources/locale'),
     function (Application $app) {
-    /** @var Dispatcher $events */
+        /** @var Dispatcher $events */
         $events = $app['events'];
 
         $events->subscribe(Listeners\BazaarEnabled::class);

diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/src/admin/components/BazaarPage.js b/js/src/admin/components/BazaarPage.js
@@ -4,7 +4,6 @@ import ExtensionList from "./ExtensionList";
 import ExtensionSearch from "./ExtensionSearch";
 import BazaarPageHeader from './BazaarPageHeader';
 
-
 export default class BazaarPage extends Component {
     init() {
         app.current = this;

diff --git a/js/src/admin/components/ExtensionList.js b/js/src/admin/components/ExtensionList.js
@@ -123,7 +123,7 @@ export default class ExtensionList extends Component {
         params.page = {offset};
         params.include = params.include.join(',');
 
-        return app.store.find('bazaar/extensions', params);
+        return app.store.find('bazaar-extensions', params);
     }
 
     /**

diff --git a/js/src/admin/utils/ExtensionRepository.js b/js/src/admin/utils/ExtensionRepository.js
@@ -29,7 +29,7 @@ export default class ExtensionRepository {
 
         app.request({
             method: 'POST',
-            url: app.forum.attribute('apiUrl') + '/bazaar/extensions',
+            url: app.forum.attribute('apiUrl') + '/bazaar-extensions',
             timeout: 0,
             data: {
                 id: extension.id()
@@ -58,7 +58,7 @@ export default class ExtensionRepository {
         app.request({
             method: 'DELETE',
             timeout: 0,
-            url: app.forum.attribute('apiUrl') + '/bazaar/extensions/' + extension.id()
+            url: app.forum.attribute('apiUrl') + '/bazaar-extensions/' + extension.id()
         }).then(response => {
             this.updateExtensionInRepository(response)
         }).catch(() => this.requestError());
@@ -82,7 +82,7 @@ export default class ExtensionRepository {
 
         app.request({
             method: 'post',
-            url: app.forum.attribute('apiUrl') + '/bazaar/extensions/' + extension.id() + '/favorite',
+            url: app.forum.attribute('apiUrl') + '/bazaar-extensions/' + extension.id() + '/favorite',
             data: {
                 favorite: extension.favorited() != true
             }
@@ -118,7 +118,7 @@ export default class ExtensionRepository {
         this.loading(true);
 
         app.request({
-            url: app.forum.attribute('apiUrl') + '/bazaar/extensions/' + extension.id(),
+            url: app.forum.attribute('apiUrl') + '/bazaar-extensions/' + extension.id(),
             timeout: 0,
             method: 'PATCH'
         }).then(response => {
@@ -138,7 +138,7 @@ export default class ExtensionRepository {
         const enabled = extension.enabled();
 
         app.request({
-            url: app.forum.attribute('apiUrl') + '/bazaar/extensions/' + extension.id() + '/toggle',
+            url: app.forum.attribute('apiUrl') + '/bazaar-extensions/' + extension.id() + '/toggle',
             method: 'PATCH',
             data: {enabled: !enabled}
         }).then(response => {
@@ -180,7 +180,7 @@ export default class ExtensionRepository {
     updateExtensionInRepository(response) {
         this.loading(false);
 
-        let extension = app.store.createRecord('bazaar-extensions', response.data);
+        let extension = app.store.pushObject(response.data);
         this.extensions()[this.getExtensionIndex(extension)] = extension;
 
         m.redraw();