ember-tribe 2.3.0 → 2.3.2

package/blueprints/ember-tribe/files/.env.sample

@@ -1,2 +1,2 @@
 TRIBE_API_URL=""
-TRIBE_API_TOKEN=""
+TRIBE_API_KEY=""

package/blueprints/ember-tribe/files/app/adapters/application.js

@@ -5,8 +5,11 @@ import { underscore } from '@ember/string';
 export default class ApplicationAdapter extends JSONAPIAdapter {
   host = ENV.TribeENV.API_URL;
   namespace = 'api.php';
+  headers = {
+    Authorization: `Bearer ${ENV.TribeENV.API_KEY}`,
+  };
 
   pathForType(type) {
     return underscore(type);
   }
-}
+}

package/blueprints/ember-tribe/files/app/models/webapp.js

@@ -0,0 +1,6 @@
+import Model, { attr } from '@ember-data/model';
+
+export default class WebappModel extends Model {
+  @attr slug;
+  @attr modules;
+}

package/blueprints/ember-tribe/files/app/routes/application.js

@@ -3,11 +3,9 @@ import * as bootstrap from 'bootstrap';
 import { service } from '@ember/service';
 
 export default class ApplicationRoute extends Route {
-  /*
   @service types;
 
   async beforeModel() {
     await this.types.fetchAgain();
   }
-  */
 }

package/blueprints/ember-tribe/files/app/services/types.js

@@ -1,7 +1,10 @@
 import Service from '@ember/service';
+import ENV from '<%= dasherizedPackageName %>/config/environment';
 import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
+import Model, { attr } from '@ember-data/model';
+import { getOwner } from '@ember/application';
 
 export default class TypesService extends Service {
   @service store;
@@ -11,9 +14,27 @@ export default class TypesService extends Service {
 
   @action
   async fetchAgain() {
-    this.json = await this.store.findRecord('webapp', 0, {
-      include: ['total_objects'],
-    });
-    this.json = this.json;
+    if (ENV.TribeENV.API_URL !== undefined && ENV.TribeENV.API_URL != '') {
+      this.json = await this.store.findRecord('webapp', 0, {});
+      let owner = getOwner(this);
+
+      Object.entries(this.json.modules).forEach(([modelName, modelData]) => {
+        const modelDynamicName = modelName.replace(/_/g, '-');
+
+        class DynamicModel extends Model {
+          @attr slug;
+          @attr modules;
+        }
+        
+        if (!owner.hasRegistration(`model:${modelDynamicName}`)) {
+          owner.register(`model:${modelDynamicName}`, DynamicModel);
+        }
+      });
+      
+      this.json = await this.store.findRecord('webapp', 0, {
+        include: ['total_objects'],
+      });
+      this.json = this.json;
+    }
   }
 }

package/config/environment.js

@@ -2,13 +2,12 @@
 
 module.exports = function (/* environment, appConfig */) {
   let ENV = {
-
     //Wildfire Tribe config for EmberJS
     TribeENV: {
       API_URL: process.env.TRIBE_API_URL,
+      API_KEY: process.env.TRIBE_API_KEY,
     },
-
   };
 
   return ENV;
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-tribe",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "The default blueprint for using Tribe within EmberJS.",
   "keywords": [
     "ember-addon"

package/blueprints/ember-tribe/files/sync-types.php

@@ -1,23 +0,0 @@
-<?php
-$_ENV = parse_ini_file('.env');
-if (($_ENV['TRIBE_API_URL'] ?? false) && $_ENV['TRIBE_API_URL'] != '') {
-    $types = json_decode(file_get_contents($_ENV['TRIBE_API_URL'].'/api.php/webapp/0'), true)['data']['attributes']['modules'];
-} else {
-    $types = json_decode(file_get_contents('https://raw.githubusercontent.com/tribe-framework/types.json/master/blueprints/junction-init.json'), true);
-}
-
-// re-create models folder
-$commands = "[ -d app/models ] && rm -r app/models && mkdir app/models; ";
-// remove test for models
-$commands .= "[ -d tests/unit/models ] && rm -r tests/unit/models; ";
-
-foreach (array_keys($types) as $type) {
-    if ($type == 'webapp' || in_array($type, ($types['webapp']['interface_urls'][basename(dirname(__FILE__))]['types'] ?? array_keys($types)))) {
-
-        $type_hyphen = str_replace('_', '-', $type);
-        $type_ucwords = str_replace(' ', '', ucwords(str_replace('_', ' ', $type)));
-        $commands .= "echo \"import Model, { attr } from '@ember-data/model';\n\nexport default class ".$type_ucwords."Model extends Model {\n  @attr slug;\n  @attr modules;\n}\" > app/models/".$type_hyphen.".js; ";
-    }
-}
-
-exec($commands);