Enable displaying FalkorDB version to customers in sas builder

.eslintrc.json

@@ -25,9 +25,23 @@
     "simple-import-sort/imports": "warn",
     "simple-import-sort/exports": "warn",
     "no-undef": "error",
-    "@typescript-eslint/no-unused-vars": "error",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
+    ],
     "@typescript-eslint/no-require-imports": "off",
-    "no-unused-vars": "error",
+    "no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
+    ],
     "react/jsx-uses-vars": "warn",
     "no-duplicate-imports": "error",
     "react/jsx-no-undef": "warn",

.github/dependabot.yml

@@ -10,25 +10,25 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    groups: 
+    groups:
       github-actions:
         dependency-type: "production"
         update-types:
-        - "minor"
-        - "patch"
+          - "minor"
+          - "patch"
 
-  - package-ecosystem: "npm" 
+  - package-ecosystem: "npm"
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-    groups: 
+    groups:
       npm-updates:
         dependency-type: "production"
         update-types:
-        - "minor"
-        - "patch"
+          - "minor"
+          - "patch"
 
-  - package-ecosystem: "docker" 
+  - package-ecosystem: "docker"
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "weekly"

.github/workflows/package.yml

@@ -55,10 +55,10 @@
 
       - name: Build on linux/amd64 only
         timeout-minutes: 20
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.frontend
           platforms: linux/amd64
           push: false
           tags: ${{ steps.meta.outputs.tags }}
@@ -82,7 +82,7 @@
         uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           platforms: linux/arm64
 
@@ -90,7 +90,7 @@
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -101,7 +101,7 @@
 
       - name: Build on linux/arm64 only
         timeout-minutes: 20
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
@@ -174,10 +174,10 @@
       - name: Build and push ${{ matrix.platform }} by digest
         id: build
         timeout-minutes: 30
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.frontend
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
           annotations: ${{ steps.meta.outputs.annotations }}
@@ -221,13 +221,13 @@
           path: /tmp/digests
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -240,7 +240,7 @@
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name == 'release'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -262,7 +262,7 @@
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name == 'release'
         uses: sigstore/cosign-installer@main
 
       # Sign the resulting Docker image digest except on PRs.
       # https://github.com/sigstore/cosign

.github/workflows/playwright.yml

@@ -73,50 +73,3 @@ jobs:
           name: playwright-report
           path: playwright-report/
           retention-days: 7
-
-  mattermost-notification-1:
-    name: Notify Mattermost
-    runs-on: ubuntu-latest
-    needs: test
-    if: always() && (needs.test.result == 'success' || needs.test.result == 'failure' || needs.test.result == 'cancelled')
-    steps:
-      - name: Mattermost Notification
-        uses: tferreira/matterfy@v1.9
-        with:
-          type: ${{ needs.test.result }}
-          job_name: "*Playwright Tests - SaaSBuilder*"
-          url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
-
-  mattermost-notification-2:
-    name: Notify Commits on Mattermost
-    runs-on: ubuntu-latest
-    needs: test
-    if: always() && (needs.test.result == 'failure' || needs.test.result == 'cancelled')
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Mattermost Notification
-        run: |
-          # Get commits since last successful workflow run
-          # This gets commits from the last 8 hours as a fallback approach
-          SINCE_DATE=$(date -d '8 hours ago' --iso-8601)
-          COMMITS=$(git log --oneline --since="$SINCE_DATE" --pretty=format:"• %h %s (%an)")
-
-          # If no commits in last 8 hours, get last 3 commits
-          if [ -z "$COMMITS" ]; then
-            COMMITS=$(git log --oneline -3 --pretty=format:"• %h %s (%an)")
-          fi
-
-          MESSAGE="❌ @channel SaaSBuilder Playwright tests failed! Please investigate immediately.
-
-          **Recent commits:**
-          $COMMITS"
-
-          # Escape the message for JSON
-          MESSAGE_JSON=$(echo "$MESSAGE" | jq -Rs .)
-
-          curl -X POST -H 'Content-type: application/json' \
-          --data "{\"text\":$MESSAGE_JSON}" \
-          ${{ secrets.MATTERMOST_WEBHOOK_URL }}

