Label studio & sidebar & mobile fixes

apps/leafcutter/package.json

@@ -17,14 +17,14 @@
     "@emotion/react": "^11.11.1",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "@fontsource/playfair-display": "^5.0.11",
+    "@fontsource/playfair-display": "^5.0.12",
     "@fontsource/poppins": "^5.0.8",
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5",
     "@mui/lab": "^5.0.0-alpha.143",
     "@mui/material": "^5",
-    "@mui/x-data-grid-pro": "^6.12.1",
+    "@mui/x-data-grid-pro": "^6.13.0",
-    "@mui/x-date-pickers-pro": "^6.12.1",
+    "@mui/x-date-pickers-pro": "^6.13.0",
     "@opensearch-project/opensearch": "^2.3.1",
     "cryptr": "^6.3.0",
     "date-fns": "^2.30.0",
@@ -36,7 +36,7 @@
     "next-http-proxy-middleware": "^1.2.5",
     "nodemailer": "^6.9.5",
     "react": "18.2.0",
-    "react-cookie": "^6.1.0",
+    "react-cookie": "^6.1.1",
     "react-cookie-consent": "^8.0.1",
     "react-dom": "18.2.0",
     "react-iframe": "^1.8.5",
@@ -48,12 +48,12 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.15",
+    "@babel/core": "^7.22.17",
-    "@types/node": "^20.5.9",
+    "@types/node": "^20.6.0",
     "@types/react": "18.2.21",
     "@types/uuid": "^9.0.3",
     "babel-loader": "^9.1.3",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-next": "^13.4.19",
     "eslint-config-prettier": "^9.0.0",

apps/link/app/(main)/_components/Sidebar.tsx

@@ -315,7 +315,19 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
             sx={{ height: "0.5px", width: "100%", backgroundColor: "#666" }}
           />
         </Grid>
