merged

console/app/controllers/console/admin/organizations/index.js

@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class ConsoleAdminOrganizationsIndexController extends Controller {}

console/app/router.js

@@ -49,6 +49,7 @@ Router.map(function () {
             this.route('notifications');
             this.route('two-fa-settings');
             this.route('virtual', { path: '/:slug/:view' });
+            this.route('organizations', function () {});
         });
 
         this.mount('@fleetbase/fleetops-engine', {

console/app/routes/console/admin/organizations/index.js

@@ -0,0 +1,10 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ConsoleAdminOrganizationsIndexRoute extends Route {
+    @service store;
+
+    async model() {
+        return this.store.findAll('company');
+    }
+}

console/app/templates/console/admin.hbs

@@ -5,13 +5,22 @@
     <Layout::Sidebar::Item @route="console.admin.branding" @icon="palette">{{t "common.branding"}}</Layout::Sidebar::Item>
     <Layout::Sidebar::Item @route="console.admin.notifications" @icon="bell">{{t "common.notifications"}}</Layout::Sidebar::Item>
     <Layout::Sidebar::Item @route="console.admin.two-fa-settings" @icon="shield-halved">{{t "common.2fa-config"}}</Layout::Sidebar::Item>
+    <Layout::Sidebar::Item @route="console.admin.organizations" @icon="building">{{"Organizations"}}</Layout::Sidebar::Item>
     {{#each this.universe.adminMenuItems as |menuItem|}}
-        <Layout::Sidebar::Item @onClick={{fn this.universe.transitionMenuItem "console.admin.virtual" menuItem}} @item={{menuItem}} @icon={{menuItem.icon}}>{{menuItem.title}}</Layout::Sidebar::Item>
+        <Layout::Sidebar::Item
+            @onClick={{fn this.universe.transitionMenuItem "console.admin.virtual" menuItem}}
+            @item={{menuItem}}
+            @icon={{menuItem.icon}}
+        >{{menuItem.title}}</Layout::Sidebar::Item>
     {{/each}}
     {{#each this.universe.adminMenuPanels as |menuPanel|}}
         <Layout::Sidebar::Panel @open={{menuPanel.open}} @title={{menuPanel.title}}>
             {{#each menuPanel.items as |menuItem|}}
-                <Layout::Sidebar::Item @onClick={{fn this.universe.transitionMenuItem "console.admin.virtual" menuItem}} @item={{menuItem}} @icon={{menuItem.icon}}>{{menuItem.title}}</Layout::Sidebar::Item>
+                <Layout::Sidebar::Item
+                    @onClick={{fn this.universe.transitionMenuItem "console.admin.virtual" menuItem}}
+                    @item={{menuItem}}
+                    @icon={{menuItem.icon}}
+                >{{menuItem.title}}</Layout::Sidebar::Item>
             {{/each}}
         </Layout::Sidebar::Panel>
     {{/each}}

console/app/templates/console/admin/organizations/index.hbs

@@ -0,0 +1,27 @@
+{{page-title "Organizations"}}
+
+<Layout::Section::Header @title={{"Organizations"}} />
+
+<Layout::Section::Body class="h-full w-full">
+    <div class="max-h-[calc(100vh-10rem)] h-full w-full overflow-y-scroll">
+        <div class="h-full w-full">
+            Hello World
+        </div>
+    </div>
+</Layout::Section::Body>
+
+<div class="fixed bottom-0 w-full">
+    <Layout::Section::Footer>
+        {{#if @model.meta}}
+            <Pagination
+                @meta={{@model.meta}}
+                @currentPage={{this.page}}
+                @onPageChange={{fn (mut this.page)}}
+                @tfootVerticalOffset="53"
+                @tfootVerticalOffsetElements=".next-view-section-subheader"
+            />
+        {{else}}
+            Loading...
+        {{/if}}
+    </Layout::Section::Footer>
+</div>

console/package.json

@@ -137,8 +137,13 @@
     },
     "pnpm": {
         "overrides": {
+<<<<<<< Updated upstream
             "@fleetbase/fleetops-data": "^0.1.7",
             "@fleetbase/ember-core": "^0.2.1",
+=======
+            "@fleetbase/fleetops-data": "link:../packages/fleetops-data",
+            "@fleetbase/ember-core": "link:../packages/ember-core",
+>>>>>>> Stashed changes
             "@fleetbase/ember-ui": "^0.2.9"
         }
     },

console/tests/unit/controllers/console/admin/organizations/index-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from '@fleetbase/console/tests/helpers';
+
+module('Unit | Controller | console/admin/organizations/index', function (hooks) {
+    setupTest(hooks);
+
+    // TODO: Replace this with your real tests.
+    test('it exists', function (assert) {
+        let controller = this.owner.lookup('controller:console/admin/organizations/index');
+        assert.ok(controller);
+    });
+});

console/tests/unit/routes/console/admin/organizations/index-test.js

@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from '@fleetbase/console/tests/helpers';
+
+module('Unit | Route | console/admin/organizations/index', function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+        let route = this.owner.lookup('route:console/admin/organizations/index');
+        assert.ok(route);
+    });
+});

update.sh

@@ -4,7 +4,7 @@
 set -e
 
 echo "Switching to the main branch..."
-git checkout main
+# git checkout main
 
 echo "Updating submodules..."
 git submodule update --init --recursive