.gitignore

@@ -14,6 +14,7 @@
 
 # production
 /build
+/dist
 
 # misc
 .DS_Store

.vscode/settings.json

@@ -4,5 +4,8 @@
   "typescript.updateImportsOnFileMove.enabled": "always",
   "editor.codeActionsOnSave": {
     "source.fixAll": "always"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   }
 }

Dockerfile → Dockerfile.frontend

@@ -22,7 +22,16 @@ RUN yarn install --frozen-lockfile --production=false --network-timeout 1000000
 COPY --link . .
 
 # Build application
-RUN yarn run build
+RUN --mount=type=cache,target=/root/.cache/yarn \
+    yarn run build:frontend
+
+# Remove development dependencies
+RUN --mount=type=cache,target=/root/.cache/yarn \
+    yarn install --production=true --network-timeout 1000000
+
+# Remove development dependencies
+RUN --mount=type=cache,target=/root/.cache/yarn \
+    yarn install --production=true --network-timeout 1000000
 
 # Final stage for app image
 FROM base

Dockerfile.mail

@@ -0,0 +1,56 @@
+# syntax = docker/dockerfile:1
+
+# Adjust NODE_VERSION as desired
+ARG NODE_VERSION=20.11.1
+FROM node:${NODE_VERSION}-slim as base
+
+# App lives here
+WORKDIR /app
+
+# Set production environment
+ENV NODE_ENV="production"
+ARG YARN_VERSION=1.22.21
+RUN npm install -g yarn@$YARN_VERSION --force
+
+
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to build node modules
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3
+
+# Install node modules
+COPY --link package.json yarn.lock ./
+RUN yarn install --frozen-lockfile --production=false
+
+# Copy application code
+COPY --link . .
+
+# Build application
+RUN yarn run build:mail
+
+# Remove development dependencies
+RUN yarn install --production=true
+
+
+# Final stage for app image
+FROM base
+
+ENV NODE_ENV production
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+# Copy built application
+COPY --from=build /app /app
+COPY --from=build /app/src/server/mail-service/ejsTemplates /app/dist/ejsTemplates
+
+RUN chown -R nextjs:nodejs /app
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+
+USER nextjs
+
+
+CMD [ "node", "dist/mail-server/index.js" ]

app/(dashboard)/alerts/components/NotificationsTable.tsx

@@ -8,7 +8,7 @@ import ServiceNameWithLogo from "src/components/ServiceNameWithLogo/ServiceNameW
 import { useGlobalData } from "src/providers/GlobalDataProvider";
 import { EventType } from "src/types/event";
 import { ResourceInstance } from "src/types/resourceInstance";
-import formatDateUTC from "src/utils/formatDateUTC";
+import formatDateLocal from "src/utils/formatDateLocal";
 
 import NotificationsTableHeader from "./NotificationsTableHeader";
 import MessageInput from "src/components/MessageInput/MessageInput";
