Merge branch 'main' into 176-full-color-demo

Author: alishaevn

.env

@@ -6,6 +6,4 @@ NEXT_PUBLIC_PROVIDER_NAME=beachsidebiotech
 NEXT_PUBLIC_PROVIDER_ID=5159
 NEXT_PUBLIC_SCIENTIST_API_VERSION=v2
 
-# values to use for testing
-TEST_SCIENTIST_USER=[email protected]
-TEST_SCIENTIST_PW=!test1234
+SENTRY_DSN=https://[email protected]/4504805305810944

charts/webstore/templates/deployment.yaml

@@ -50,6 +50,8 @@ spec:
               value: "{{ .Values.clientSecret }}"
             - name: CLIENT_ID
               value: "{{ .Values.clientId }}"
+            - name: SENTRY_DSN
+              value: "{{ .Values.sentryDsn }}"
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

cypress.config.js

@@ -1,5 +1,4 @@
-require('dotenv').config({ path: `.env.local`, override: true })
-
+const dotenvFlowPlugin = require('cypress-dotenv-flow')
 const { defineConfig } = require("cypress")
 
 module.exports = defineConfig({
@@ -14,11 +13,18 @@ module.exports = defineConfig({
     baseUrl: 'http://localhost:3000',
     chromeWebSecurity: false,
     setupNodeEvents(on, config) {
+      config = dotenvFlowPlugin(config)
       config.env = {
         ...process.env,
         ...config.env
       }
       return config 
     },
   },
+  env: {
+    TEST_SCIENTIST_USER: '[email protected]',
+    TEST_SCIENTIST_PW: '!test1234',
+    NEXT_PUBLIC_PROVIDER_NAME: 'acme',
+    NEXT_PUBLIC_PROVIDER_ID: '572'
+  },
 });

cypress/fixtures/services/no-wares.json

@@ -0,0 +1,3 @@
+{
+  "ware_refs": []
+}

cypress/fixtures/services/wares.json

@@ -0,0 +1,40 @@
+{
+  "ware_refs": [
+      {
+          "id": 1234,
+          "slug": "example-ware",
+          "name": "Example Ware 1",
+          "snippet": "This is an example snippet.",
+          "urls": {
+              "promo_image": "https://nick-intl.mtvnimages.com/uri/mgid:file:http:shared:media.mtvi.com/MBUS/GeoLocal/GB/mtv/201804/VIAVIMNUKC5966866/toons_spongebob_228_tinyfriends_3123_image_640x360.jpg?quality=1&height=360&width=640&matte=true&crop=false"
+          }
+      },
+      {
+        "id": 2345,
+        "slug": "example-ware-2",
+        "name": "Example Ware 2",
+        "snippet": "Second Example Ware.",
+        "urls": {
+            "promo_image": "https://imgix.ranker.com/user_node_img/50101/1002011886/original/no-one-did-photo-u1?auto=format&q=60&fit=crop&fm=pjpg&dpr=2&w=375"
+        }
+      },
+      {
+        "id": 3456,
+        "slug": "test-ware",
+        "name": "Test Ware",
+        "snippet": "Here is a test ware snippet.",
+        "urls": {
+            "promo_image": "https://y.yarn.co/193fa4ae-a245-4f7a-ac9d-64bbebb18c8d_screenshot.jpg"
+        }
+    },
+    {
+      "id": 4567,
+      "slug": "another-test-ware",
+      "name": "Another Test Ware",
+      "snippet": "Another test snippet.",
+      "urls": {
+          "promo_image": "https://cdn.drawception.com/images/panels/2017/7-2/jtqKRKSpyj-6.png"
+      }
+    }
+  ]
+}

ops/staging-deploy.tmpl.yaml

@@ -7,7 +7,7 @@ nextPublicToken: $NEXT_PUBLIC_TOKEN
 nextAuthSecret: $NEXTAUTH_SECRET
 clientSecret: $CLIENT_SECRET
 clientId: $CLIENT_ID
-
+sentryDsn: 'https://[email protected]/4504805305810944'
 replicaCount: 1
 
 image:

package.json

@@ -19,6 +19,8 @@
     "@rjsf/utils": "^5.0.0-beta.17",
     "@rjsf/validator-ajv8": "^5.0.1",
     "@scientist-softserv/webstore-component-library": "^0.1.15",
+    "@sentry/react": "^7.42.0",
+    "@sentry/tracing": "^7.42.0",
     "axios": "^1.1.3",
     "bootstrap": "^5.2.3",
     "next": "12.3.1",
@@ -33,7 +35,9 @@
     "@testing-library/react": "^13.4.0",
     "cypress": "^12.1.0",
     "cypress-dotenv": "^2.0.0",
+    "cypress-dotenv-flow": "^1.2.2",
     "dotenv": "^16.0.3",
+    "dotenv-flow": "^3.2.0",
     "eslint": "8.25.0",
     "eslint-config-next": "12.3.1",
     "jest": "^29.3.1",

pages/_app.js

@@ -1,3 +1,5 @@
+import { Integrations } from '@sentry/tracing'
+import * as Sentry from '@sentry/react'
 import { Footer, Header } from '@scientist-softserv/webstore-component-library'
 import { SWRConfig } from 'swr'
 import {
@@ -17,6 +19,14 @@ import {
 } from '../utils'
 import '../utils/theme/globals.scss'
 
+Sentry.init({
+  dsn: process.env.SENTRY_DSN,
+  integrations: [
+    new Integrations.BrowserTracing(),
+  ],
+  tracesSampleRate: 1.0,
+})
+
 const WebStore = ({ Component }) => {
   const { data: session } = useSession()
 

pages/browse/index.js

@@ -35,6 +35,7 @@ const Browse = () => {
   if (isError) {
     return (
       <Notice
+        addClass='my-5'
         alert={configureErrors([isError])}
         dismissible={false}
         withBackButton={true}

pages/index.js

@@ -49,6 +49,7 @@ const Home = () => {
           <Notice
             alert={configureErrors([isError])}
             withBackButton={false}
+            addClass='my-5'
           />
         ) : (
           <>