Merge pull request Jexactyl#357 from TheGamer3514/patch-2

Make Allow Server Deletion functional
kokofixcomputers · Dec 6, 2024 · 3ddb871 · 3ddb871
2 parents e1e6d5a + 1d8e994
commit 3ddb871
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/Http/ViewComposers/StoreComposer.php b/app/Http/ViewComposers/StoreComposer.php
@@ -38,6 +38,10 @@ public function compose(View $view)
                 'enabled' => $this->setting('renewal:editing', Composer::TYPE_BOOL),
             ],
 
+            'deletion' => [
+                'enabled' => $this->setting('renewal:deletion', Composer::TYPE_BOOL),
+            ],
+
             'referrals' => [
                 'enabled' => $this->setting('referrals:enabled', Composer::TYPE_BOOL),
                 'reward' => $this->setting('referrals:reward', Composer::TYPE_INT),

diff --git a/resources/scripts/components/server/settings/SettingsContainer.tsx b/resources/scripts/components/server/settings/SettingsContainer.tsx
@@ -9,11 +9,12 @@ import RenameServerBox from '@/components/server/settings/RenameServerBox';
 import DeleteServerBox from '@/components/server/settings/DeleteServerBox';
 import ReinstallServerBox from '@/components/server/settings/ReinstallServerBox';
 import ChangeBackgroundBox from '@/components/server/settings/ChangeBackgroundBox';
+import { useStoreState } from 'easy-peasy';
 
 export default () => {
     const uuid = ServerContext.useStoreState((state) => state.server.data!.uuid);
     const node = ServerContext.useStoreState((state) => state.server.data!.node);
-
+    const deletion = useStoreState((state) => state.storefront.data!.deletion.enabled);
     return (
         <ServerContentBlock
             title={'Settings'}
@@ -34,7 +35,7 @@ export default () => {
                             </div>
                         </CopyOnClick>
                     </TitledGreyBox>
-                    <DeleteServerBox />
+                    {deletion && <DeleteServerBox />}
                     <ChangeBackgroundBox />
                 </div>
                 <div className={'w-full mt-6 md:flex-1 md:mt-0'}>

diff --git a/resources/scripts/state/storefront.ts b/resources/scripts/state/storefront.ts
@@ -10,6 +10,9 @@ export interface StorefrontSettings {
     editing: {
         enabled: boolean;
     };
+    deletion: {
+        enabled: boolean;
+    };
     referrals: {
         enabled: boolean;
         reward: number;