Merge pull request #579 from clidey/hk/feature/change-to-clidey-ux

Hk/feature/change to clidey ux

Author: hkdeman

core/Dockerfile

@@ -21,7 +21,6 @@ COPY ./frontend/ ./
 
 # Create empty EE modules for Vite to resolve during CE build
 RUN mkdir -p ee/frontend/src/components/theme ee/frontend/src/components/charts ee/frontend/src/pages/raw-execute ee/frontend/src && \
-    echo "export default {}; export const ThemeConfig = {};" > ee/frontend/src/components/theme/theme.ts && \
     echo "export default {}; export const LineChart = () => null;" > ee/frontend/src/components/charts/line-chart.tsx && \
     echo "export default {}; export const PieChart = () => null;" > ee/frontend/src/components/charts/pie-chart.tsx && \
     echo "export default {}; export const AnalyzeGraph = () => null;" > ee/frontend/src/pages/raw-execute/analyze-view.tsx && \

core/Dockerfile.ee

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # WhoDB Enterprise Edition Dockerfile
-# Build from project root: docker build -f ee/Dockerfile -t whodb:ee .
+# Build from project root: docker build -f core/Dockerfile.ee -t whodb:ee .
 
 # Build frontend with EE modules
 FROM node:lts-alpine AS build-stage
@@ -37,8 +37,8 @@ FROM golang:1.24.1-alpine AS backend-stage
 RUN apk update && apk add --no-cache gcc musl-dev git bash
 WORKDIR /app
 
-# Copy scripts first as they're needed for GraphQL generation
-COPY ./scripts/ ./scripts/
+# Copy EE workspace file
+COPY ./go.work.ee ./
 
 # Copy core module files
 COPY ./core/go.mod ./core/go.sum ./core/
@@ -55,22 +55,14 @@ RUN go mod download
 WORKDIR /app
 COPY ./core/ ./core/
 COPY ./ee/ ./ee/
+COPY ./scripts/ ./scripts/
 
 # Copy frontend build to be embedded
 COPY --from=build-stage /app/build/ ./core/build/
 
-# Generate GraphQL code for EE
-# First ensure we have all the dependencies for gqlgen
-WORKDIR /app/ee
-RUN go mod download
-WORKDIR /app
-
-# Build backend with EE features
+# Build backend with EE features using workspace
 WORKDIR /app/core
-# Add replace directive for EE module
-RUN go mod edit -replace github.com/clidey/whodb/ee=/app/ee && \
-    go mod tidy && \
-    CGO_ENABLED=1 GOOS=linux go build -tags ee -o /core
+RUN GOWORK=/app/go.work.ee CGO_ENABLED=1 GOOS=linux go build -tags ee -o /core
 
 # Final stage
 FROM alpine:3.22.1

core/src/plugins/gorm/utils.go

