🟣 Release 4.15.0

Merge pull request #5874 from WRadoslaw/release/4.15.0

CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.15.0] - 2024-02-09
+
+## Added
+
+- Request response time logging
+
+### Fixed
+
+- Atlas and Orion email validation difference
+- Lack of channel collaborator for subsequent Atlas channels of a single member that joined YPP
+
+### Changed
+
+- Changed feature arrival dates on pills
+- Channel collaborator permissions
+- Homepage language and category filtering
+
 ## [4.14.6] - 2024-01-12
 
 ### Fixed

packages/atlas/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystream/atlas",
   "description": "UI for consuming Joystream - a user governed video platform",
-  "version": "4.14.6",
+  "version": "4.15.0",
   "license": "GPL-3.0",
   "scripts": {
     "start": "vite",

packages/atlas/src/api/client/index.ts

@@ -5,9 +5,34 @@ import { createClient } from 'graphql-ws'
 
 import { ORION_GRAPHQL_URL, QUERY_NODE_GRAPHQL_SUBSCRIPTION_URL } from '@/config/env'
 import { useUserLocationStore } from '@/providers/userLocation'
+import { UserEventsLogger } from '@/utils/logs'
 
 import { cache } from './cache'
 
+const initializePerformanceObserver = () => {
+  try {
+    const observer = new PerformanceObserver((list) => {
+      for (const entry of list.getEntries()) {
+        if (['fetch', 'xmlhttprequest'].includes((entry as PerformanceResourceTiming).initiatorType)) {
+          const queryString = entry.name.split('?')?.[1]
+          const params = new URLSearchParams(queryString)
+          const queryType = params.get('queryName')
+          UserEventsLogger.logUserEvent('request-response-time', {
+            requestName: queryType ?? entry.name,
+            timeToComplete: entry.duration,
+          })
+        }
+      }
+    })
+    // Start listening for `resource` entries to be dispatched.
+    observer.observe({ type: 'resource', buffered: true })
+  } catch (e) {
+    // Do nothing if the browser doesn't support this API.
+  }
+}
+
+initializePerformanceObserver()
+
 const delayLink = new ApolloLink((operation, forward) => {
   const ctx = operation.getContext()
   if (!ctx.delay) {
@@ -31,11 +56,40 @@ export const createApolloClient = () => {
     })
   )
 
-  const orionLink = ApolloLink.from([delayLink, new HttpLink({ uri: ORION_GRAPHQL_URL, credentials: 'include' })])
+  const orionLink = ApolloLink.from([
+    delayLink,
+    new HttpLink({
+      uri: ORION_GRAPHQL_URL,
+      credentials: 'include',
+      fetch: async (uri, options) => {
+        const queryName = options?.headers
+          ? (options.headers?.['queryname' as keyof typeof options.headers] as string)
+          : null
+        const queryString = queryName ? `?queryName=${queryName}` : ''
+        return fetch(`${uri}${queryString}`, options)
+      },
+    }),
+  ])
 
   const operationSplitLink = split(
     ({ query, setContext }) => {
       const locationStore = useUserLocationStore.getState()
+      const firstDefinition = query.definitions[0]
+      let queryName: string | null | undefined = null
+      if (firstDefinition.kind === 'OperationDefinition' && firstDefinition.operation === 'query') {
+        queryName = firstDefinition.name?.value
+      }
+
+      if (queryName) {
+        setContext(({ headers }: Record<string, object>) => {
+          return {
+            headers: {
+              ...headers,
+              ...(queryName ? { queryName } : {}),
+            },
+          }
+        })
+      }
 
       if (
         !locationStore.disableUserLocation &&

packages/atlas/src/components/_auth/ExternalSignInModal/ExternalSignInModal.tsx

@@ -39,7 +39,7 @@ export const ExternalSignInModal: FC = () => {
   const form = useForm<{ email: string }>({
     resolver: zodResolver(
       z.object({
-        email: z.string().email(),
+        email: z.string().regex(/^\S+@\S+\.\S+$/, 'Enter valid email address.'),
       })
     ),
   })

packages/atlas/src/components/_auth/ForgotPasswordModal/ForgotPasswordModal.tsx

@@ -29,7 +29,10 @@ const commonPasswordValidation = z
 
 const schema = z.object({
   [ForgotPasswordStep.EmailAndSeedStep]: z.object({
-    email: z.string().min(3, { message: 'Enter email address.' }).email({ message: 'Enter valid email address.' }),
+    email: z
+      .string()
+      .min(3, { message: 'Enter email address.' })
+      .regex(/^\S+@\S+\.\S+$/, 'Enter valid email address.'),
     mnemonic: z
       .string()
       .min(1, 'Enter wallet seed phrase.')

packages/atlas/src/components/_auth/LogInModal/LogInModal.tsx

@@ -44,7 +44,10 @@ export const LogInModal = () => {
   } = useForm<{ email: string; password: string }>({
     resolver: zodResolver(
       z.object({
-        email: z.string().min(3, { message: 'Enter email address.' }).email({ message: 'Enter valid email address.' }),
+        email: z
+          .string()
+          .min(3, { message: 'Enter email address.' })
+          .regex(/^\S+@\S+\.\S+$/, 'Enter valid email address.'),
         password: z.string().min(1, 'Enter password.'),
       })
     ),

packages/atlas/src/components/_auth/SignUpModal/SignUpSteps/SignUpEmailStep.tsx

@@ -17,11 +17,14 @@ import { AuthenticationModalStepTemplate } from '../../AuthenticationModalStepTe
 
 const zodSchema = z
   .object({
-    email: z.string().min(3, { message: 'Enter email address.' }).email({ message: 'Enter valid email address.' }),
+    email: z
+      .string()
+      .min(3, { message: 'Enter email address.' })
+      .regex(/^\S+@\S+\.\S+$/, 'Enter valid email address.'),
     confirmEmail: z
       .string()
       .min(1, { message: 'Enter email address.' })
-      .email({ message: 'Enter valid email address.' }),
+      .regex(/^\S+@\S+\.\S+$/, 'Enter valid email address.'),
     confirmedTerms: z.boolean().refine((value) => value, { message: 'Agree to Terms and Conditions to continue.' }),
   })
   .refine(

packages/atlas/src/config/contentFilter.ts

@@ -17,11 +17,14 @@ export const cancelledVideoFilter: VideoWhereInput = {
   },
 }
 
+const browserLanguage = navigator.language.split('-')[0]
+
 export const publicCryptoVideoFilter: VideoWhereInput = {
   isPublic_eq: true,
   isCensored_eq: false,
+  orionLanguage_in: [...(browserLanguage ? [browserLanguage] : []), 'en'],
   category: {
-    id_in: atlasConfig.content.categories.find((category) => category.name === 'Crypto')?.videoCategories,
+    id_in: atlasConfig.content.categories.map((category) => category.videoCategories).flat(),
   },
   media: {
     isAccepted_eq: true,

packages/atlas/src/hooks/useChannelFormSubmit.ts

@@ -68,10 +68,10 @@ type CreateEditChannelSubmitParams = {
     | undefined
 }
 
-export const useCreateEditChannelSubmit = () => {
+export const useCreateEditChannelSubmit = (initialChannelId?: string) => {
   const { joystream, proxyCallback } = useJoystream()
-  const { channelId, memberId, refetchUserMemberships } = useUser()
-
+  const { channelId: activeChannelId, memberId, refetchUserMemberships } = useUser()
+  const channelId = initialChannelId || activeChannelId
   const addNewChannelIdToUploadsStore = useUploadsStore((state) => state.actions.addNewChannelId)
   const getBucketsConfigForNewChannel = useBucketsConfigForNewChannel()
   const { channelStateBloatBondValue, dataObjectStateBloatBondValue } = useBloatFeesAndPerMbFees()

packages/atlas/src/joystream-lib/extrinsics.ts

@@ -217,6 +217,9 @@ export class JoystreamLibExtrinsics {
           ? {
               [collaboratorMemberId]: createType('BTreeSet<PalletContentIterableEnumsChannelActionPermission>', [
                 'AddVideo',
+                'AgentRemark',
+                'UpdateChannelMetadata',
+                'UpdateVideoMetadata',
               ]),
             }
           : {}
@@ -295,6 +298,9 @@ export class JoystreamLibExtrinsics {
             ? {
                 [collaboratorMemberId]: createType('BTreeSet<PalletContentIterableEnumsChannelActionPermission>', [
                   'AddVideo',
+                  'AgentRemark',
+                  'UpdateChannelMetadata',
+                  'UpdateVideoMetadata',
                 ]),
               }
             : {}

packages/atlas/src/views/global/YppLandingView/YppAuthorizationModal/YppAuthorizationModal.tsx

@@ -203,7 +203,7 @@ export const YppAuthorizationModal: FC<YppAuthorizationModalProps> = ({ unSynced
     [setSelectedChannelId, setYtRequirementsErrors]
   )
 
-  const createOrUpdateChannel = useCreateEditChannelSubmit()
+  const createOrUpdateChannel = useCreateEditChannelSubmit(selectedChannelId ?? undefined)
 
   const handleCreateOrUpdateChannel = detailsFormMethods.handleSubmit(async (data) => {
     setFinalFormData(() => ({

packages/atlas/src/views/global/YppLandingView/sections/YppCardsSections.tsx

@@ -198,7 +198,7 @@ export const YppCardsSections: FC = () => {
                 data-aos-easing="atlas-easing"
               >
                 <ContentCard
-                  pill={{ label: 'Coming late 2023' }}
+                  pill={{ label: 'Coming early 2024' }}
                   title="Issue Channel Tokens"
                   subtitle="Creator tokens"
                   body="Turn viewers into evangelists by letting them hold a share in your channel when they buy your own channel token."
@@ -239,7 +239,7 @@ export const YppCardsSections: FC = () => {
                 data-aos-easing="atlas-easing"
               >
                 <ContentCard
-                  pill={{ label: 'Coming early 2024' }}
+                  pill={{ label: 'Coming late 2024' }}
                   title="Get recognized and supported with tips"
                   subtitle="Tips"
                   body="Receive tips from your viewers who appreciate your work and want you to know about it."
@@ -281,7 +281,7 @@ export const YppCardsSections: FC = () => {
                 data-aos-easing="atlas-easing"
               >
                 <ContentCard
-                  pill={{ label: 'Coming early 2024' }}
+                  pill={{ label: 'Coming late 2024' }}
                   title="Create videos which only your supporters can access"
                   subtitle="Gated content"
                   body="Offer exclusive content to the selected members who purchased your tokens and NFTs."