Merge branch 'master' into snyk-upgrade-544470fc21fee6b11e8f382b88214ea2

reapit · Dec 11, 2023 · a62646b · a62646b
2 parents 19027bc + c45ff9d
commit a62646b
Show file tree

Hide file tree

Showing 33 changed files with 172 additions and 80 deletions.
diff --git a/packages/admin-portal/package.json b/packages/admin-portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin-portal",
-  "version": "3.2.7",
+  "version": "4.0.0",
   "description": "Admin portal",
   "main": "./src/index.ts",
   "repository": "[email protected]:reapit/foundations.git",

diff --git a/packages/app-marketplace-admin/package.json b/packages/app-marketplace-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app-marketplace-admin",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "private": true,
   "description": "Description",
   "repository": {

diff --git a/packages/cognito-custom-mail-lambda/package.json b/packages/cognito-custom-mail-lambda/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cognito-custom-mail-lambda",
-  "version": "1.1.0",
+  "version": "1.2.3",
   "description": "Lambda Mailer Function",
   "files": [
     "dist"
@@ -12,7 +12,7 @@
     "build": "yarn generate-html && tsup && cd dist && zip -r app.zip app.js",
     "lint": "eslint --cache --ext=ts,tsx,js src",
     "check": "echo '...skipping...'",
-    "release": "serverless deploy && devops-release",
+    "release": "devops-release && serverless deploy",
     "release:devops": "devops-release",
     "deploy": "echo '...skipping...'",
     "publish": "echo '...skipping...'",

diff --git a/packages/data-warehouse/package.json b/packages/data-warehouse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "data-warehouse",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "private": true,
   "description": "Description",
   "repository": "[email protected]:reapit/foundations.git",

diff --git a/packages/developer-portal/package.json b/packages/developer-portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "developer-portal",
-  "version": "3.0.42",
+  "version": "4.0.1",
   "description": "Developer Portal for PAAS platform",
   "main": "./src/index.ts",
   "repository": "[email protected]:reapit/app-store.git",

diff --git a/packages/elements/package.json b/packages/elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reapit/elements",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0",
   "description": "A collection of React components and utilities for building apps for Reapit Marketplace",
   "homepage": "https://github.com/reapit/foundations#readme",
   "bugs": {

diff --git a/packages/elements/src/components/nav/nav-responsive.tsx b/packages/elements/src/components/nav/nav-responsive.tsx
@@ -124,7 +124,7 @@ export const NavResponsiveAppSwitcher: FC<NavResponsiveAppSwitcherProps> = ({ op
   const [appSwitcherOpen, setAppSwitcherOpen] = useState<boolean>(false)
 
   const marketplaceCallback = () => {
-    if (window.location.href.includes('dev') || window.location.href.includes('localhost')) {
+    if (window.location.href.includes('.dev.') || window.location.href.includes('localhost')) {
       window.location.href = 'https://marketplace.dev.paas.reapit.cloud/installed'
     } else {
       window.location.href = 'https://marketplace.reapit.cloud/installed'

diff --git a/packages/events-service/package.json b/packages/events-service/package.json
@@ -32,11 +32,11 @@
     "express-validator": "^6.14.0",
     "jwt-decode": "^3.1.2",
     "morgan": "^1.10.0",
-    "serialize-error": "^7.0.1",
+    "serialize-error": "^11.0.3",
     "serverless-dynamodb-local": "^0.2.40",
-    "serverless-http": "^2.7.0",
+    "serverless-http": "^3.2.0",
     "twilio": "^4.19.0",
-    "uuid": "^3.4.0"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@reapit/config-manager": "workspace:packages/config-manager",

diff --git a/packages/geo-diary/package.json b/packages/geo-diary/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geo-diary",
-  "version": "4.2.3",
+  "version": "5.0.1",
   "private": true,
   "description": "Reapit Geo Diary App",
   "repository": {

diff --git a/...-diary/src/components/pages/appointment/__tests__/__snapshots__/appointment.test.tsx.snap b/...-diary/src/components/pages/appointment/__tests__/__snapshots__/appointment.test.tsx.snap
@@ -249,7 +249,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -275,7 +277,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -301,7 +305,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -401,7 +407,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -427,7 +435,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -527,7 +537,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -553,7 +565,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -653,7 +667,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -679,7 +695,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -779,7 +797,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -879,7 +899,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -905,7 +927,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
               >
                 <mock-styled.div>
                   <mock-styled.span
-                    classname=""
+                    classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                   >
                     <svg />
                   </mock-styled.span>
@@ -1321,7 +1345,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1347,7 +1373,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1373,7 +1401,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1473,7 +1503,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1499,7 +1531,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1599,7 +1633,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1625,7 +1661,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1725,7 +1763,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1751,7 +1791,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1851,7 +1893,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1951,7 +1995,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>
@@ -1977,7 +2023,9 @@ exports[`appointment AppointmentContent should match snapshot when has appointme
             >
               <mock-styled.div>
                 <mock-styled.span
-                  classname=""
+                  classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
                 >
                   <svg />
                 </mock-styled.span>

diff --git a/...src/components/ui/appointment-list/__tests__/__snapshots__/appointment-list.test.tsx.snap b/...src/components/ui/appointment-list/__tests__/__snapshots__/appointment-list.test.tsx.snap
@@ -39,7 +39,9 @@ exports[`AppointmentList should match snapshot with appointments 1`] = `
           >
             <mock-styled.div>
               <mock-styled.span
-                classname=""
+                classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
               >
                 <svg />
               </mock-styled.span>
@@ -65,7 +67,9 @@ exports[`AppointmentList should match snapshot with appointments 1`] = `
           >
             <mock-styled.div>
               <mock-styled.span
-                classname=""
+                classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
               >
                 <svg />
               </mock-styled.span>
@@ -144,7 +148,9 @@ exports[`AppointmentList should match snapshot with appointments 1`] = `
         >
           <mock-styled.div>
             <mock-styled.span
-              classname=""
+              classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
             >
               <svg />
             </mock-styled.span>
@@ -170,7 +176,9 @@ exports[`AppointmentList should match snapshot with appointments 1`] = `
         >
           <mock-styled.div>
             <mock-styled.span
-              classname=""
+              classname="mock-css. mock-css.
+  font-size: 1.5rem;
+"
             >
               <svg />
             </mock-styled.span>