@@ -30,7 +30,7 @@ import (
 )
 
 var (
-	intTypes      = mapset.NewSet("INTEGER", "SMALLINT", "BIGINT", "INT", "TINYINT", "MEDIUMINT", "INT8", "INT16", "INT32", "INT64")
+	intTypes      = mapset.NewSet("INTEGER", "SMALLINT", "BIGINT", "INT", "TINYINT", "MEDIUMINT", "INT4", "INT8", "INT16", "INT32", "INT64")
 	uintTypes     = mapset.NewSet("TINYINT UNSIGNED", "SMALLINT UNSIGNED", "MEDIUMINT UNSIGNED", "BIGINT UNSIGNED", "UINT8", "UINT16", "UINT32", "UINT64")
 	floatTypes    = mapset.NewSet("REAL", "NUMERIC", "DOUBLE PRECISION", "FLOAT", "NUMBER", "DOUBLE", "DECIMAL")
 	boolTypes     = mapset.NewSet("BOOLEAN", "BIT", "BOOL")

frontend/.postcssrc.json

@@ -2,8 +2,10 @@
   "name": "frontend",
   "version": "0.1.0",
   "private": true,
+  "type": "module",
   "dependencies": {
     "@apollo/client": "^3.13.8",
+    "@clidey/ux": "^0.15.0",
     "@codemirror/lang-json": "^6.0.2",
     "@codemirror/lang-markdown": "^6.3.3",
     "@codemirror/lang-sql": "^6.9.0",
@@ -12,7 +14,9 @@
     "@codemirror/view": "^6.38.1",
     "@dagrejs/dagre": "^1.1.5",
     "@emotion/is-prop-valid": "^1.3.1",
+    "@heroicons/react": "^2.2.0",
     "@reduxjs/toolkit": "^2.8.2",
+    "@tailwindcss/vite": "^4.1.11",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
     "@types/react-table": "^7.7.20",
@@ -35,6 +39,7 @@
     "redux-persist": "^6.0.0",
     "remark-gfm": "^4.0.1",
     "tailwind-merge": "^3.3.1",
+    "tw-animate-css": "^1.3.6",
     "uuid": "^11.1.0"
   },
   "scripts": {
@@ -43,13 +48,11 @@
     "build": "tsc -p tsconfig.ce.json && vite build",
     "build:ce": "tsc -p tsconfig.ce.json && vite build",
     "build:ee": "VITE_BUILD_EDITION=ee vite build",
-    
     "# Primary test commands - use these for running tests": "",
     "cypress:ce": "pnpm run _test:ce:setup && bash ../dev/wait-for-services.sh && NODE_ENV=test pnpm cypress open; pnpm run _test:ce:cleanup",
     "cypress:ce:headless": "pnpm run _test:ce:setup && bash ../dev/wait-for-services.sh && NODE_ENV=test npx cypress run --browser chrome; pnpm run _test:ce:cleanup",
     "cypress:ee": "pnpm run _test:ee:setup && bash ../dev/wait-for-services.sh && NODE_ENV=test pnpm cypress open; pnpm run _test:ee:cleanup",
     "cypress:ee:headless": "pnpm run _test:ee:setup && bash ../dev/wait-for-services.sh && NODE_ENV=test npx cypress run --browser chrome; pnpm run _test:ee:cleanup",
-    
     "# Auxiliary test commands - not recommended for individual use": "",
     "_test:ce:setup": "bash ../dev/setup-e2e.sh && NODE_ENV=test vite --port 3000 &",
     "_test:ce:cleanup": "pkill -f 'vite --port 3000' || true; bash ../dev/cleanup-e2e.sh",
@@ -60,7 +63,6 @@
     "_cypress:ce:run": "NODE_ENV=test npx cypress run --browser chrome",
     "_cypress:ee:run": "NODE_ENV=test npx cypress run --browser chrome",
     "_cypress:run:chromium": "NODE_ENV=test npx cypress run --browser chromium",
-    
     "# Coverage and code generation utilities": "",
     "view:coverage": "npx nyc report --reporter=text-summary",
     "view:coverage:frontend": "npx nyc report --reporter=html",
@@ -88,17 +90,14 @@
     "@graphql-codegen/typescript": "^4.1.6",
     "@graphql-codegen/typescript-operations": "^4.6.1",
     "@graphql-codegen/typescript-react-apollo": "^4.3.3",
-    "@tailwindcss/postcss": "^4.1.11",
     "@types/lodash": "^4.17.20",
     "@types/react-window": "^1.8.8",
     "@types/uuid": "^10.0.0",
     "@vitejs/plugin-react": "^4.7.0",
-    "autoprefixer": "^10.4.21",
     "babel-plugin-istanbul": "^7.0.0",
     "buffer": "^6.0.3",
     "cypress": "^14.5.2",
     "nyc": "^17.1.0",
-    "postcss": "^8.5.6",
     "process": "^0.11.10",
     "tailwindcss": "^4.1.11",
     "typescript": "^5.8.3",