-        <Grid item container direction="column" sx={{ mt: "6px" }} flexGrow={1}>
+        <Grid
+          item
+          container
+          direction="column"
+          sx={{
+            mt: "6px",
+            overflow: "scroll",
+            scrollbarWidth: "none",
+            msOverflowStyle: "none",
+            "&::-webkit-scrollbar": { display: "none" },
+          }}
+          flexGrow={1}
+        >
           <List
             component="nav"
             sx={{

apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx

@@ -14,7 +14,7 @@ export const LabelStudioWrapper: FC = () => (
     <Grid item sx={{ height: "100vh", width: "100%" }}>
       <Iframe
         id="label-studio"
-        url={"/proxy/label-studio"}
+        url={"/label-studio"}
         width="100%"
         height="100%"
         frameBorder={0}

apps/link/middleware.ts

@@ -24,7 +24,6 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
   const { token } = request.nextauth;
   const headers = { 'X-Forwarded-User': token?.email?.toLowerCase() };
 
-  console.log(request.nextUrl);
   if (request.nextUrl.pathname.startsWith('/metamigo')) {
     return rewriteURL(request, `${linkBaseURL}/metamigo`, metamigoURL);
   } else if (request.nextUrl.pathname.startsWith('/label-studio')) {
@@ -35,7 +34,7 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
     return rewriteURL(request, linkBaseURL, zammadURL, headers);
   } else if (request.nextUrl.pathname.startsWith('/proxy/api') || request.nextUrl.pathname.startsWith('/proxy/assets')) {
     return rewriteURL(request, `${linkBaseURL}/proxy`, zammadURL);
-  } else if (request.nextUrl.pathname.startsWith('/api/v1') || request.nextUrl.pathname.startsWith('/auth/sso')) {
+  } else if (request.nextUrl.pathname.startsWith('/api/v1') || request.nextUrl.pathname.startsWith('/auth/sso') || request.nextUrl.pathname.startsWith('/mobile')) {
     return rewriteURL(request, linkBaseURL, zammadURL, headers);
   }
 

apps/link/package.json

@@ -15,14 +15,14 @@
     "@emotion/react": "^11.11.1",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "@fontsource/playfair-display": "^5.0.11",
+    "@fontsource/playfair-display": "^5.0.12",
     "@fontsource/poppins": "^5.0.8",
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5",
     "@mui/lab": "^5.0.0-alpha.143",
     "@mui/material": "^5",
-    "@mui/x-data-grid-pro": "^6.12.1",
+    "@mui/x-data-grid-pro": "^6.13.0",
-    "@mui/x-date-pickers-pro": "^6.12.1",
+    "@mui/x-date-pickers-pro": "^6.13.0",
     "cryptr": "^6.3.0",
     "date-fns": "^2.30.0",
     "graphql-request": "^6.1.0",
@@ -31,14 +31,14 @@
     "mui-chips-input": "^2.1.3",
     "next": "13.4.19",
     "next-auth": "^4.23.1",
-    "ra-data-graphql": "^4.13.0",
+    "ra-data-graphql": "^4.14.0",
-    "ra-i18n-polyglot": "^4.13.3",
+    "ra-i18n-polyglot": "^4.14.0",
-    "ra-input-rich-text": "^4.13.3",
+    "ra-input-rich-text": "^4.14.0",
-    "ra-language-english": "^4.13.3",
+    "ra-language-english": "^4.14.0",
     "ra-postgraphile": "^6.1.1",
     "react": "18.2.0",
-    "react-admin": "^4.13.3",
+    "react-admin": "^4.14.0",
-    "react-cookie": "^6.1.0",
+    "react-cookie": "^6.1.1",
     "react-digit-input": "^2.1.0",
     "react-dom": "18.2.0",
     "react-iframe": "^1.8.5",
@@ -51,12 +51,12 @@
     "twilio-client": "^1.15.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.15",
+    "@babel/core": "^7.22.17",
-    "@types/node": "^20.5.9",
+    "@types/node": "^20.6.0",
     "@types/react": "18.2.21",
     "@types/uuid": "^9.0.3",
     "babel-loader": "^9.1.3",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-next": "^13.4.19",
     "eslint-config-prettier": "^9.0.0",

apps/metamigo-api/package.json

@@ -41,7 +41,7 @@
     "postgraphile": "4.12.3",
     "postgraphile-plugin-connection-filter": "^2.3.0",
     "remeda": "^1.26.0",
-    "twilio": "^4.16.0",
+    "twilio": "^4.17.0",
     "typeorm": "^0.3.17",
     "@whiskeysockets/baileys": "^6.4.1"
   },

apps/metamigo-worker/package.json

@@ -15,17 +15,17 @@
     "node-fetch": "^3",
     "pg-promise": "^11.5.4",
     "remeda": "^1.26.0",
-    "twilio": "^4.16.0"
+    "twilio": "^4.17.0"
   },
   "devDependencies": {
-    "@babel/core": "7.22.15",
+    "@babel/core": "7.22.17",
     "@babel/preset-env": "7.22.15",
     "@babel/preset-typescript": "7.22.15",
     "@types/fluent-ffmpeg": "^2.1.21",
     "@types/jest": "^29.5.4",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
-    "jest-circus": "^29.6.4",
+    "jest-circus": "^29.7.0",
     "jest-junit": "^16.0.0",
     "nodemon": "^3.0.1",
     "pino-pretty": "^10.2.0",

docker-compose.label-studio.yml

@@ -6,7 +6,7 @@ services:
     build: ./docker/label-studio
     restart: ${RESTART}
     ports:
-      - 127.0.0.1:8006:8080
+      - 8007:8080
     environment:
       DJANGO_DB: default
       LABEL_STUDIO_DISABLE_SIGNUP_WITHOUT_LINK: "false"
@@ -15,4 +15,4 @@ services:
       POSTGRE_PASSWORD: ${METAMIGO_DATABASE_ROOT_PASSWORD}
       POSTGRE_PORT: "5432"
       POSTGRE_HOST: "metamigo-postgresql"
-      LABEL_STUDIO_HOST: "http://localhost:3000/proxy/label-studio/"
+      LABEL_STUDIO_HOST: "https://cdr.tiger-agama.ts.net/label-studio"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "link-stack",
-  "version": "2.0.0b3",
+  "version": "2.0.0b4",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -9,11 +9,11 @@
     "dev:metamigo": "dotenv -- turbo run dev --concurrency 30 --filter=!link --filter=!leafcutter",
     "migrate": "dotenv -- npm run migrate --workspace=@digiresilience/metamigo-cli",
     "fmt": "turbo run fmt",
-    "docker:all:up": "CURRENT_UID=$(CURRENT_UID) docker compose -f docker-compose.zammad.yml -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.opensearch.yml -f docker-compose.leafcutter.yml -f docker-compose.link.yml up -d",
+    "docker:all:up": "CURRENT_UID=$(CURRENT_UID) docker compose -f docker-compose.zammad.yml -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.opensearch.yml -f docker-compose.leafcutter.yml -f docker-compose.link.yml -f docker-compose.label-studio.yml up -d",
     "docker:all:down": "docker compose -f docker-compose.zammad.yml -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.opensearch.yml -f docker-compose.leafcutter.yml -f docker-compose.link.yml down",
     "docker:all:build": "docker compose -f docker-compose.zammad.yml -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.opensearch.yml -f docker-compose.leafcutter.yml -f docker-compose.link.yml up --build -d",
-    "docker:link:dev:up": "docker compose -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.zammad.yml up -d",
+    "docker:link:dev:up": "docker compose -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.zammad.yml -f docker-compose.label-studio.yml up -d",
-    "docker:link:dev:down": "docker compose -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.zammad.yml down",
+    "docker:link:dev:down": "docker compose -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.zammad.yml -f docker-compose.label-studio.yml down",
     "docker:link:up": "docker compose -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.zammad.yml -f docker-compose.link.yml up -d",
     "docker:link:down": "docker compose -f docker-compose.metamigo-postgresql.yml -f docker-compose.metamigo.yml -f docker-compose.zammad.yml -f docker-compose.link.yml down",
     "docker:link:build": "docker compose -f docker-compose.link.yml up --build -d",

packages/babel-preset-link/package.json

@@ -9,12 +9,12 @@
     "lint": "eslint index.js"
   },
   "dependencies": {
-    "@babel/core": "7.22.15",
+    "@babel/core": "7.22.17",
     "@babel/preset-env": "7.22.15",
     "@babel/preset-typescript": "7.22.15"
   },
   "peerDependencies": {},
   "devDependencies": {
-    "eslint": "^8.48.0"
+    "eslint": "^8.49.0"
   }
 }

