Merge branch 'main' of github.com:clidey/whodb into hk/feature/elasticsearch

Author: hkdeman

README.md

@@ -30,18 +30,19 @@ services:
 
 Go to http://localhost:8080 and get started!
 
-Or try here: https://whodb.clidey.com/login?host=quick-container-491288b0-3138-48fa-93b4-1e730296c0b7.hello.svc.cluster.local&username=user&password=password&database=Adventureworks
+Or try here: https://whodb.clidey.com/demo/login?host=quick-container-491288b0-3138-48fa-93b4-1e730296c0b7.hello.svc.cluster.local&username=user&password=password&database=Adventureworks
 
 - This is currently populated with fake database from [postgresDBSamples](https://github.com/morenoh149/postgresDBSamples/) and the URL should automatically put the credentials
 
-Or checkout our Demo Video: [![Demo Video](/docs/images/demo-thumbnail.png)](https://youtu.be/w3tOjRt8jGU)
+Or checkout our Demo Video: [![Demo Video](/docs/images/demo-thumbnail.png)](https://youtu.be/hnAQcYYzcLo)
 
 ## Features
-- **Better UX:** Intuitive and easy-to-use interface.
-- **Faster Performance:** Built with GoLang for exceptional speed and table virtualization in Frontend.
-- **Schema Visualization:** Interactive graphs to visualize your entire database schema.
+- **Better UX:** Intuitive and easy-to-use interface
+- **Faster Performance:** Built with GoLang for exceptional speed and table virtualization in Frontend
+- **Schema Visualization:** Interactive graphs to visualize your entire database schema
 - **Inline Editing & Preview:** Easily preview cell or edit inline
 - **Current Support:** PostgreSQL, MySQL, SQLite3, MongoDB, & Redis
+- **Scratchpad:** Perform database queries in a jupyter notebook like experience
 
 ## Documentation
 
@@ -85,7 +86,7 @@ A: WhoDB supports lazy loading to efficiently manage and display large query res
 
 **Q: What makes WhoDB different from DBeaver?**
 
-A: While DBeaver is a highly advanced tool written in Java, it can be resource-intensive. WhoDB, on the other hand, is designed to be lightweight and runs with minimal resources, making it accessible to a wider range of users and devices. You can run WhoDB with as little as 50m core and 100Mi RAM. WhoDB is also only ~20Mi compressed size.
+A: While DBeaver is a highly advanced tool written in Java, it can be resource-intensive. WhoDB, on the other hand, is designed to be lightweight and runs with minimal resources, making it accessible to a wider range of users and devices. You can run WhoDB with as little as 50m core and 100Mb RAM. WhoDB is also only ~25Mb compressed size.
 
 **Q: Can I use WhoDB with any type of database?**
 
@@ -110,4 +111,4 @@ For any inquiries or support, please reach out to [support@clidey.com](mailto:su
 
 <div style="width:100%;border-bottom:0.5px solid white;margin:50px 0px;"></div>
 
-*WhoDB - Making your database management disappear like magic!*
+*WhoDB - Making your database management disappear like magic!*

core/Dockerfile

@@ -1,30 +1,23 @@
-FROM node:18.12.1-alpine as build-stage
-
+FROM node:18.12.1-alpine AS build-stage
 RUN npm i -g pnpm
-
 WORKDIR /app
 COPY ./frontend/package.json ./frontend/pnpm-lock.yaml ./
 RUN pnpm install
 COPY ./frontend/ ./
 RUN pnpm run build
 
-
-FROM golang:1.22.1-alpine3.19 as backend-stage
-
+FROM golang:1.22.1-alpine3.19 AS backend-stage
 RUN apk update && apk add --no-cache gcc musl-dev
-
 WORKDIR /app
 COPY ./core/go.mod ./core/go.sum ./
 RUN go mod download
 COPY ./core/ ./
+COPY --from=build-stage /app/build/ ./build/
 RUN CGO_ENABLED=1 GOOS=linux go build -o /core
 
 FROM alpine:3.19
-
 RUN apk update && apk add --no-cache ca-certificates
-
 WORKDIR /app
 COPY --from=backend-stage /core /core
-COPY --from=build-stage /app/build/ ./build/
 
-CMD ["/core"]
+CMD ["/core"]

core/graph/generated.go

@@ -61,6 +61,7 @@ input LoginCredentials {
   Username: String!
   Password: String!
   Database: String!
+  Advanced: [RecordInput!]
 }
 
 type StatusResponse {
@@ -78,7 +79,7 @@ type Query {
 }
 
 type Mutation {
-  Login(credentails: LoginCredentials!): StatusResponse!
+  Login(credentials: LoginCredentials!): StatusResponse!
   Logout: StatusResponse!
 
   UpdateStorageUnit(type: DatabaseType!, schema: String!, storageUnit: String!, values: [RecordInput!]!): StatusResponse!

core/graph/model/models_gen.go

@@ -1,11 +1,16 @@
 package main
 
 import (
+	"embed"
+
 	"github.com/clidey/whodb/core/src"
 	"github.com/clidey/whodb/core/src/router"
 )
 
+//go:embed build/*
+var staticFiles embed.FS
+
 func main() {
 	src.InitializeEngine()
-	router.InitializeRouter()
+	router.InitializeRouter(staticFiles)
 }

core/graph/schema.graphqls

@@ -1,5 +1,7 @@
 package common
 
+import "github.com/clidey/whodb/core/src/engine"
+
 func ContainsString(slice []string, element string) bool {
 	for _, item := range slice {
 		if item == element {
@@ -8,3 +10,12 @@ func ContainsString(slice []string, element string) bool {
 	}
 	return false
 }
+
+func GetRecordValueOrDefault(records []engine.Record, key string, defaultValue string) string {
+	for _, record := range records {
+		if record.Key == key && len(record.Value) > 0 {
+			return record.Value
+		}
+	}
+	return defaultValue
+}

core/graph/schema.resolvers.go

@@ -5,6 +5,7 @@ type Credentials struct {
 	Username string
 	Password string
 	Database string
+	Advanced []Record
 }
 
 type PluginConfig struct {

core/server.go

@@ -4,28 +4,33 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/clidey/whodb/core/src/common"
 	"github.com/clidey/whodb/core/src/engine"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func DB(config *engine.PluginConfig) (*mongo.Client, error) {
 	ctx := context.Background()
+	port := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Port", "27017")
+	queryParams := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Query Params", "")
 	var connectionString string
 	// TODO: add TLS enabled logic to work instead of hard coded domains
 	if config.Credentials.Hostname == "localhost" || config.Credentials.Hostname == "host.docker.internal" {
-		connectionString = fmt.Sprintf("mongodb://%s:%s@%s:%d/%s",
+		connectionString = fmt.Sprintf("mongodb://%s:%s@%s:%s/%s%s",
 			config.Credentials.Username,
 			config.Credentials.Password,
 			config.Credentials.Hostname,
-			27017,
-			config.Credentials.Database)
+			port,
+			config.Credentials.Database,
+			queryParams)
 	} else {
-		connectionString = fmt.Sprintf("mongodb+srv://%s:%s@%s/%s",
+		connectionString = fmt.Sprintf("mongodb+srv://%s:%s@%s/%s%s",
 			config.Credentials.Username,
 			config.Credentials.Password,
 			config.Credentials.Hostname,
-			config.Credentials.Database)
+			config.Credentials.Database,
+			queryParams)
 	}
 
 	clientOptions := options.Client().ApplyURI(connectionString)