@@ -49,7 +49,7 @@ const NotificationsTable = () => {
         const upgradePath = instance.maintenanceTasks?.upgrade_paths?.[0];
         const status = upgradePath?.upgrade_status;
         const scheduledTime = upgradePath?.upgrade_path_scheduled_at;
-        const message = `Upgrade is ${statusMap[status] || status}${scheduledTime ? " at " + formatDateUTC(scheduledTime) : ""}`;
+        const message = `Upgrade is ${statusMap[status] || status}${scheduledTime ? " at " + formatDateLocal(scheduledTime) : ""}`;
         return {
           ...instance,
           message,

app/(dashboard)/cloud-accounts/page.tsx

@@ -25,7 +25,7 @@ import {
   getGcpBootstrapShellCommand,
   getGcpShellScriptOffboardCommand,
 } from "src/utils/accountConfig/accountConfig";
-import formatDateUTC from "src/utils/formatDateUTC";
+import formatDateLocal from "src/utils/formatDateLocal";
 import { getCloudAccountsRoute } from "src/utils/routes";
 import CloudProviderAccountOrgIdModal from "components/CloudProviderAccountOrgIdModal/CloudProviderAccountOrgIdModal";
 import DataGridText from "components/DataGrid/DataGridText";
@@ -412,11 +412,11 @@ const CloudAccountsPage = () => {
           header: "Subscription Owner",
         }
       ),
-      columnHelper.accessor((row) => formatDateUTC(row.created_at), {
+      columnHelper.accessor((row) => formatDateLocal(row.created_at), {
         id: "created_at",
         header: "Created On",
         cell: (data) => {
-          return data.row.original.created_at ? formatDateUTC(data.row.original.created_at) : "-";
+          return data.row.original.created_at ? formatDateLocal(data.row.original.created_at) : "-";
         },
         meta: {
           minWidth: 225,

app/(dashboard)/components/EventsTable/EventsTable.tsx

@@ -13,7 +13,7 @@ import ServiceNameWithLogo from "src/components/ServiceNameWithLogo/ServiceNameW
 import { useGlobalData } from "src/providers/GlobalDataProvider";
 import { AuditEvent } from "src/types/auditEvent";
 import { EventType } from "src/types/event";
-import formatDateUTC from "src/utils/formatDateUTC";
+import formatDateLocal from "src/utils/formatDateLocal";
 import { getAccessControlRoute } from "src/utils/route/access/accessRoute";
 
 const columnHelper = createColumnHelper<AuditEvent>();
@@ -109,10 +109,10 @@ const EventsTable = ({
         header: "Resource Name",
         enableSorting: false,
       }),
-      time: columnHelper.accessor((row) => formatDateUTC(row.time), {
+      time: columnHelper.accessor((row) => formatDateLocal(row.time), {
         id: "time",
         header: "Time",
-        cell: (data) => (data.row.original.time ? formatDateUTC(data.row.original.time) : "-"),
+        cell: (data) => (data.row.original.time ? formatDateLocal(data.row.original.time) : "-"),
         meta: {
           minWidth: 200,
         },

app/(dashboard)/components/Layout/Sidebar.tsx

@@ -142,7 +142,7 @@ type Overlay = "plan-details" | "documentation" | "pricing" | "support" | "api-d
 
 const Sidebar = () => {
   const currentPath = usePathname();
-  const { serviceOfferings } = useGlobalData();
+  const { serviceOfferings, subscriptions } = useGlobalData();
   const [isOverlayOpen, setIsOverlayOpen] = useState(false);
   const [overlayType, setOverlayType] = useState<Overlay>("plan-details");
   const [expandedMenus, setExpandedMenus] = useState({
@@ -171,17 +171,21 @@ const Sidebar = () => {
 
   const showCloudProvidersPage = useMemo(() => {
     return Boolean(
-      serviceOfferings.find(
-        (offering) => offering.serviceModelType === "BYOA" || offering.serviceModelType === "ON_PREM_COPILOT"
-      )
+      subscriptions.find(s => {
+        const offering = serviceOfferings.find(o => s.productTierId === o.productTierID);
+        return offering?.serviceModelType === "BYOA" || offering?.serviceModelType === "ON_PREM_COPILOT"
+      })
     );
-  }, [serviceOfferings]);
+  }, [serviceOfferings, subscriptions]);
 
   const showCustomNetworksPage = useMemo(() => {
     return Boolean(
-      serviceOfferings.some((offering) => offering.serviceModelFeatures?.find((el) => el.feature === "CUSTOM_NETWORKS"))
+      subscriptions.find(s => {
+        const offering = serviceOfferings.find(o => s.productTierId === o.productTierID)
+        return offering?.serviceModelFeatures?.find((el) => el.feature === "CUSTOM_NETWORKS");
+      })
     );
-  }, [serviceOfferings]);
+  }, [serviceOfferings, subscriptions]);
 
   // Prefetch Billing Data
   const billingStatusQuery = useBillingStatus();