added self hosted instance extension install instructions

fleetbase · Nov 7, 2024 · 23c83f3 · 23c83f3
1 parent ad14662
commit 23c83f3
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 39 deletions.
diff --git a/addon/components/extension-card.js b/addon/components/extension-card.js
@@ -165,7 +165,7 @@ export default class ExtensionCardComponent extends Component {
     async selfManagedInstallInstructions(options = {}) {
         await this.modalsManager.done();
         this.modalsManager.show('modals/self-managed-install-instructions', {
-            title: 'Install a Self Managed Extension',
+            title: 'Install Extension to Self-Hosted Instance',
             hideDeclineButton: true,
             acceptButtonText: 'Done',
             ...options,

diff --git a/addon/components/extension-form.js b/addon/components/extension-form.js
@@ -171,7 +171,7 @@ export default class ExtensionFormComponent extends Component {
     async selfManagedInstallInstructions(options = {}) {
         await this.modalsManager.done();
         this.modalsManager.show('modals/self-managed-install-instructions', {
-            title: 'Install a Self Managed Extension',
+            title: 'Install Extension to Self-Hosted Instance',
             hideDeclineButton: true,
             acceptButtonText: 'Done',
             ...options,

diff --git a/addon/components/modals/extension-details.hbs b/addon/components/modals/extension-details.hbs
@@ -69,21 +69,21 @@
                             {{/if}}
                         </div>
                     </div>
-                    <div class="space-y-2">
-                        {{#if this.extension.self_managed}}
+                    {{#if @options.viewSelfManagesInstallInstructions}}
+                        <div class="space-y-2">
                             <div>
-                                <Badge @status="info" @hideStatusDot={{true}} @helpText={{t "registry-bridge.component.extension-details-modal.self-managed-help-text"}}>{{t
-                                        "registry-bridge.component.extension-details-modal.self-managed"
-                                    }}</Badge>
-                                {{#if @options.viewSelfManagesInstallInstructions}}
-                                    <a href="#" class="text-xs text-blue-400 hover:opacity-50" {{on "click" @options.viewSelfManagesInstallInstructions}}><FaIcon
-                                            @icon="circle-info"
-                                            class="mr-1"
-                                        />How to install</a>
-                                {{/if}}
+                                <Button
+                                    @size="xs"
+                                    @type="magic"
+                                    @text={{t "registry-bridge.component.extension-details-modal.self-hosted-install"}}
+                                    @helpText={{t "registry-bridge.component.extension-details-modal.self-hosted-install-help-text"}}
+                                    @tooltipPlacement="right"
+                                    @onClick={{@options.viewSelfManagesInstallInstructions}}
+                                    @icon="circle-info"
+                                />
                             </div>
-                        {{/if}}
-                    </div>
+                        </div>
+                    {{/if}}
                 </div>
             </div>
         </div>

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/registry-bridge",
-    "version": "0.0.17",
+    "version": "0.0.18",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "keywords": [
         "fleetbase-extension",
@@ -33,12 +33,6 @@
         "phpstan/phpstan": "^1.10.38",
         "symfony/var-dumper": "^5.4.29"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/fleetbase/laravel-model-caching"
-        }
-    ],
     "autoload": {
         "psr-4": {
             "Fleetbase\\RegistryBridge\\": "server/src/",

diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Registry Bridge",
-    "version": "0.0.17",
+    "version": "0.0.18",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "repository": "https://github.com/fleetbase/registry-bridge",
     "license": "AGPL-3.0-or-later",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/registry-bridge-engine",
-    "version": "0.0.17",
+    "version": "0.0.18",
     "description": "Internal Bridge between Fleetbase API and Extensions Registry",
     "fleetbase": {
         "route": "extensions"
@@ -39,8 +39,8 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.21",
-        "@fleetbase/ember-ui": "^0.2.34",
+        "@fleetbase/ember-core": "latest",
+        "@fleetbase/ember-ui": "latest",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
         "@fortawesome/free-solid-svg-icons": "6.4.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/src/Http/Controllers/Internal/v1/ExtensionInstallerController.php b/server/src/Http/Controllers/Internal/v1/ExtensionInstallerController.php
@@ -36,7 +36,7 @@ public function install(InstallExtensionRequest $request)
         $extension = RegistryExtension::where('public_id', $request->input('extension'))->first();
 
         // Check if already installed
-        $installed = RegistryExtensionInstall::disableCache()->where(['company_uuid' => session('company'), 'extension_uuid' => $extension->uuid])->exists();
+        $installed = RegistryExtensionInstall::where(['company_uuid' => session('company'), 'extension_uuid' => $extension->uuid])->exists();
         if ($installed) {
             return response()->error('This extension is already installed.');
         }
@@ -105,7 +105,7 @@ public function uninstall(InstallExtensionRequest $request)
         $uninstalled = false;
 
         // Check if already uninstalled
-        $uninstalled = RegistryExtensionInstall::disableCache()->where(['company_uuid' => session('company'), 'extension_uuid' => $extension->uuid])->doesntExist();
+        $uninstalled = RegistryExtensionInstall::where(['company_uuid' => session('company'), 'extension_uuid' => $extension->uuid])->doesntExist();
         if ($uninstalled) {
             return response()->error('This extension is not installed.');
         }

diff --git a/server/src/Http/Controllers/Internal/v1/RegistryController.php b/server/src/Http/Controllers/Internal/v1/RegistryController.php
@@ -49,7 +49,7 @@ public function categories()
     public function getInstalledEngines(Request $request)
     {
         if ($request->session()->has('company')) {
-            $installedExtensions = RegistryExtension::disableCache()->whereHas('installs', function ($query) {
+            $installedExtensions = RegistryExtension::whereHas('installs', function ($query) {
                 $query->where('company_uuid', session('company'));
             })->get()->map(function ($extension) {
                 return $extension->currentBundle->meta['package.json'] ?? [];
@@ -77,8 +77,7 @@ public function getEngineInstallStatus(Request $request)
         $engine = $request->input('engine');
 
         if ($request->session()->has('company') && $engine) {
-            $installed = RegistryExtension::disableCache()
-            ->whereHas(
+            $installed = RegistryExtension::whereHas(
                 'currentBundle',
                 function ($query) use ($engine) {
                     $query->where('meta->package.json->name', $engine);

diff --git a/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php b/server/src/Http/Controllers/Internal/v1/RegistryExtensionController.php
@@ -68,7 +68,7 @@ public function createRecord(Request $request)
      */
     public function installed()
     {
-        $installedExtensions = RegistryExtension::disableCache()->whereHas('installs', function ($query) {
+        $installedExtensions = RegistryExtension::whereHas('installs', function ($query) {
             $query->where('company_uuid', session('company'));
         })->get();
 
@@ -92,7 +92,7 @@ public function installed()
      */
     public function purchased()
     {
-        $purchasedExtensions = RegistryExtension::disableCache()->whereHas('purchases', function ($query) {
+        $purchasedExtensions = RegistryExtension::whereHas('purchases', function ($query) {
             $query->where('company_uuid', session('company'));
         })->get();
 

diff --git a/translations/en-us.yaml b/translations/en-us.yaml
@@ -21,6 +21,8 @@ registry-bridge:
       website: Website
       self-managed: Self Managed
       self-managed-help-text: A self-managed extension is designed for users who host Fleetbase on their own servers, outside of the cloud/SaaS environment. These extensions require manual installation and configuration. If you are using Fleetbase as a self-hosted instance, you can use these extensions to add additional features. However, they are not available for cloud/SaaS users.
+      self-hosted-install: Self Hosted Install
+      self-hosted-install-help-text: View self-hosted install instructions.
     extension-pending-publish-viewer:
       content-panel-title: Extensions Pending Publish
       focused-extension-title: >