Dev (#37)

* Synchronizing code from bitbucket repository * Removing TomSelect because it is no longer updated * Metric template remove restriction * Multiple environment variables fix * - Setting dark mode by default in the login window - Providing better view of current build id and build environment for debugging - Added environment variables to set_env.sh so that they can be set during build * Application saving and traversing through the ui fixed #8 #11 * Fixing ts errors on Error handling * Adding build specific information for better debugging * Added new button to duplicate application * Bug fixes and improvements * Added undeploy functionality * Bug fixes,refactoring resources and added max tries in app polling * Fix in files in order to run pipeline --------- Co-authored-by: Fotis Paraskevopoulos <fotis@existanze.com>
eu-nebulous · Oct 18, 2024 · 9d17665 · 9d17665
1 parent 8be9ca7
commit 9d17665
Show file tree

Hide file tree

Showing 10 changed files with 1,933 additions and 29 deletions.
diff --git a/gui/.gitignore b/gui/.gitignore
@@ -11,11 +11,12 @@ node_modules
 dist
 dist-ssr
 *.local
-
+../.DS_Store
 # Editor directories and files
 .idea
 .vscode
 .DS_Store
+../.idea/
 *.suo
 *.ntvs*
 *.njsproj

diff --git a/gui/dist/index.html b/gui/dist/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en" class="dark">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/assets/nebulous-f9e3bcad.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>NebulOus</title>
+    <script type="module" crossorigin src="/assets/index-2c89f4e5.js"></script>
+    <link rel="stylesheet" href="/assets/index-220aeee3.css">
+  </head>
+  <body>
+    <div id="app"></div>
+
+  </body>
+</html>
diff --git a/gui/index.html b/gui/index.html
@@ -2,9 +2,9 @@
 <html lang="en" class="dark">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/src/assets/svg/nebulous.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Nebulous</title>
+    <title>NebulOus</title>
   </head>
   <body>
     <div id="app"></div>

diff --git a/gui/src/assets/svg/nebulous.svg b/gui/src/assets/svg/nebulous.svg
diff --git a/gui/src/components/Modal/ResourceCreation.vue b/gui/src/components/Modal/ResourceCreation.vue
@@ -24,7 +24,7 @@ import {SNACKBAR_MESSAGE_TYPES} from "@/constants"
 import {IResourcePayload} from "@/types/resource.ts"
 import ResourceForm from "@/components/Modal/ResourceForm.vue";
 import {IPlatform} from "@/interfaces/platform.interface.ts";
-import { IRegion } from "@/interfaces/resources.interface.ts"
+import { IRegion, IType } from "@/interfaces/resources.interface.ts"
 
 const resourceStore = useResourceStore()
 const uiStore = useUIStore()
@@ -35,6 +35,7 @@ const resourceData = reactive<IResourcePayload>({
   _platform: [{"uuid":'','title':''} as IPlatform], // TODO Remove this
   securityGroup:"",
   regions:"",
+  excludedInstanceTypes: "",
   subnet:"",
   endpoint:"",
   identityVersion:"",
@@ -56,7 +57,11 @@ const externalServerValidation = () => true
 
 const rules = {
   title: { required, externalServerValidation },
-  platform: { required, externalServerValidation }
+  platform: { required, externalServerValidation },
+  credentials: {
+    user: { required, externalServerValidation },
+    secret: { required, externalServerValidation },
+  }
 }
 
 const $externalResults = reactive({})
@@ -68,15 +73,19 @@ const closeModal = (skipConfirmation: boolean = false) => {
 
 
 const createResource = async () => {
-  // Map regions from objects to string (comma-separated region identifiers)
-  if (Array.isArray(resourceData.regions)) {
-    resourceData.regions = resourceData.regions.map((region: IRegion) => region.region).join(',');
-  }
-
+  
   if (!(await v$.value.$validate())) {
     console.log("Failed validation");
     return;
   }
+  // Map regions from objects
+  if (Array.isArray(resourceData.regions)) {
+    resourceData.regions = resourceData.regions.map((region: IRegion) => region.region).join(',');
+  }
+  // Map excludedInstanceTypes from objects
+  if (Array.isArray(resourceData.excludedInstanceTypes)) {
+    resourceData.excludedInstanceTypes = resourceData.excludedInstanceTypes.map((type: IType) => type.instanceType).join(',');
+  }
 
   resourceStore
       .createResource(resourceData)