packages/eslint-config-link/package.json

@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@rushstack/eslint-patch": "^1.3.3",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/parser": "^6.7.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-xo-space": "^0.34.0",
     "eslint-plugin-cypress": "^2.14.0",
@@ -28,8 +28,8 @@
     "typescript": "^4.9.5"
   },
   "devDependencies": {
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "typescript": "^5.2.2"
   }
 }

packages/jest-config-link/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@types/jest": "^29.5.4",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "jest-junit": "^16.0.0"
   },
   "peerDependencies": {}

packages/leafcutter-common/package.json

@@ -9,14 +9,14 @@
     "@emotion/react": "^11.11.1",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "@fontsource/playfair-display": "^5.0.11",
+    "@fontsource/playfair-display": "^5.0.12",
     "@fontsource/poppins": "^5.0.8",
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5",
     "@mui/lab": "^5.0.0-alpha.143",
     "@mui/material": "^5",
-    "@mui/x-data-grid-pro": "^6.12.1",
+    "@mui/x-data-grid-pro": "^6.13.0",
-    "@mui/x-date-pickers-pro": "^6.12.1",
+    "@mui/x-date-pickers-pro": "^6.13.0",
     "@opensearch-project/opensearch": "^2.3.1",
     "date-fns": "^2.30.0",
     "http-proxy-middleware": "^2.0.6",
@@ -26,7 +26,7 @@
     "next-http-proxy-middleware": "^1.2.5",
     "nodemailer": "^6.9.5",
     "react": "18.2.0",
-    "react-cookie": "^6.1.0",
+    "react-cookie": "^6.1.1",
     "react-cookie-consent": "^8.0.1",
     "react-dom": "18.2.0",
     "react-iframe": "^1.8.5",
@@ -38,12 +38,12 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.15",
+    "@babel/core": "^7.22.17",
-    "@types/node": "^20.5.9",
+    "@types/node": "^20.6.0",
     "@types/react": "18.2.21",
     "@types/uuid": "^9.0.3",
     "babel-loader": "^9.1.3",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-next": "^13.4.19",
     "eslint-config-prettier": "^9.0.0",

packages/metamigo-common/package.json

@@ -56,7 +56,7 @@
     "lodash": "^4.17.21",
     "next-auth": "^4.23.1",
     "pg-promise": "^11.5.4",
-    "pino": "^8.15.0",
+    "pino": "^8.15.1",
     "pino-pretty": "^10.2.0",
     "prom-client": "^14.x.x",
     "uuid": "^9.0.0"

packages/metamigo-config/package.json

@@ -10,10 +10,10 @@
     "@digiresilience/montar": "*"
   },
   "devDependencies": {
-    "@babel/core": "7.22.15",
+    "@babel/core": "7.22.17",
     "@babel/preset-env": "7.22.15",
     "@babel/preset-typescript": "7.22.15",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "pino-pretty": "^10.2.0",
     "prettier": "^3.0.3",
     "ts-node": "^10.9.1",

packages/metamigo-db/package.json

@@ -16,12 +16,12 @@
     "pg-promise": "^11.5.4"
   },
   "devDependencies": {
-    "@babel/core": "7.22.15",
+    "@babel/core": "7.22.17",
     "@babel/preset-env": "7.22.15",
     "@babel/preset-typescript": "7.22.15",
     "@types/jest": "^29.5.4",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
     "pino-pretty": "^10.2.0",
     "prettier": "^3.0.3",