Deploy

data/schema.graphql

@@ -9337,6 +9337,7 @@ enum SearchEntity {
   SALE
   SHOW
   TAG
+  VIEWING_ROOM
 }
 
 enum SearchMode {

package.json

@@ -36,6 +36,7 @@
     "start:prod": "yarn assets && yarn build:server && NODE_ENV=production yarn start",
     "start": "scripts/start.sh",
     "storybook": "concurrently --raw --kill-others 'yarn relay --watch' 'start-storybook --quiet -s ./public -p 9001'",
+    "sync-schema": "scripts/sync-schema-pull.sh",
     "test:acceptance": "yarn acceptance src/test/acceptance/*.js",
     "test:smoke": "scripts/smoke_test.sh",
     "test": "scripts/test.sh",
@@ -285,6 +286,7 @@
     "babel-plugin-styled-components": "1.11.1",
     "benv": "3.3.0",
     "cache-loader": "1.2.2",
+    "case-sensitive-paths-webpack-plugin": "2.3.0",
     "coffee-loader": "0.8.0",
     "coffeescript": "1.11.1",
     "cypress": "5.1.0",

src/desktop/analytics/main_layout.ts

@@ -7,6 +7,8 @@ import { data as sd } from "sharify"
 import { reportLoadTimeToVolley } from "lib/volley"
 import { match } from "path-to-regexp"
 import { timeOnPageListener } from "./timeOnPageListener"
+import { getPageTypeFromClient } from "lib/getPageType"
+import { OwnerType } from "@artsy/cohesion"
 
 // We exclude these routes from analytics.page calls because they're already
 // taken care of in Reaction.
@@ -32,8 +34,7 @@ const excludedRoutes = [
 
 // Track pageview
 const pathname = new URL(window.location.href).pathname
-let slug = pathname.split("/")[2]
-let pageType = window.sd.PAGE_TYPE || pathname.split("/")[1]
+const { pageType, pageSlug } = getPageTypeFromClient()
 
 const foundExcludedPath = excludedRoutes.some(excludedPath => {
   const matcher = match(excludedPath, { decode: decodeURIComponent })
@@ -48,7 +49,7 @@ if (!foundExcludedPath) {
   )
 }
 
-if (pageType === "auction") {
+if (pageType === OwnerType.sale) {
   // Let reaction track reaction-based app routes
   const matcher = match("/auction/:saleID/bid(2)?/:artworkID", {
     decode: decodeURIComponent,
@@ -57,7 +58,7 @@ if (pageType === "auction") {
   if (!matchedBidRoute) {
     window.addEventListener("load", function () {
       // distinct event required for marketing integrations (Criteo)
-      window.analytics.track("Auction Pageview", { auction_slug: slug })
+      window.analytics.track("Auction Pageview", { auction_slug: pageSlug })
     })
   }
 }

src/desktop/analytics/timeOnPageListener.ts

@@ -1,11 +1,12 @@
 import { trackEvent } from "./helpers"
-import { OwnerType, timeOnPage } from "@artsy/cohesion"
+import { timeOnPage } from "@artsy/cohesion"
+import { getPageTypeFromClient } from "lib/getPageType"
 
 export const timeOnPageListener = (delay: number = 15000) => {
   setTimeout(() => {
+    const { pageType, pageSlug } = getPageTypeFromClient()
     const pathname = new URL(window.location.href).pathname
-    const slug = pathname.split("/")[2]
-    const pageType = window.sd.PAGE_TYPE || pathname.split("/")[1]
+
     const referrer = window.analytics.__artsyClientSideRoutingReferrer
     // Grab referrer from our trackingMiddleware in Reaction, since we're in a
     // single-page-app context and the value will need to be refreshed on route
@@ -18,12 +19,12 @@ export const timeOnPageListener = (delay: number = 15000) => {
         },
       }
     }
-    const contextPageOwnerSlug = pageType === "partner" ? pathname : slug
+    const contextPageOwnerSlug = pageType === "partner" ? pathname : pageSlug
 
     trackEvent(
       timeOnPage({
         contextPageOwnerSlug,
-        contextPageOwnerType: OwnerType[pageType],
+        contextPageOwnerType: pageType,
       }),
       trackingOptions
     )

src/desktop/apps/artsy-v2/apps/artist/artistMiddleware.tsx

@@ -1,10 +1,11 @@
-import { getPageType } from "../../utils/getPageType"
+import { OwnerType } from "@artsy/cohesion"
+import { getPageTypeFromReq } from "lib/getPageType"
 
 export const artistMiddleware = (req, res, next) => {
-  const { pageType, pageParts } = getPageType(req)
+  const { pageType, pageSlug } = getPageTypeFromReq(req)
 
-  if (pageType === "artist") {
-    const artistID = pageParts[2]
+  if (pageType === OwnerType.artist) {
+    const artistID = pageSlug
     const user = req.user && req.user.toJSON()
     const { APP_URL, IS_MOBILE, REFERRER } = res.locals.sd
     const isExternalReferer = !(REFERRER && REFERRER.includes(APP_URL))

src/desktop/apps/artsy-v2/apps/artwork/artworkClient.tsx

@@ -1,6 +1,8 @@
 import { enableIntercom } from "lib/intercom"
 import { recordArtworkView } from "lib/components/record_artwork_view"
 import { data as sd } from "sharify"
+import { getPageTypeFromClient } from "lib/getPageType"
+import { OwnerType } from "@artsy/cohesion"
 
 export const artworkClient = () => {
   const User = require("desktop/models/user.coffee")
@@ -13,11 +15,10 @@ export const artworkClient = () => {
 
   const $ = require("jquery")
   const mediator = require("desktop/lib/mediator.coffee")
-  const pageType = window.location.pathname.split("/")[1]
+  const { pageType, pageSlug } = getPageTypeFromClient()
 
-  if (pageType === "artwork") {
-    const artworkSlug = location.pathname.replace(/\/artwork\//, "")
-    recordArtworkView(artworkSlug, sd.CURRENT_USER)
+  if (pageType === OwnerType.artwork) {
+    recordArtworkView(pageSlug, sd.CURRENT_USER)
   }
 
   const openInquireableModal = (

src/desktop/apps/artsy-v2/apps/search/searchMiddleware.tsx

@@ -3,12 +3,13 @@ import { stringify } from "querystring"
 import { SearchResultsSkeleton } from "v2/Apps/Search/Components/SearchResultsSkeleton"
 import { StitchWrapper } from "desktop/components/react/stitch_components/StitchWrapper"
 import { stitch } from "@artsy/stitch"
-import { getPageType } from "../../utils/getPageType"
+import { getPageTypeFromReq } from "lib/getPageType"
+import { OwnerType } from "@artsy/cohesion"
 
 export const searchMiddleware = async (req, res, next) => {
-  const { pageType } = getPageType(req)
+  const { pageType } = getPageTypeFromReq(req)
 
-  if (pageType === "search") {
+  if (pageType === OwnerType.search) {
     try {
       if (!req.query.term) {
         if (req.query.q) {

src/desktop/apps/artsy-v2/client.tsx

@@ -6,6 +6,8 @@ import { data as sd } from "sharify"
 import { artworkClient } from "./apps/artwork/artworkClient"
 import { artistClient } from "./apps/artist/artistClient"
 import { loadableReady } from "@loadable/component"
+import { getPageTypeFromClient } from "lib/getPageType"
+import { OwnerType } from "@artsy/cohesion"
 
 const mediator = require("desktop/lib/mediator.coffee")
 
@@ -35,17 +37,17 @@ buildClientApp({
         <ClientApp />,
         document.getElementById("react-root"),
         () => {
-          const pageType = window.location.pathname.split("/")[1]
+          const { pageType } = getPageTypeFromClient()
 
-          if (pageType === "search") {
+          if (pageType === OwnerType.search) {
             document.getElementById("loading-container").remove()
             document.getElementById("search-page-header").remove()
           }
         }
       )
     })
   })
-  .catch((error) => {
+  .catch(error => {
     console.error(error)
   })
 

src/desktop/apps/artsy-v2/server.tsx

@@ -11,6 +11,7 @@ import { artistMiddleware } from "./apps/artist/artistMiddleware"
 import { userRequiredMiddleware } from "./middleware/userRequiredMiddleware"
 import { searchMiddleware } from "./apps/search/searchMiddleware"
 import { handleCollectionToArtistSeriesRedirect } from "./apps/collection/collectionMiddleware"
+import { getPageTypeFromReq } from "lib/getPageType"
 
 export const app = express()
 
@@ -58,8 +59,7 @@ app.get(
    */
   async (req: Request, res, next) => {
     try {
-      const pageParts = req.path.split("/")
-      const pageType = pageParts[1]
+      const { pageType } = getPageTypeFromReq(req)
 
       const {
         status,

src/desktop/assets/analytics.ts

@@ -44,11 +44,9 @@ $(() =>
     onAnalyticsReady()
     setupSplitTests()
 
-    require("../analytics/articles.js")
     require("../analytics/artwork.js")
     require("../analytics/consignments.js")
     require("../analytics/contact.js")
-    require("../analytics/embedded_inquiry.js")
     require("../analytics/galleries.js")
     require("../analytics/inquiry_questionnaire.js")
     require("../analytics/recently_viewed_artworks.js")

src/desktop/components/article/client/super_article.coffee

@@ -4,6 +4,11 @@ initCarousel = require '../../merry_go_round/horizontal_nav_mgr.coffee'
 sd = require('sharify').data
 
 module.exports = class SuperArticleView extends Backbone.View
+  events:
+    'click .article-sa-primary-logo a': 'trackPrimaryLogoClick'
+    'click .article-sa-secondary-logo a': 'trackSecondaryLogoClick'
+    'click .article-sa-cta-container a': 'trackCtaClick'
+    'click .article-sa-footer-blurb a': 'trackFooterBlurbClick'
 
   initialize: (options) ->
     { @article } = options
@@ -79,3 +84,31 @@ module.exports = class SuperArticleView extends Backbone.View
     else
       @$superArticleNavToc.css 'height', '100vh'
       @$body.addClass 'is-open'
+
+  trackPrimaryLogoClick: (e) ->
+    window.analytics.track("Clicked primary partner logo", {
+      destination_path: e.currentTarget.href,
+      impression_type: "sa_primary_logo",
+      context_type: "article_fixed",
+    })
+
+  trackSecondaryLogoClick: (e) ->
+    window.analytics.track("Clicked secondary partner logo", {
+      destination_path: e.currentTarget.href,
+      impression_type: "sa_secondary_logo",
+      context_type: "article_fixed",
+    })
+
+  trackCtaClick: (e) ->
+    window.analytics.track("Clicked partner cta link", {
+      destination_path: e.currentTarget.href,
+      impression_type: "sa_partner_cta",
+      context_type: "article_fixed",
+    })
+
+  trackFooterBlurbClick: (e) ->
+    window.analytics.track("Clicked partner cta link in footer blurb", {
+      destination_path: e.currentTarget.href,
+      impression_type: "sa_partner_cta",
+      context_type: "article_fixed",
+    })