{/* Placeholder cells for alignment */}
- |
+ |
{release.release_id} |
{release.xml_file_path} |
diff --git a/packages/ddex/webapp/server/package.json b/packages/ddex/webapp/server/package.json
index 04214f104fa..3a207c23702 100644
--- a/packages/ddex/webapp/server/package.json
+++ b/packages/ddex/webapp/server/package.json
@@ -1,6 +1,6 @@
{
"name": "@audius/ddex-webapp-server",
- "version": "0.0.16",
+ "version": "0.0.17",
"description": "Backend server for DDEX ingestion (also serves frontend as static assets)",
"main": "index.js",
"scripts": {
diff --git a/packages/ddex/webapp/server/src/app.ts b/packages/ddex/webapp/server/src/app.ts
index 47c909d81cc..57e1176660a 100644
--- a/packages/ddex/webapp/server/src/app.ts
+++ b/packages/ddex/webapp/server/src/app.ts
@@ -175,7 +175,7 @@ export default function createApp(
env: process.env.NODE_ENV,
awsAccessKeyId: process.env.AWS_ACCESS_KEY_ID,
awsBucketRaw: process.env.AWS_BUCKET_RAW,
- awsBucketIndexed: process.env.AWS_BUCKET_INDEXED,
+ awsBucketCrawled: process.env.AWS_BUCKET_CRAWLED,
ddexKey: process.env.DDEX_KEY,
ddexChoreography: process.env.DDEX_CHOREOGRAPHY,
},
diff --git a/packages/discovery-provider/.version.json b/packages/discovery-provider/.version.json
index 904868a756e..34fb9c5995a 100644
--- a/packages/discovery-provider/.version.json
+++ b/packages/discovery-provider/.version.json
@@ -1,4 +1,4 @@
{
- "version": "0.6.64",
+ "version": "0.6.67",
"service": "discovery-node"
}
diff --git a/packages/discovery-provider/ddl/migrations/0063_ddex_jsonb_columns.sql b/packages/discovery-provider/ddl/migrations/0063_ddex_jsonb_columns.sql
new file mode 100644
index 00000000000..a6e3609a1dc
--- /dev/null
+++ b/packages/discovery-provider/ddl/migrations/0063_ddex_jsonb_columns.sql
@@ -0,0 +1,39 @@
+DO $$
+BEGIN
+ -- For the 'artists' column in the 'tracks' table
+ IF EXISTS (
+ SELECT FROM information_schema.columns
+ WHERE table_name = 'tracks' AND column_name = 'artists'
+ AND udt_name != 'jsonb'
+ ) THEN
+ EXECUTE 'ALTER TABLE tracks ALTER COLUMN artists TYPE jsonb USING artists::text::jsonb;';
+ END IF;
+
+ -- For the 'resource_contributors' column in the 'tracks' table
+ IF EXISTS (
+ SELECT FROM information_schema.columns
+ WHERE table_name = 'tracks' AND column_name = 'resource_contributors'
+ AND udt_name != 'jsonb'
+ ) THEN
+ EXECUTE 'ALTER TABLE tracks ALTER COLUMN resource_contributors TYPE jsonb USING resource_contributors::text::jsonb;';
+ END IF;
+
+ -- For the 'indirect_resource_contributors' column in the 'tracks' table
+ IF EXISTS (
+ SELECT FROM information_schema.columns
+ WHERE table_name = 'tracks' AND column_name = 'indirect_resource_contributors'
+ AND udt_name != 'jsonb'
+ ) THEN
+ EXECUTE 'ALTER TABLE tracks ALTER COLUMN indirect_resource_contributors TYPE jsonb USING indirect_resource_contributors::text::jsonb;';
+ END IF;
+
+ -- For the 'artists' column in the 'playlists' table
+ IF EXISTS (
+ SELECT FROM information_schema.columns
+ WHERE table_name = 'playlists' AND column_name = 'artists'
+ AND udt_name != 'jsonb'
+ ) THEN
+ EXECUTE 'ALTER TABLE playlists ALTER COLUMN artists TYPE jsonb USING artists::text::jsonb;';
+ END IF;
+
+END $$;
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/app-template/package.json b/packages/discovery-provider/plugins/pedalboard/apps/app-template/package.json
index ac1d4d5de2c..8add63ec2ee 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/app-template/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/apps/app-template/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/app-template",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"scripts": {
"build": "tsc",
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/package.json b/packages/discovery-provider/plugins/pedalboard/apps/relay/package.json
index 6760758fdd4..5f4942032b4 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/relay",
- "version": "0.1.26",
+ "version": "0.1.27",
"private": true,
"scripts": {
"build": "tsc",
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/antiAbuse.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/antiAbuse.ts
index d17cadd384f..84220f2aae9 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/antiAbuse.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/antiAbuse.ts
@@ -1,13 +1,12 @@
import axios from 'axios'
import { Users } from '@pedalboard/storage'
import { AntiAbuseConfig } from '../config/antiAbuseConfig'
-import { logger } from '../logger'
import { NextFunction, Request, Response } from 'express'
import { config } from '..'
import { antiAbuseError, internalError } from '../error'
import { readAAOState, storeAAOState } from '../redis'
-import { StatusCodes } from 'http-status-codes'
import { unknownToError } from '../utils'
+import pino from 'pino'
type AbuseRule = {
rule: number
@@ -28,23 +27,23 @@ export const antiAbuseMiddleware = async (
next: NextFunction
) => {
const aaoConfig = config.aao
- const { ip, recoveredSigner, signerIsApp, createOrDeactivate, isSenderVerifier, requestId, validatedRelayRequest } = response.locals.ctx
+ const { ip, recoveredSigner, signerIsApp, createOrDeactivate, isSenderVerifier, requestId, validatedRelayRequest, logger } = response.locals.ctx
// no AAO to check and creates / deactivates should always be allowed
if (signerIsApp || createOrDeactivate || isSenderVerifier) {
- logger.info({ requestId, signerIsApp, createOrDeactivate, isSenderVerifier }, "antiabuse skipped")
+ logger.info({ createOrDeactivate, isSenderVerifier }, "antiabuse skipped")
next()
return
}
const user = recoveredSigner as Users
// fire and async update aao cache
- detectAbuse(aaoConfig, user, ip).catch((e) => {
+ detectAbuse(aaoConfig, logger, user, ip).catch((e) => {
logger.error({ error: e }, 'AAO uncaught exception')
})
if (!user.handle) {
- logger.error({ requestId, user, validatedRelayRequest }, "user found without handle")
+ logger.error({ validatedRelayRequest }, "user found without handle")
internalError(
next,
`user found but without handle, investigate ${JSON.stringify(user)}`
@@ -61,7 +60,7 @@ export const antiAbuseMiddleware = async (
}
if (userAbuseRules?.blockedFromRelay) {
- logger.info({ requestId, address: user.wallet, userId: user.user_id, handle: user.handle_lc }, `blocked from relay ${user.handle_lc}`)
+ logger.info(`blocked from relay ${user.handle_lc}`)
antiAbuseError(next, 'blocked from relay')
return
}
@@ -73,6 +72,7 @@ export const antiAbuseMiddleware = async (
// detects abuse for the queried user and stores in cache
export const detectAbuse = async (
aaoConfig: AntiAbuseConfig,
+ logger: pino.Logger,
user: Users,
reqIp: string
) => {
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/contextInjector.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/contextInjector.ts
index dc9ae2de5f6..92e65e27b14 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/contextInjector.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/contextInjector.ts
@@ -1,5 +1,6 @@
import { DeveloperApps, Users } from '@pedalboard/storage'
import { ValidatedRelayRequest } from '../types/relay'
+import pino from 'pino'
/** Context built by the context injector that can be referenced later in the request (via response object). */
export interface RequestContext {
@@ -15,6 +16,7 @@ export interface RequestContext {
signerIsUser: boolean
createOrDeactivate: boolean
isSenderVerifier: boolean
+ logger: pino.Logger
}
declare global {
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/errorHandler.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/errorHandler.ts
index dbfa87650c2..d3ce9990196 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/errorHandler.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/errorHandler.ts
@@ -1,6 +1,5 @@
import { NextFunction, Request, Response } from "express";
import { AppError, isAppError } from "../error";
-import { logger } from "../logger";
import { StatusCodes } from "http-status-codes";
import { outgoingLog } from "./logging";
@@ -10,7 +9,7 @@ export const errorHandler = (
response: Response,
next: NextFunction
) => {
- const { requestId, validatedRelayRequest } = response.locals.ctx
+ const { requestId, validatedRelayRequest, logger } = response.locals.ctx
// if unknown error is thrown somewhere
if (!isAppError(error)) {
logger.error({ requestId, error, validatedRelayRequest }, "unhandled error occured");
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/logging.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/logging.ts
index 5ed3739059b..12460e7f55c 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/logging.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/logging.ts
@@ -10,7 +10,8 @@ export const incomingRequestLogger = (
const startTime = new Date(new Date().getTime());
const requestId = typeof request.headers["X-Request-Id"] === "string" ? request.headers["X-Request-ID"] as string : uuidv4();
const oldCtx = response.locals.ctx;
- response.locals.ctx = { ...oldCtx, startTime, requestId };
+ const requestLogger = logger.child({ startTime, requestId })
+ response.locals.ctx = { ...oldCtx, startTime, requestId, logger: requestLogger };
const { route, method } = request;
const path: string = route.path
@@ -30,8 +31,8 @@ export const outgoingLog = (request: Request, response: Response) => {
const statusCode = response.statusCode;
const path: string = route.path
if (!path.includes("health")) {
- logger.info(
- { requestId, path, method, responseTime, statusCode },
+ response.locals.ctx.logger.info(
+ { responseTime, statusCode },
"request completed"
);
}
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/rateLimiter.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/rateLimiter.ts
index 17a382a749c..77771986717 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/rateLimiter.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/rateLimiter.ts
@@ -5,7 +5,6 @@ import { DeveloperApps, Table, Users } from '@pedalboard/storage'
import { config } from '..'
import { NextFunction, Request, Response, response } from 'express'
import { rateLimitError } from '../error'
-import { logger } from '../logger'
const globalRateLimiter = new RelayRateLimiter()
@@ -14,7 +13,7 @@ export const rateLimiterMiddleware = async (
res: Response,
next: NextFunction
) => {
- const { validatedRelayRequest, recoveredSigner, signerIsUser, createOrDeactivate, isSenderVerifier, requestId } = res.locals.ctx
+ const { validatedRelayRequest, recoveredSigner, signerIsUser, createOrDeactivate, isSenderVerifier, logger } = res.locals.ctx
const { encodedABI } = validatedRelayRequest
let signer: string | null
@@ -58,12 +57,12 @@ export const rateLimiterMiddleware = async (
signer,
limit
})
- logger.info({ requestId, address: signer, operation, limit }, "calculated rate limit")
+ logger.info({ limit }, "calculated rate limit")
insertReplyHeaders(res, rateLimitData)
} catch (e) {
if (e instanceof RateLimiterRes) {
insertReplyHeaders(res, e as RateLimiterRes)
- logger.info({ requestId, address: signer, operation, limit }, "rate limit hit")
+ logger.info({ limit }, "rate limit hit")
rateLimitError(next, 'rate limit hit')
return
}
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/validator.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/validator.ts
index ad2c6e96747..2c0cc58ceec 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/validator.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/middleware/validator.ts
@@ -4,7 +4,6 @@ import { validationError } from '../error'
import { DeveloperApps, Table, Users } from '@pedalboard/storage'
import { AudiusABIDecoder } from '@audius/sdk'
import { config, discoveryDb } from '..'
-import { logger } from '../logger'
import { isUserCreate, isUserDeactivate } from '../utils'
import { getEntityManagerActionKey } from './rateLimiter'
@@ -16,7 +15,7 @@ export const validator = async (
next: NextFunction
) => {
const body = request.body as RelayRequest
- const { requestId } = response.locals.ctx
+ const { logger } = response.locals.ctx
// Validation of input fields
const contractAddress =
@@ -51,8 +50,19 @@ export const validator = async (
handle
}
+ const loggerInfo: {
+ operation?: string,
+ handle?: string,
+ address?: string,
+ userId?: number,
+ isApp?: boolean
+ } = {
+ isApp: false
+ }
+
const operation = getEntityManagerActionKey(encodedABI)
- logger.info({ requestId, operation, abi: encodedABI })
+ loggerInfo.operation = operation
+ logger.info({ operation, encodedABI }, "retrieved operation")
// Gather user from input data
// @ts-ignore, partially populate for now
@@ -76,19 +86,23 @@ export const validator = async (
if (user !== undefined) {
recoveredSigner = user
signerIsUser = true
- logger.info({ requestId, handle: user.handle_lc, address: user.wallet, userId: user.user_id, operation }, `retrieved user ${user.handle_lc}`)
+ loggerInfo.handle = user.handle_lc || undefined
+ loggerInfo.address = user.wallet || undefined
+ loggerInfo.userId = user.user_id || undefined
+
+ logger.info({ handle: user.handle_lc, address: user.wallet, userId: user.user_id, operation }, `retrieved user ${user.handle_lc}`)
}
if (signerIsUser) {
const isDeactivated = (recoveredSigner as Users).is_deactivated
if (isUserDeactivate(isDeactivated, encodedABI)) {
- logger.info({ requestId, encodedABI, operation }, "user deactivation")
+ logger.info("user deactivation")
createOrDeactivate = true
}
}
if (isUserCreate(encodedABI)) {
- logger.info({ requestId: response.locals.ctx.requestId, encodedABI, operation }, "user create")
+ logger.info("user create")
createOrDeactivate = true
}
@@ -96,19 +110,25 @@ export const validator = async (
if (!signerIsUser && !createOrDeactivate && !isSenderVerifier) {
const developerApp = await retrieveDeveloperApp({ encodedABI, contractAddress })
if (developerApp === undefined) {
- logger.error({ encodedABI, operation }, "neither user nor developer app could be found for address")
+ logger.error("neither user nor developer app could be found for address")
validationError(next, 'recoveredSigner not valid')
return
}
recoveredSigner = developerApp
signerIsApp = true
- logger.info({ requestId, address: developerApp.address, userId: developerApp.user_id, name: developerApp.name, operation }, `retrieved developer app ${developerApp.name}`)
+ loggerInfo.address = developerApp.address
+ loggerInfo.userId = developerApp.user_id || undefined
+ loggerInfo.handle = developerApp.name
+ loggerInfo.isApp = true
+ logger.info({ address: developerApp.address, userId: developerApp.user_id, handle: developerApp.name, operation }, `retrieved developer app ${developerApp.name}`)
}
// inject remaining fields into ctx for downstream middleware
const ip = request.ip ?? ''
const oldCtx = response.locals.ctx
+ // create child logger with additional
+ const newLogger = logger.child({...loggerInfo})
response.locals.ctx = {
...oldCtx,
validatedRelayRequest,
@@ -117,7 +137,8 @@ export const validator = async (
ip,
signerIsApp,
signerIsUser,
- isSenderVerifier
+ isSenderVerifier,
+ logger: newLogger
}
next()
}
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/txRelay.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/txRelay.ts
index c05d230dd8f..34bda7f8cc0 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/txRelay.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/txRelay.ts
@@ -1,13 +1,11 @@
import { config, wallets, web3 } from ".";
import { internalError } from "./error";
-import { logger } from "./logger";
import { confirm } from "./web3";
import {
TransactionReceipt,
TransactionRequest,
} from "@ethersproject/abstract-provider";
import { NextFunction, Request, Response } from "express";
-import { unknownToError } from "./utils";
export type RelayedTransaction = {
receipt: TransactionReceipt;
@@ -20,7 +18,7 @@ export const relayTransaction = async (
next: NextFunction
) => {
// pull info from validated request
- const { validatedRelayRequest, requestId } = res.locals.ctx;
+ const { validatedRelayRequest, logger } = res.locals.ctx;
const { encodedABI, gasLimit, contractAddress } = validatedRelayRequest;
const senderWallet = wallets.selectNextWallet();
@@ -39,17 +37,17 @@ export const relayTransaction = async (
const transaction = { nonce, gasLimit, to, value, data };
await senderWallet.signTransaction(transaction);
- logger.info({ requestId, senderWallet: address, nonce }, "submitting transaction")
+ logger.info({ senderWallet: address, nonce }, "submitting transaction")
submit = await senderWallet.sendTransaction(transaction);
// query chain until tx is mined
const receipt = await confirm(submit.hash);
receipt.blockNumber += config.finalPoaBlock
- logger.info({ requestId, senderWallet: address, nonce, txHash: submit?.hash, blocknumber: receipt.blockNumber }, "transaction confirmation successful")
+ logger.info({ senderWallet: address, nonce, txHash: submit?.hash, blocknumber: receipt.blockNumber }, "transaction confirmation successful")
res.send({ receipt });
} catch (e) {
- logger.error({ requestId, senderWallet: address, nonce, txHash: submit?.hash }, "transaction confirmation failed")
+ logger.error({ senderWallet: address, nonce, txHash: submit?.hash }, "transaction confirmation failed")
internalError(next, e);
return;
}
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/web3.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/web3.ts
index 59214f64663..43360183484 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/web3.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/web3.ts
@@ -35,13 +35,13 @@ export const connectWeb3 = async (config: Config): Promise => {
return { web3, chainId: chainId.toString() };
};
-export const confirm = async (txHash: string | undefined, retries = 24): Promise => {
+export const confirm = async (txHash: string | undefined, retries = 128): Promise => {
if (txHash === undefined) throw new Error("transaction hash not defined")
let tries = 0;
while (tries !== retries) {
const receipt = await web3js.eth.getTransactionReceipt(txHash);
if (receipt !== null && receipt.status) return receipt;
- await delay(250);
+ await delay(500);
tries += 1;
}
throw new Error(`transaction ${txHash} could not be confirmed`);
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/package.json b/packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/package.json
index 6adc430943d..5ebebfa0eff 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/sla-auditor",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"scripts": {
"build": "tsc",
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/package.json b/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/package.json
index f770898e378..06d7724ad1c 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/solana-relay",
- "version": "0.0.19",
+ "version": "0.0.20",
"private": true,
"scripts": {
"start": "ts-node ./src/index.ts",
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/src/redis.ts b/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/src/redis.ts
index 63c6c673e4b..6701f682762 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/src/redis.ts
+++ b/packages/discovery-provider/plugins/pedalboard/apps/solana-relay/src/redis.ts
@@ -33,7 +33,7 @@ export const cacheTransaction = async (
) => {
const redis = await getRedisConnection()
const key = `solana:transaction:${signature}`
- await redis.set(key, transaction)
+ await redis.set(key, transaction, { EX: 60 })
}
export const getCachedDiscoveryNodeEndpoints = async () => {
diff --git a/packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/package.json b/packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/package.json
index 907deb733af..e53ea6443a4 100644
--- a/packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/trending-challenge-rewards",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"scripts": {
"build": "tsc",
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/basekit/package.json b/packages/discovery-provider/plugins/pedalboard/packages/basekit/package.json
index a608cbf1eb9..4b7db8a1a59 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/basekit/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/basekit/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/basekit",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"main": "./dist/index.js",
"source": "./src/index.ts",
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom-server/package.json b/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom-server/package.json
index c3634133283..2ece00b788d 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom-server/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom-server/package.json
@@ -1,6 +1,6 @@
{
"name": "eslint-config-custom-server",
- "version": "0.0.26",
+ "version": "0.0.27",
"license": "MIT",
"main": "index.js",
"publishConfig": {
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom/package.json b/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom/package.json
index 1d4c5297fa0..88a095876d9 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/eslint-config-custom/package.json
@@ -1,7 +1,7 @@
{
"name": "eslint-config-custom",
"private": true,
- "version": "0.0.26",
+ "version": "0.0.27",
"license": "MIT",
"main": "index.js",
"dependencies": {
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/jest-presets/package.json b/packages/discovery-provider/plugins/pedalboard/packages/jest-presets/package.json
index 6552e01ad15..2b44101f0a1 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/jest-presets/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/jest-presets/package.json
@@ -1,6 +1,6 @@
{
"name": "jest-presets",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"license": "MIT",
"dependencies": {
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/logger/package.json b/packages/discovery-provider/plugins/pedalboard/packages/logger/package.json
index 77935609b25..6309849d6a0 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/logger/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/logger/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/logger",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"main": "./dist/index.js",
"source": "./src/index.ts",
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/storage/package.json b/packages/discovery-provider/plugins/pedalboard/packages/storage/package.json
index d1a6de06f43..a15337e1be3 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/storage/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/storage/package.json
@@ -1,6 +1,6 @@
{
"name": "@pedalboard/storage",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"main": "./dist/index.js",
"source": "./src/index.ts",
diff --git a/packages/discovery-provider/plugins/pedalboard/packages/tsconfig/package.json b/packages/discovery-provider/plugins/pedalboard/packages/tsconfig/package.json
index a9deca4ecf4..5909fdaba17 100644
--- a/packages/discovery-provider/plugins/pedalboard/packages/tsconfig/package.json
+++ b/packages/discovery-provider/plugins/pedalboard/packages/tsconfig/package.json
@@ -1,6 +1,6 @@
{
"name": "tsconfig",
- "version": "0.0.26",
+ "version": "0.0.27",
"private": true,
"license": "MIT",
"publishConfig": {
diff --git a/packages/discovery-provider/src/api/v1/helpers.py b/packages/discovery-provider/src/api/v1/helpers.py
index 8ec2077c0c3..41535342571 100644
--- a/packages/discovery-provider/src/api/v1/helpers.py
+++ b/packages/discovery-provider/src/api/v1/helpers.py
@@ -383,6 +383,14 @@ def extend_track(track):
"is_deactivated"
)
+ # todo: remove once clients catch up i.e. no longer use this field
+ track["download"] = {
+ "cid": track.get("track_cid"),
+ "is_downloadable": bool(track.get("is_downloadable")),
+ "requires_follow": track.get("download_conditions") is not None
+ and "follow_user_id" in track.get("download_conditions"),
+ }
+
# TODO: This block is only for legacy tracks that have track_segments instead of duration
duration = track.get("duration")
if not duration:
diff --git a/packages/discovery-provider/src/models/playlists/playlist.py b/packages/discovery-provider/src/models/playlists/playlist.py
index e7e381e8607..dd88397c181 100644
--- a/packages/discovery-provider/src/models/playlists/playlist.py
+++ b/packages/discovery-provider/src/models/playlists/playlist.py
@@ -1,5 +1,4 @@
from sqlalchemy import (
- ARRAY,
Boolean,
Column,
DateTime,
@@ -58,7 +57,7 @@ class Playlist(Base, RepresentableMixin):
# From DDEX
ddex_app = Column(String)
ddex_release_ids = Column(JSONB())
- artists = Column(ARRAY(JSONB()))
+ artists = Column(JSONB())
copyright_line = Column(JSONB())
producer_copyright_line = Column(JSONB())
parental_warning_type = Column(String)
diff --git a/packages/discovery-provider/src/models/tracks/track.py b/packages/discovery-provider/src/models/tracks/track.py
index f17db02766e..2d1d544f034 100644
--- a/packages/discovery-provider/src/models/tracks/track.py
+++ b/packages/discovery-provider/src/models/tracks/track.py
@@ -95,9 +95,9 @@ class Track(Base, RepresentableMixin):
# From DDEX
ddex_release_ids = Column(JSONB())
ddex_app = Column(String)
- artists = Column(ARRAY(JSONB()))
- resource_contributors = Column(ARRAY(JSONB()))
- indirect_resource_contributors = Column(ARRAY(JSONB()))
+ artists = Column(JSONB())
+ resource_contributors = Column(JSONB())
+ indirect_resource_contributors = Column(JSONB())
rights_controller = Column(JSONB())
copyright_line = Column(JSONB())
producer_copyright_line = Column(JSONB())
diff --git a/packages/discovery-provider/src/queries/search_es.py b/packages/discovery-provider/src/queries/search_es.py
index 865ba15dbe8..218f867e9e5 100644
--- a/packages/discovery-provider/src/queries/search_es.py
+++ b/packages/discovery-provider/src/queries/search_es.py
@@ -23,7 +23,7 @@ def search_es_full(args: dict):
if not esclient:
raise Exception("esclient is None")
- search_str = args.get("query")
+ search_str = args.get("query", "").strip()
current_user_id = args.get("current_user_id")
limit = args.get("limit", 10)
offset = args.get("offset", 0)
@@ -58,21 +58,6 @@ def search_es_full(args: dict):
]
)
- # saved tracks
- if current_user_id:
- mdsl.extend(
- [
- {"index": ES_TRACKS},
- track_dsl(
- search_str=search_str,
- current_user_id=current_user_id,
- must_saved=True,
- only_downloadable=only_downloadable,
- include_purchaseable=include_purchaseable,
- ),
- ]
- )
-
# users
if do_users:
mdsl.extend(
@@ -81,13 +66,6 @@ def search_es_full(args: dict):
user_dsl(search_str, current_user_id),
]
)
- if current_user_id:
- mdsl.extend(
- [
- {"index": ES_USERS},
- user_dsl(search_str, current_user_id, True),
- ]
- )
# playlists
if do_playlists:
@@ -98,15 +76,6 @@ def search_es_full(args: dict):
]
)
- # saved playlists
- if current_user_id:
- mdsl.extend(
- [
- {"index": ES_PLAYLISTS},
- playlist_dsl(search_str, current_user_id, True),
- ]
- )
-
# albums
if do_albums:
mdsl.extend(
@@ -115,14 +84,6 @@ def search_es_full(args: dict):
album_dsl(search_str, current_user_id),
]
)
- # saved albums
- if current_user_id:
- mdsl.extend(
- [
- {"index": ES_PLAYLISTS},
- album_dsl(search_str, current_user_id, True),
- ]
- )
mdsl_limit_offset(mdsl, limit, offset)
mfound = esclient.msearch(searches=mdsl)
@@ -140,24 +101,15 @@ def search_es_full(args: dict):
if do_tracks:
response["tracks"] = pluck_hits(mfound["responses"].pop(0))
- if current_user_id:
- response["saved_tracks"] = pluck_hits(mfound["responses"].pop(0))
if do_users:
response["users"] = pluck_hits(mfound["responses"].pop(0))
- if current_user_id:
- response["followed_users"] = pluck_hits(mfound["responses"].pop(0))
if do_playlists:
response["playlists"] = pluck_hits(mfound["responses"].pop(0))
- if current_user_id:
- response["saved_playlists"] = pluck_hits(mfound["responses"].pop(0))
if do_albums:
response["albums"] = pluck_hits(mfound["responses"].pop(0))
- if current_user_id:
- response["saved_albums"] = pluck_hits(mfound["responses"].pop(0))
-
finalize_response(
response, limit, current_user_id, is_auto_complete=is_auto_complete
)
@@ -226,7 +178,7 @@ def tag_match(fieldname, sort_by):
def mdsl_limit_offset(mdsl, limit, offset):
# add size and limit with some over-fetching
- # for sake of drop_copycats
+ # for sake of reorder_users
index_name = ""
for dsl in mdsl:
if "index" in dsl:
@@ -296,7 +248,7 @@ def finalize_response(
# users: finalize
for k in ["users", "followed_users"]:
- users = drop_copycats(response[k])
+ users = reorder_users(response[k])
users = users[:limit]
response[k] = [map_user(user, current_user) for user in users]
@@ -313,7 +265,7 @@ def finalize_response(
return response
-def base_match(search_str: str, operator="or", extra_fields=[]):
+def base_match(search_str: str, operator="or", extra_fields=[], boost=1):
return [
{
"multi_match": {
@@ -327,17 +279,18 @@ def base_match(search_str: str, operator="or", extra_fields=[]):
"operator": operator,
"type": "bool_prefix",
"fuzziness": "AUTO",
+ "boost": boost,
}
}
]
def be_saved(current_user_id):
- return {"term": {"saved_by": {"value": current_user_id, "boost": 1.2}}}
+ return {"term": {"saved_by": {"value": current_user_id, "boost": 4}}}
def be_reposted(current_user_id):
- return {"term": {"reposted_by": {"value": current_user_id, "boost": 1.2}}}
+ return {"term": {"reposted_by": {"value": current_user_id, "boost": 4}}}
def be_followed(current_user_id):
@@ -348,6 +301,7 @@ def be_followed(current_user_id):
"id": str(current_user_id),
"path": "following_ids",
},
+ "boost": 500,
}
}
@@ -361,14 +315,14 @@ def personalize_dsl(dsl, current_user_id, must_saved):
dsl["should"].append(be_reposted(current_user_id))
-def default_function_score(dsl, ranking_field):
+def default_function_score(dsl, ranking_field, factor=0.1):
return {
"query": {
"function_score": {
"query": {"bool": dsl},
"field_value_factor": {
"field": ranking_field,
- "factor": 20,
+ "factor": factor,
"modifier": "ln2p",
},
"boost_mode": "multiply",
@@ -386,23 +340,69 @@ def track_dsl(
):
dsl = {
"must": [
- *base_match(search_str),
{"term": {"is_unlisted": {"value": False}}},
{"term": {"is_delete": False}},
+ {
+ "bool": {
+ "should": [
+ *base_match(search_str),
+ {
+ "wildcard": {
+ "title": {
+ "value": "*" + search_str + "*",
+ "boost": 0.01,
+ "case_insensitive": True,
+ }
+ }
+ },
+ {
+ "multi_match": {
+ "query": search_str,
+ "fields": ["title.searchable", "user.name.searchable"],
+ "type": "cross_fields",
+ "operator": "and",
+ "boost": len(search_str) * 0.5,
+ }
+ },
+ *[
+ {
+ "match": {
+ "genre": {
+ "query": search_str.title(),
+ "boost": 20,
+ }
+ }
+ }
+ ],
+ {
+ "match": {
+ "tag_list": {
+ "query": search_str.replace(" ", ""),
+ "boost": 0.1,
+ }
+ }
+ },
+ *[
+ {
+ "match": {
+ "mood": {
+ "query": search_str.title(),
+ "boost": 0.5,
+ }
+ }
+ }
+ ],
+ ],
+ "minimum_should_match": 1,
+ }
+ },
],
"must_not": [
{"exists": {"field": "stem_of"}},
],
"should": [
- *base_match(search_str, operator="and"),
- {
- "match": {
- "title.searchable": {
- "query": search_str,
- "minimum_should_match": "100%",
- },
- }
- },
+ *base_match(search_str, operator="and", boost=len(search_str)),
+ {"term": {"user.is_verified": {"value": True}}},
],
}
@@ -420,15 +420,101 @@ def user_dsl(search_str, current_user_id, must_saved=False):
# must_search_str = search_str + " " + search_str.replace(" ", "")
dsl = {
"must": [
- *base_match(search_str, extra_fields=["handle"]),
{"term": {"is_deactivated": {"value": False}}},
+ {
+ "bool": {
+ "should": [
+ *base_match(
+ search_str,
+ extra_fields=["handle.searchable", "name.searchable"],
+ boost=len(search_str) * 0.1,
+ ),
+ {
+ "wildcard": {
+ "name": {
+ "value": "*" + search_str + "*",
+ "boost": 0.01,
+ "case_insensitive": True,
+ }
+ }
+ },
+ {
+ "match": {
+ "name.searchable": {
+ "query": search_str,
+ "fuzziness": "AUTO",
+ "boost": len(search_str) * 0.01,
+ }
+ }
+ },
+ (
+ {
+ "term": {
+ "name": {
+ "value": search_str.replace(" ", ""),
+ "boost": len(search_str) * 0.5,
+ }
+ }
+ }
+ ),
+ {
+ "term": (
+ {
+ "handle": {
+ "value": search_str.replace(" ", ""),
+ "boost": len(search_str) * 0.5,
+ }
+ }
+ )
+ },
+ {
+ "match": {
+ "tracks.genre": {
+ "query": search_str.title(),
+ "boost": 12,
+ }
+ }
+ },
+ {
+ "match": {
+ "tracks.tags": {
+ "query": search_str.replace(" ", ""),
+ "boost": 0.1,
+ }
+ }
+ },
+ {
+ "match": {
+ "tracks.mood": {
+ "query": search_str.title(),
+ "boost": 12,
+ }
+ }
+ },
+ ],
+ "minimum_should_match": 1,
+ }
+ },
],
"must_not": [],
"should": [
- *base_match(search_str, operator="and", extra_fields=["handle"]),
- {"term": {"handle": {"value": search_str, "boost": 0.2}}},
- {"term": {"name": {"value": search_str, "boost": 0.2}}},
- {"term": {"is_verified": {"value": True, "boost": 1.5}}},
+ *base_match(
+ search_str,
+ operator="and",
+ extra_fields=["name"],
+ boost=len(search_str) * 12,
+ ),
+ (
+ {
+ "term": {
+ "name": {
+ "value": search_str,
+ "boost": (len(search_str) * 0.1) ** 2,
+ }
+ }
+ }
+ ),
+ {"term": {"is_verified": {"value": True, "boost": 5}}},
],
}
@@ -438,20 +524,96 @@ def user_dsl(search_str, current_user_id, must_saved=False):
if current_user_id:
dsl["should"].append(be_followed(current_user_id))
- return default_function_score(dsl, "follower_count")
+ return {
+ "query": {
+ "function_score": {
+ "query": {"bool": dsl},
+ "functions": [
+ {
+ "filter": {"term": {"is_verified": True}},
+ "field_value_factor": {
+ "field": "follower_count",
+ "factor": 10,
+ "modifier": "ln2p",
+ },
+ },
+ {
+ "filter": {"term": {"is_verified": False}},
+ "field_value_factor": {
+ "field": "follower_count",
+ "factor": 0.1,
+ "modifier": "ln2p",
+ },
+ },
+ ],
+ "boost_mode": "multiply",
+ }
+ }
+ }
def base_playlist_dsl(search_str, is_album):
return {
"must": [
- *base_match(search_str),
+ {
+ "bool": {
+ "should": [
+ *base_match(search_str, boost=len(search_str)),
+ {
+ "wildcard": {
+ "playlist_name": {
+ "value": "*" + search_str + "*",
+ "boost": 0.01,
+ "case_insensitive": True,
+ }
+ }
+ },
+ {
+ "multi_match": {
+ "query": search_str,
+ "fields": [
+ "playlist_name.searchable",
+ "user.name.searchable",
+ ],
+ "type": "cross_fields",
+ "operator": "or",
+ "boost": len(search_str) * 0.5,
+ }
+ },
+ {
+ "match": {
+ "tracks.tags": {
+ "query": search_str.replace(" ", ""),
+ "boost": 0.01,
+ }
+ }
+ },
+ {
+ "match": {
+ "tracks.genre": {
+ "query": search_str.title(),
+ "boost": 20,
+ }
+ }
+ },
+ {
+ "match": {
+ "tracks.mood": {
+ "query": search_str.title(),
+ }
+ }
+ },
+ ],
+ "minimum_should_match": 1,
+ }
+ },
{"term": {"is_private": {"value": False}}},
{"term": {"is_delete": False}},
{"term": {"is_album": {"value": is_album}}},
],
"should": [
- *base_match(search_str, operator="and"),
- {"term": {"is_verified": {"value": True}}},
+ *base_match(search_str, operator="and", boost=len(search_str) * 10),
+ {"term": {"user.is_verified": {"value": True, "boost": 3}}},
],
}
@@ -459,19 +621,21 @@ def base_playlist_dsl(search_str, is_album):
def playlist_dsl(search_str, current_user_id, must_saved=False):
dsl = base_playlist_dsl(search_str, False)
personalize_dsl(dsl, current_user_id, must_saved)
- return default_function_score(dsl, "repost_count")
+ return default_function_score(dsl, "repost_count", factor=1000)
def album_dsl(search_str, current_user_id, must_saved=False):
dsl = base_playlist_dsl(search_str, True)
personalize_dsl(dsl, current_user_id, must_saved)
- return default_function_score(dsl, "repost_count")
+ return default_function_score(dsl, "repost_count", factor=1000)
-def drop_copycats(users):
+def reorder_users(users):
"""Filters out users with copy cat names.
e.g. if a verified deadmau5 is in the result set
filter out all non-verified users with same name.
+
+ Moves users without profile pictures to the end.
"""
reserved = set()
for user in users:
@@ -479,11 +643,16 @@ def drop_copycats(users):
reserved.add(lower_ascii_name(user["name"]))
filtered = []
+ users_without_photos = []
for user in users:
if not user["is_verified"] and lower_ascii_name(user["name"]) in reserved:
continue
- filtered.append(user)
- return filtered
+ if user["profile_picture_sizes"] or user["profile_picture"]:
+ filtered.append(user)
+ else:
+ users_without_photos.append(user)
+
+ return filtered + users_without_photos
def lower_ascii_name(name):
diff --git a/packages/discovery-provider/src/tasks/entity_manager/entities/playlist.py b/packages/discovery-provider/src/tasks/entity_manager/entities/playlist.py
index d8a452b10f2..ec598a7525c 100644
--- a/packages/discovery-provider/src/tasks/entity_manager/entities/playlist.py
+++ b/packages/discovery-provider/src/tasks/entity_manager/entities/playlist.py
@@ -466,6 +466,10 @@ def create_playlist(params: ManageEntityParameters):
is_current=False,
is_delete=False,
ddex_app=ddex_app,
+ ddex_release_ids=params.metadata.get("ddex_release_ids", None),
+ artists=params.metadata.get("artists", None),
+ copyright_line=params.metadata.get("copyright_line", None),
+ producer_copyright_line=params.metadata.get("producer_copyright_line", None),
parental_warning_type=params.metadata.get("parental_warning_type", None),
)
diff --git a/packages/discovery-provider/src/tasks/entity_manager/entities/track.py b/packages/discovery-provider/src/tasks/entity_manager/entities/track.py
index 619ac7802e5..24c9c21afa1 100644
--- a/packages/discovery-provider/src/tasks/entity_manager/entities/track.py
+++ b/packages/discovery-provider/src/tasks/entity_manager/entities/track.py
@@ -329,32 +329,74 @@ def populate_track_record_metadata(track_record: Track, track_metadata, handle,
)
elif key == "ddex_release_ids":
- if "ddex_release_ids" in track_metadata and track_metadata["ddex_release_ids"]:
- continue
+ if "ddex_release_ids" in track_metadata and (
+ is_valid_json_field(track_metadata, "ddex_release_ids")
+ or track_metadata["ddex_release_ids"] is None
+ ):
+ track_record.ddex_release_ids = track_metadata["ddex_release_ids"]
elif key == "artists":
- if "artists" in track_metadata and track_metadata["artists"]:
- continue
+ if "artists" in track_metadata:
+ artists = track_metadata["artists"]
+ if artists and isinstance(artists, list):
+ valid = True
+ for artist in artists:
+ if not isinstance(artist, dict):
+ valid = False
+ break
+ if valid:
+ track_record.artists = artists
+ elif artists is None:
+ track_record.artists = artists
elif key == "resource_contributors":
- if "resource_contributors" in track_metadata and track_metadata["resource_contributors"]:
- continue
+ if "resource_contributors" in track_metadata:
+ resource_contributors = track_metadata["resource_contributors"]
+ if resource_contributors and isinstance(resource_contributors, list):
+ valid = True
+ for contributor in resource_contributors:
+ if not isinstance(contributor, dict):
+ valid = False
+ break
+ if valid:
+ track_record.resource_contributors = resource_contributors
+ elif resource_contributors is None:
+ track_record.resource_contributors = resource_contributors
elif key == "indirect_resource_contributors":
- if "indirect_resource_contributors" in track_metadata and track_metadata["indirect_resource_contributors"]:
- continue
+ if "indirect_resource_contributors" in track_metadata:
+ indirect_resource_contributors = track_metadata["indirect_resource_contributors"]
+ if indirect_resource_contributors and isinstance(indirect_resource_contributors, list):
+ valid = True
+ for contributor in indirect_resource_contributors:
+ if not isinstance(contributor, dict):
+ valid = False
+ break
+ if valid:
+ track_record.indirect_resource_contributors = indirect_resource_contributors
+ elif indirect_resource_contributors is None:
+ track_record.indirect_resource_contributors = indirect_resource_contributors
elif key == "rights_controller":
- if "rights_controller" in track_metadata and track_metadata["rights_controller"]:
- continue
+ if "rights_controller" in track_metadata and (
+ is_valid_json_field(track_metadata, "rights_controller")
+ or track_metadata["rights_controller"] is None
+ ):
+ track_record.rights_controller = track_metadata["rights_controller"]
elif key == "copyright_line":
- if "copyright_line" in track_metadata and track_metadata["copyright_line"]:
- continue
+ if "copyright_line" in track_metadata and (
+ is_valid_json_field(track_metadata, "copyright_line")
+ or track_metadata["copyright_line"] is None
+ ):
+ track_record.copyright_line = track_metadata["copyright_line"]
elif key == "producer_copyright_line":
- if "producer_copyright_line" in track_metadata and track_metadata["producer_copyright_line"]:
- continue
+ if "producer_copyright_line" in track_metadata and (
+ is_valid_json_field(track_metadata, "producer_copyright_line")
+ or track_metadata["producer_copyright_line"] is None
+ ):
+ track_record.producer_copyright_line = track_metadata["producer_copyright_line"]
else:
# For most fields, update the track_record when the corresponding field exists
diff --git a/packages/dotenv-linter/package.json b/packages/dotenv-linter/package.json
index 49e7e48acb4..5c4a6ca7324 100644
--- a/packages/dotenv-linter/package.json
+++ b/packages/dotenv-linter/package.json
@@ -1,7 +1,7 @@
{
"name": "@audius/dotenv-linter",
"private": true,
- "version": "1.5.71",
+ "version": "1.5.72",
"description": "dotenv lint",
"author": "Audius",
"homepage": "https://github.com/AudiusProject/audius-protocol#readme",
diff --git a/packages/embed/package.json b/packages/embed/package.json
index 07b9119c1f9..63a7cad0c43 100644
--- a/packages/embed/package.json
+++ b/packages/embed/package.json
@@ -1,6 +1,6 @@
{
"name": "embed",
- "version": "1.5.72",
+ "version": "1.5.73",
"private": true,
"scripts": {
"start": "vite",
diff --git a/packages/es-indexer/package.json b/packages/es-indexer/package.json
index 2d3e6b251da..460ce008ce1 100644
--- a/packages/es-indexer/package.json
+++ b/packages/es-indexer/package.json
@@ -1,6 +1,6 @@
{
"name": "es-indexer",
- "version": "1.0.19",
+ "version": "1.0.20",
"private": true,
"description": "",
"scripts": {
diff --git a/packages/eslint-config-audius/package.json b/packages/eslint-config-audius/package.json
index c7be6722b9a..f7f5101fe87 100644
--- a/packages/eslint-config-audius/package.json
+++ b/packages/eslint-config-audius/package.json
@@ -1,7 +1,7 @@
{
"name": "eslint-config-audius",
"private": true,
- "version": "1.5.72",
+ "version": "1.5.73",
"description": "Custom eslint config for Audius.",
"author": "Audius",
"homepage": "https://github.com/AudiusProject/audius-client#readme",
diff --git a/packages/fixed-decimal/package.json b/packages/fixed-decimal/package.json
index 897bf00312f..a5e69fb05ee 100644
--- a/packages/fixed-decimal/package.json
+++ b/packages/fixed-decimal/package.json
@@ -1,6 +1,6 @@
{
"name": "@audius/fixed-decimal",
- "version": "0.0.21",
+ "version": "0.0.22",
"description": "A data structure to represent fixed precision decimals",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
diff --git a/packages/harmony/package.json b/packages/harmony/package.json
index 6b1f185053e..b2b081d999c 100644
--- a/packages/harmony/package.json
+++ b/packages/harmony/package.json
@@ -1,6 +1,6 @@
{
"name": "@audius/harmony",
- "version": "0.0.30",
+ "version": "0.0.31",
"description": "The Audius Design System",
"license": "ISC",
"author": "Audius",
diff --git a/packages/harmony/src/components/button/Button/Button.tsx b/packages/harmony/src/components/button/Button/Button.tsx
index 9f357b788ef..5411c965dd0 100644
--- a/packages/harmony/src/components/button/Button/Button.tsx
+++ b/packages/harmony/src/components/button/Button/Button.tsx
@@ -108,12 +108,7 @@ export const Button = forwardRef(
'&:hover': secondaryHoverStyles,
'&:active': secondaryHoverStyles,
- ...((_isHovered || _isPressed) && secondaryHoverStyles),
- ...(isDisabled && {
- backgroundColor: themeColors.neutral.n150,
- color: themeColors.static.white,
- boxShadow: 'none'
- })
+ ...((_isHovered || _isPressed) && secondaryHoverStyles)
}
const tertiaryHoverStyles: CSSObject = {
@@ -138,34 +133,7 @@ export const Button = forwardRef(
'&:active': tertiaryActiveStyles,
...(_isHovered && tertiaryHoverStyles),
- ...(_isPressed && tertiaryActiveStyles),
- ...(isDisabled && {
- opacity: 0.45
- })
- }
-
- const commonHoverStyles: CSSObject = {
- backgroundColor: themeColors.neutral.n25
- }
-
- const commonActiveStyles: CSSObject = {
- backgroundColor: themeColors.neutral.n100
- }
-
- const commonStyles: CSSObject = {
- backgroundColor: themeColors.special.white,
- color: themeColors.text.default,
- boxShadow: `0 0 0 1px inset ${themeColors.border.strong}`,
-
- '&:hover': commonHoverStyles,
- '&:active': commonActiveStyles,
-
- ...(_isHovered && commonHoverStyles),
- ...(_isPressed && commonActiveStyles),
- ...(isDisabled && {
- backgroundColor: themeColors.neutral.n150,
- boxShadow: 'none'
- })
+ ...(_isPressed && tertiaryActiveStyles)
}
const destructiveHoverStyles: CSSObject = {
@@ -180,10 +148,7 @@ export const Button = forwardRef(
'&:hover': destructiveHoverStyles,
'&:active': destructiveHoverStyles,
- ...((_isHovered || _isPressed) && destructiveHoverStyles),
- ...(isDisabled && {
- opacity: 0.45
- })
+ ...((_isHovered || _isPressed) && destructiveHoverStyles)
}
const hoverStyles: CSSObject = {
@@ -219,8 +184,6 @@ export const Button = forwardRef(
? tertiaryStyles
: variant === 'destructive'
? destructiveStyles
- : variant === 'common'
- ? commonStyles
: primaryStyles),
'::before': {
@@ -234,13 +197,16 @@ export const Button = forwardRef(
backgroundColor: 'rgba(0, 0, 0, 0)'
},
- ...(variant !== 'tertiary' &&
- variant !== 'common' && {
- ':hover': hoverStyles,
- ':active': activeStyles,
- ...(_isHovered && hoverStyles),
- ...(_isPressed && activeStyles)
- })
+ ...(variant !== 'tertiary' && {
+ ':hover': hoverStyles,
+ ':active': activeStyles,
+ ...(_isHovered && hoverStyles),
+ ...(_isPressed && activeStyles)
+ }),
+
+ ...(isDisabled && {
+ opacity: 0.45
+ })
}
const iconCss =
diff --git a/packages/harmony/src/components/button/Button/types.ts b/packages/harmony/src/components/button/Button/types.ts
index 5cf5d095e0a..ee7927e218c 100644
--- a/packages/harmony/src/components/button/Button/types.ts
+++ b/packages/harmony/src/components/button/Button/types.ts
@@ -6,12 +6,7 @@ import { BaseButtonProps } from '../BaseButton/types'
export type HTMLButtonProps = ComponentPropsWithoutRef<'button'>
-export type ButtonVariant =
- | 'primary'
- | 'secondary'
- | 'tertiary'
- | 'destructive'
- | 'common'
+export type ButtonVariant = 'primary' | 'secondary' | 'tertiary' | 'destructive'
export type ButtonSize = 'small' | 'default' | 'large'
diff --git a/packages/harmony/src/components/button/FollowButton/FollowButton.tsx b/packages/harmony/src/components/button/FollowButton/FollowButton.tsx
index 07afeac0e38..07b6c5483aa 100644
--- a/packages/harmony/src/components/button/FollowButton/FollowButton.tsx
+++ b/packages/harmony/src/components/button/FollowButton/FollowButton.tsx
@@ -106,27 +106,60 @@ export const FollowButton = forwardRef(
text = messages.unfollow
}
- const { color, cornerRadius } = useTheme()
+ const { color, cornerRadius, motion, shadows } = useTheme()
const textColor =
checkedValue || isHovering || isPressing
? color.static.white
: color.primary.primary
+ const borderRadius =
+ variant === 'pill' ? cornerRadius['2xl'] : cornerRadius.s
+
const rootCss: CSSObject = {
cursor: 'pointer',
minWidth: size === 'small' ? 128 : 152,
width: fullWidth ? '100%' : undefined,
userSelect: 'none',
- borderRadius: variant === 'pill' ? cornerRadius['2xl'] : cornerRadius.s,
- background: isPressing
- ? color.primary.p500
- : checkedValue || isHovering
+ borderRadius,
+ backgroundColor: checkedValue
? color.primary.primary
- : color.static.white,
- border: `1px solid ${
- isPressing ? color.primary.p500 : color.primary.primary
- }`
+ : color.special.white,
+ boxShadow: shadows.near,
+ border: `1px solid ${color.primary.primary}`,
+ transition: `
+ transform ${motion.hover},
+ border-color ${motion.hover},
+ background-color ${motion.hover},
+ color ${motion.hover}
+ `,
+ '::before': {
+ zIndex: -1,
+ content: '""',
+ position: 'absolute',
+ top: 0,
+ left: 0,
+ right: 0,
+ bottom: 0,
+ backgroundColor: 'rgba(0, 0, 0, 0)',
+ borderRadius
+ },
+ '&:hover': {
+ backgroundColor: color.primary.primary,
+ borderWidth: 0,
+ boxShadow: shadows.mid,
+ '&::before': {
+ backgroundColor: 'rgba(255, 255, 255, 0.2)'
+ }
+ },
+ '&:active': {
+ backgroundColor: color.primary.primary,
+ borderWidth: 0,
+ boxShadow: 'none',
+ '&::before': {
+ backgroundColor: 'rgba(0, 0, 0, 0.2)'
+ }
+ }
}
// Handles case where user mouses down, moves cursor, and mouses up
@@ -173,6 +206,7 @@ export const FollowButton = forwardRef(
&
- Pick
+ Pick<
+ BaseButtonProps,
+ 'onClick' | 'disabled' | 'className' | 'type' | 'children'
+ >
/**
* The icon component allows you to pass in an icon and
@@ -30,6 +33,7 @@ export const IconButton = forwardRef(
height,
width,
iconCss,
+ children,
...other
} = props
const { disabled } = other
@@ -72,6 +76,7 @@ export const IconButton = forwardRef(
width={width}
css={iconCss}
/>
+ {children}
)
}
diff --git a/packages/harmony/src/components/layout/Popup/Popup.tsx b/packages/harmony/src/components/layout/Popup/Popup.tsx
index da8d70e3039..c409c2df005 100644
--- a/packages/harmony/src/components/layout/Popup/Popup.tsx
+++ b/packages/harmony/src/components/layout/Popup/Popup.tsx
@@ -15,6 +15,7 @@ import { useTransition, animated } from 'react-spring'
import { PlainButton } from 'components/button'
import { IconClose } from 'icons'
+import { ModalState } from 'utils/modalState'
import { useClickOutside } from '../../../hooks/useClickOutside'
import { getScrollParent } from '../../../utils/getScrollParent'
@@ -194,7 +195,7 @@ export const Popup = forwardRef(function Popup(
checkIfClickInside,
children,
className,
- isVisible,
+ isVisible: isVisibleProp,
onAfterClose,
onClose,
anchorOrigin: anchorOriginProp = defaultAnchorOrigin,
@@ -210,6 +211,9 @@ export const Popup = forwardRef(function Popup(
fixed
} = props
const { spring, shadows } = useTheme()
+ const [popupState, setPopupState] = useState('closed')
+
+ const isVisible = popupState !== 'closed'
const handleClose = useCallback(() => {
onClose?.()
@@ -344,7 +348,15 @@ export const Popup = forwardRef(function Popup(
return () => {}
}, [isVisible, handleClose])
- const transitions = useTransition(isVisible, null, {
+ useEffect(() => {
+ if (popupState === 'closed' && isVisibleProp) {
+ setPopupState('opening')
+ } else if (popupState === 'open' && !isVisibleProp) {
+ setPopupState('closing')
+ }
+ }, [isVisibleProp, popupState])
+
+ const transitions = useTransition(isVisibleProp, null, {
from: {
transform: `scale(0)`,
opacity: 0
@@ -358,7 +370,10 @@ export const Popup = forwardRef(function Popup(
opacity: 0
},
config: spring.standard,
- unique: true
+ unique: true,
+ onDestroyed: (isDestroyed) => {
+ setPopupState(isDestroyed ? 'closed' : 'open')
+ }
})
const rootStyle = { zIndex, position: fixed ? ('fixed' as const) : undefined }
@@ -372,49 +387,51 @@ export const Popup = forwardRef(function Popup(
return (
<>
{/* Portal the popup out of the dom structure so that it has a separate stacking context */}
- {ReactDOM.createPortal(
-
- {transitions.map(({ item, key, props }) =>
- item ? (
-
- {showHeader && (
-
+ {transitions.map(({ item, key, props }) =>
+ item ? (
+
- {hideCloseButton ? null : (
-
+ {showHeader && (
+
+ {hideCloseButton ? null : (
+
+ )}
+ {title}
+ {title}
-
- ) : null
- )}
-
- {showDismissButton && (
+
+ <>
+ {/** Begin @deprecated section (moved to ModalHeader and ModalTitle sub-components) */}
+ {showTitleHeader && (
+
+ {showDismissButton && (
+
+
+
+ )}
-
+ {title}
+
+
+ {subtitle}
- )}
-
- {title}
-
-
- {subtitle}
-
-
- )
- )}
- ,
- modalRoot
- )}
+ )
+ )}
+ ,
+ modalRoot
+ )
+ : null}
)
})
diff --git a/packages/harmony/src/components/popup-menu/PopupMenu.module.css b/packages/harmony/src/components/popup-menu/PopupMenu.module.css
index 495b9ec4760..ae9d9673bf1 100644
--- a/packages/harmony/src/components/popup-menu/PopupMenu.module.css
+++ b/packages/harmony/src/components/popup-menu/PopupMenu.module.css
@@ -18,7 +18,7 @@
color: var(--harmony-neutral);
}
-.item .icon {
+.icon {
display: flex;
align-items: center;
justify-content: center;
@@ -32,10 +32,10 @@
.item:hover {
cursor: pointer;
- color: var(--harmony-white);
+ color: var(--harmony-static-white);
background: var(--harmony-secondary);
}
.item:hover path {
- fill: var(--harmony-white);
+ fill: var(--harmony-static-white);
}
diff --git a/packages/harmony/src/components/popup-menu/PopupMenu.tsx b/packages/harmony/src/components/popup-menu/PopupMenu.tsx
index 62051176c59..67d30a7ca49 100644
--- a/packages/harmony/src/components/popup-menu/PopupMenu.tsx
+++ b/packages/harmony/src/components/popup-menu/PopupMenu.tsx
@@ -106,11 +106,11 @@ export const PopupMenu = forwardRef (
onClick={handleMenuItemClick(item)}
tabIndex={i === 0 ? 0 : -1}
>
- {item.icon && (
+ {item.icon ? (
{item.icon}
- )}
+ ) : null}
{item.text}
))}
diff --git a/packages/harmony/src/utils/modalState.ts b/packages/harmony/src/utils/modalState.ts
new file mode 100644
index 00000000000..e22fc31f093
--- /dev/null
+++ b/packages/harmony/src/utils/modalState.ts
@@ -0,0 +1 @@
+export type ModalState = 'opening' | 'open' | 'closing' | 'closed'
diff --git a/packages/identity-service/package.json b/packages/identity-service/package.json
index 5cfc536ed10..ba5ae0163cf 100644
--- a/packages/identity-service/package.json
+++ b/packages/identity-service/package.json
@@ -151,5 +151,5 @@
"src/notifications/renderEmail/*"
]
},
- "version": "0.0.27"
+ "version": "0.0.28"
}
diff --git a/packages/libs/package.json b/packages/libs/package.json
index 83f29d505e5..30344c04bfc 100644
--- a/packages/libs/package.json
+++ b/packages/libs/package.json
@@ -1,6 +1,6 @@
{
"name": "@audius/sdk",
- "version": "3.0.40",
+ "version": "3.0.41",
"audius": {
"releaseSHA": "f1d70a2a0643c5c84d8ab053f70c1e0a2ec3ad49"
},
@@ -63,9 +63,9 @@
"prepack": "turbo run build"
},
"dependencies": {
- "@audius/fixed-decimal": "^0.0.21",
+ "@audius/fixed-decimal": "*",
"@audius/hedgehog": "3.0.0-alpha.0",
- "@audius/spl": "^0.0.27",
+ "@audius/spl": "*",
"@babel/core": "^7.23.7",
"@babel/plugin-proposal-class-static-block": "7.21.0",
"@babel/runtime": "7.18.3",
diff --git a/packages/libs/src/api/Track.ts b/packages/libs/src/api/Track.ts
index 2b42cc76bf6..d3a3341d487 100644
--- a/packages/libs/src/api/Track.ts
+++ b/packages/libs/src/api/Track.ts
@@ -603,51 +603,105 @@ export class Track extends Base {
* Prevents additional fields from being included in metadata
*/
static _parseTrackMetadata(trackMetadata: TrackMetadata): TrackMetadata {
+ const {
+ blocknumber,
+ is_delete,
+ track_id,
+ is_downloadable,
+ is_original_available,
+ created_at,
+ isrc,
+ iswc,
+ credits_splits,
+ description,
+ genre,
+ has_current_user_reposted,
+ has_current_user_saved,
+ license,
+ mood,
+ play_count,
+ owner_id,
+ release_date,
+ repost_count,
+ save_count,
+ tags,
+ title,
+ track_segments,
+ cover_art,
+ cover_art_sizes,
+ is_unlisted,
+ is_available,
+ is_stream_gated,
+ stream_conditions,
+ is_download_gated,
+ download_conditions,
+ permalink,
+ preview_start_seconds,
+ duration,
+ is_invalid,
+ stem_of,
+ ddex_app,
+ is_playlist_upload,
+ audio_upload_id,
+ track_cid,
+ orig_file_cid,
+ orig_filename,
+ preview_cid,
+ dateListened,
+ remix_of,
+ ai_attribution_user_id,
+ ...other
+ } = trackMetadata
+ if (typeof other !== 'undefined') {
+ console.warn('Unknown keys in upload metadata:', Object.keys(other))
+ }
return {
- blocknumber: trackMetadata.blocknumber,
- is_delete: trackMetadata.is_delete,
- track_id: trackMetadata.track_id,
- is_downloadable: trackMetadata.is_downloadable,
- is_original_available: trackMetadata.is_original_available,
- created_at: trackMetadata.created_at,
- isrc: trackMetadata.isrc,
- iswc: trackMetadata.iswc,
- credits_splits: trackMetadata.credits_splits,
- description: trackMetadata.description,
- genre: trackMetadata.genre,
- has_current_user_reposted: trackMetadata.has_current_user_reposted,
- has_current_user_saved: trackMetadata.has_current_user_saved,
- license: trackMetadata.license,
- mood: trackMetadata.mood,
- play_count: trackMetadata.play_count,
- owner_id: trackMetadata.owner_id,
- release_date: trackMetadata.release_date,
- repost_count: trackMetadata.repost_count,
- save_count: trackMetadata.save_count,
- tags: trackMetadata.tags,
- title: trackMetadata.title,
- track_segments: trackMetadata.track_segments,
- cover_art: trackMetadata.cover_art,
- cover_art_sizes: trackMetadata.cover_art_sizes,
- is_unlisted: trackMetadata.is_unlisted,
- is_available: trackMetadata.is_available,
- is_stream_gated: trackMetadata.is_stream_gated,
- stream_conditions: trackMetadata.stream_conditions,
- is_download_gated: trackMetadata.is_download_gated,
- download_conditions: trackMetadata.download_conditions,
- permalink: trackMetadata.permalink,
- preview_start_seconds: trackMetadata.preview_start_seconds,
- duration: trackMetadata.duration,
- is_invalid: trackMetadata.is_invalid,
- stem_of: trackMetadata.stem_of,
- ddex_app: trackMetadata.ddex_app,
- is_playlist_upload: trackMetadata.is_playlist_upload,
- audio_upload_id: trackMetadata.audio_upload_id,
- track_cid: trackMetadata.track_cid,
- orig_file_cid: trackMetadata.orig_file_cid,
- orig_filename: trackMetadata.orig_filename,
- preview_cid: trackMetadata.preview_cid,
- dateListened: trackMetadata.dateListened
+ blocknumber,
+ is_delete,
+ track_id,
+ is_downloadable,
+ is_original_available,
+ created_at,
+ isrc,
+ iswc,
+ credits_splits,
+ description,
+ genre,
+ has_current_user_reposted,
+ has_current_user_saved,
+ license,
+ mood,
+ play_count,
+ owner_id,
+ release_date,
+ repost_count,
+ save_count,
+ tags,
+ title,
+ track_segments,
+ cover_art,
+ cover_art_sizes,
+ is_unlisted,
+ is_available,
+ is_stream_gated,
+ stream_conditions,
+ is_download_gated,
+ download_conditions,
+ permalink,
+ preview_start_seconds,
+ duration,
+ is_invalid,
+ stem_of,
+ ddex_app,
+ is_playlist_upload,
+ audio_upload_id,
+ track_cid,
+ orig_file_cid,
+ orig_filename,
+ preview_cid,
+ dateListened,
+ remix_of,
+ ai_attribution_user_id
}
}
}
diff --git a/packages/libs/src/sdk/services/DiscoveryNodeSelector/DiscoveryNodeSelector.ts b/packages/libs/src/sdk/services/DiscoveryNodeSelector/DiscoveryNodeSelector.ts
index 4265317e30f..bd487541e04 100644
--- a/packages/libs/src/sdk/services/DiscoveryNodeSelector/DiscoveryNodeSelector.ts
+++ b/packages/libs/src/sdk/services/DiscoveryNodeSelector/DiscoveryNodeSelector.ts
@@ -738,7 +738,7 @@ export class DiscoveryNodeSelector implements DiscoveryNodeSelectorService {
// Retry once on new endpoint
return await context.fetch(`${newEndpoint}${path}`, context.init)
} catch (e) {
- this.logger.error('Retry on new node failed', newEndpoint)
+ this.logger.error('Retry on new node failed', newEndpoint, e)
}
}
return undefined
diff --git a/packages/libs/src/utils/types.ts b/packages/libs/src/utils/types.ts
index f135641f586..7bb45e48ccc 100644
--- a/packages/libs/src/utils/types.ts
+++ b/packages/libs/src/utils/types.ts
@@ -186,6 +186,11 @@ export type TrackMetadata = {
copyright_line?: Nullable
producer_copyright_line?: Nullable
parental_warning_type?: Nullable
+ remix_of: Nullable<{
+ tracks: Array<{
+ parent_track_id: ID
+ }>
+ }>
// Optional Fields
is_invalid?: boolean
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index cf9b9daa9c1..1f0f699e6ef 100755
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -113,7 +113,7 @@ android {
// versionCode is automatically incremented in CI
versionCode 1
// Make sure this is above the currently released Android version in the play store if your changes touch native code:
- versionName "1.1.417"
+ versionName "1.1.418"
resValue "string", "build_config_package", "co.audius.app"
resValue 'string', "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis())
resConfigs "en"
diff --git a/packages/mobile/ios/AudiusReactNative/Info.plist b/packages/mobile/ios/AudiusReactNative/Info.plist
index ce9740a1239..e688e34442e 100644
--- a/packages/mobile/ios/AudiusReactNative/Info.plist
+++ b/packages/mobile/ios/AudiusReactNative/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.1.91
+ 1.1.92
CFBundleSignature
????
CFBundleURLTypes
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index fb65cc4c977..de6aa9e9ef4 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
{
"name": "audius-mobile-client",
- "version": "1.5.72",
+ "version": "1.5.73",
"private": true,
"scripts": {
"android:dev": "ENVFILE=.env.dev turbo run android -- --mode=prodDebug",
diff --git a/packages/mobile/src/screens/search-screen/SearchScreen.tsx b/packages/mobile/src/screens/search-screen/SearchScreen.tsx
index 615e1e6ab4a..59c0dd8d8b9 100644
--- a/packages/mobile/src/screens/search-screen/SearchScreen.tsx
+++ b/packages/mobile/src/screens/search-screen/SearchScreen.tsx
@@ -40,7 +40,7 @@ export const SearchScreen = () => {
)
const renderSearchContent = () => {
- if (hasResults) {
+ if (hasResults && !searchBarText.startsWith('#')) {
return
}
if (searchBarText && !hasResults) {
diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx
index 43ea3264f43..0451eecbc95 100644
--- a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx
+++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx
@@ -106,17 +106,7 @@ export const CreateEmailScreen = (props: SignOnScreenProps) => {
) : null}
-
- {createEmailPageMessages.subHeader.line1}
- {'\n'}
- {createEmailPageMessages.subHeader.line2}
-
- }
- centered
- />
+
{
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should favorite and unfavorite track correctly', () => {
- const base64Entropy = Buffer.from(user.entropy).toString('base64')
- cy.visit(`${track.route}?login=${base64Entropy}`)
-
- cy.findByText(user.name, {
- timeout: Cypress.env('initialLoadTimeout')
- }).should('exist')
- cy.findByRole('heading', { name: track.name, timeout: 20000 }).should(
- 'exist'
- )
-
- cy.findByRole('group', { name: /track actions/i }).within(() => {
- cy.findByRole('button', { name: /favorite$/i }).click()
- cy.findByRole('button', { name: /favorited/i }).should('exist')
- })
- waitForTransaction(1)
- cy.reload()
-
- cy.findByRole('group', { name: /track actions/i }).within(() => {
- cy.findByRole('button', { name: /favorited/i }).click()
- cy.findByRole('button', { name: /favorite$/i }).should('exist')
- })
-
- waitForTransaction(2)
- cy.reload()
-
- cy.findByRole('group', { name: /track actions/i }).within(() => {
- cy.findByRole('button', { name: /favorite$/i }).should('exist')
- })
- })
-})
diff --git a/packages/probers/cypress/e2e/flaky test meme.jpeg b/packages/probers/cypress/e2e/flaky test meme.jpeg
deleted file mode 100644
index ac7f4e40f97..00000000000
Binary files a/packages/probers/cypress/e2e/flaky test meme.jpeg and /dev/null differ
diff --git a/packages/probers/cypress/e2e/flaky-test-jail.md b/packages/probers/cypress/e2e/flaky-test-jail.md
deleted file mode 100644
index be3ebc54850..00000000000
--- a/packages/probers/cypress/e2e/flaky-test-jail.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Flaky Test Jail
-
-
-
-A list of flaky/misbehaving tests that we are currently skipping in order to keep a green baseline
-
-## Current Inmates - [C-3508]
-
-#### [Sign Up](./signUp.cy.ts) - [C-3593]
-
-"should create an account" tests are skipped until they can be updated
-
-
-
-## Test Jail Process
-
-- Create an appropriate ticket for addressing the test
-- Update this doc with the flaky tests and a description
-- Add a TODO: comment by the test with the ticket number for searchability
diff --git a/packages/probers/cypress/e2e/playTrack.cy.ts b/packages/probers/cypress/e2e/playTrack.cy.ts
deleted file mode 100644
index 25727c87505..00000000000
--- a/packages/probers/cypress/e2e/playTrack.cy.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-describe('Play Track', () => {
- it('should play a trending track', () => {
- cy.visit('trending')
- cy.findByRole('list', { name: /weekly trending tracks/i }).within(() => {
- // Wait for skeletons to not exist to indicate we are done loading
- cy.get('[aria-busy]').should('not.exist')
-
- cy.findAllByRole('listitem').first().click('left')
- })
-
- cy.findByRole('button', {
- name: /pause track/i,
- timeout: 20000
- }).should('exist')
- cy.window().its('audio.paused').should('equal', false)
- cy.findByRole('button', {
- name: /pause track/i
- }).click()
- cy.findByRole('button', { name: /play track/i }).should('exist')
- cy.window().its('audio.paused').should('equal', true)
- })
-})
diff --git a/packages/probers/cypress/e2e/repostTrack.cy.ts b/packages/probers/cypress/e2e/repostTrack.cy.ts
deleted file mode 100644
index 360ed815e54..00000000000
--- a/packages/probers/cypress/e2e/repostTrack.cy.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import track from '../fixtures/track.json'
-import user from '../fixtures/user.json'
-
-import { waitForTransaction } from './uilts'
-
-describe('Repost Track', () => {
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should repost and unrepost track correctly', () => {
- const base64Entropy = Buffer.from(user.entropy).toString('base64')
- cy.visit(`${track.route}?login=${base64Entropy}`)
-
- cy.findByText(user.name, {
- timeout: Cypress.env('initialLoadTimeout')
- }).should('exist')
- cy.findByRole('heading', { name: track.name, timeout: 20000 }).should(
- 'exist'
- )
-
- cy.findByRole('group', { name: /track actions/i }).within(() => {
- cy.findByRole('button', { name: /repost$/i }).click()
- cy.findByRole('button', { name: /reposted/i }).should('exist')
- })
- waitForTransaction(1)
- cy.reload()
-
- cy.findByRole('group', { name: /track actions/i }).within(() => {
- cy.findByRole('button', { name: /reposted/i }).click()
- cy.findByRole('button', { name: /repost$/i }).should('exist')
- })
-
- waitForTransaction(2)
- cy.reload()
-
- cy.findByRole('group', { name: /track actions/i }).within(() => {
- cy.findByRole('button', { name: /repost$/i }).should('exist')
- })
- })
-})
diff --git a/packages/probers/cypress/e2e/signIn.cy.ts b/packages/probers/cypress/e2e/signIn.cy.ts
deleted file mode 100644
index f80c96f12ab..00000000000
--- a/packages/probers/cypress/e2e/signIn.cy.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { email, password, name, handle } from '../fixtures/user.json'
-
-function assertOnSignInPage() {
- cy.findByRole('heading', { name: /sign into audius/i, level: 1 }).should(
- 'exist'
- )
-}
-
-describe('Sign In', () => {
- beforeEach(() => {
- localStorage.setItem('FeatureFlagOverride:sign_up_redesign', 'enabled')
- })
-
- it('can navigate to sign-in from trending screen', () => {
- cy.visit('trending')
- cy.findByText(/have an account\?/i).should('exist')
- cy.findByRole('link', { name: /sign in/i }).click()
- assertOnSignInPage()
- })
-
- it('/signin goes to sign-in', () => {
- cy.visit('signin')
- assertOnSignInPage()
- })
-
- it('can navigate to sign-in from sign-up', () => {
- cy.visit('signup')
- cy.findByText(/already have an account?/i)
- cy.findByRole('link', { name: /Sign In/ }).click()
- assertOnSignInPage()
- })
-
- it('can navigate to sign-in after entering email in sign-up', () => {
- cy.visit('signup')
- cy.findByRole('textbox', { name: /email/i }).type(email)
- cy.findByRole('button', { name: /sign up free/i }).click()
- cy.findByRole('alert').within(() => {
- cy.findByRole('link', { name: /Sign In/ }).click()
- })
- assertOnSignInPage()
- })
-
- // We need to integrate a hard-coded otp for this user
- it.skip('can sign in', () => {
- cy.visit('signin')
- assertOnSignInPage()
- cy.findByRole('textbox', { name: /email/i }).type(email)
- // Password inputs dont have a role, so we just check against label text
- // https://github.com/testing-library/dom-testing-library/issues/567#issue-616906804
- cy.findByLabelText(/^password/i).type(password)
- cy.findByRole('button', { name: /sign in/i }).click()
-
- cy.findByRole('heading', {
- name: /your feed/i,
- level: 1,
- timeout: 20000
- }).should('exist')
-
- cy.findByText(name).should('exist')
- cy.findByText(`@${handle}`).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/signOut.cy.ts b/packages/probers/cypress/e2e/signOut.cy.ts
deleted file mode 100644
index abb8591440d..00000000000
--- a/packages/probers/cypress/e2e/signOut.cy.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import user from '../fixtures/user.json'
-
-describe('Sign Out', () => {
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should be able to sign out', () => {
- const base64Entropy = Buffer.from(user.entropy).toString('base64')
- cy.visit(`trending?login=${base64Entropy}`)
- cy.findByText(user.name).should('exist')
-
- cy.visit('settings')
-
- cy.findByRole('heading', { name: /settings/i, level: 1 }).should('exist')
- cy.findByRole('button', { name: /sign out/i }).click()
-
- cy.findByRole('dialog', { name: /hold up/i }).within(() => {
- cy.findByRole('button', { name: /sign out/i }).click()
- })
-
- cy.findByText(/have an account?/i, { timeout: 20000 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/signUp.cy.ts b/packages/probers/cypress/e2e/signUp.cy.ts
deleted file mode 100644
index 45f4be465f6..00000000000
--- a/packages/probers/cypress/e2e/signUp.cy.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-/* eslint-disable jest/no-identical-title */
-import dayjs from 'dayjs'
-
-function generateTestUser() {
- const ts = dayjs().format('YYMMDD_HHmmss')
- const email = `prober+${ts}@audius.co`
- const password = 'Pa$$w0rdTest'
- const name = `Prober ${ts}`
- const handle = `p_${ts}`
- return {
- email,
- password,
- name,
- handle
- }
-}
-
-type User = {
- email: string
-}
-
-function assertOnSignUpPage() {
- cy.findByRole('heading', { name: /sign up for audius/i, level: 1 }).should(
- 'exist'
- )
-}
-
-function assertOnCreatePasswordPage(user: User) {
- cy.findByRole('heading', { name: /create your password/i }).should('exist')
-
- cy.findByText(
- /Create a password that’s secure and easy to remember!/i
- ).should('exist')
-
- cy.findByText(/your email/i).should('exist')
- cy.findByText(user.email).should('exist')
-}
-
-function testSignUp({ isMobile = false }) {
- const testUser = generateTestUser()
- const { email, password, handle, name } = testUser
- cy.visit('signup')
- cy.findByRole('textbox', { name: /email/i }).type(email)
- cy.findByRole('button', { name: /sign up free/i }).click()
-
- assertOnCreatePasswordPage(testUser)
-
- // Password inputs dont have a role, so we just check against label text
- // https://github.com/testing-library/dom-testing-library/issues/567#issue-616906804
- cy.findByLabelText(/^password/i).type(password)
- cy.findByLabelText(/confirm password/i).type(password, { force: true })
-
- cy.findByRole('button', { name: /continue/i }).click()
-
- cy.findByRole('heading', { name: /pick your handle/i }).should('exist')
- cy.findByText(/this is how others find and tag you/i).should('exist')
- cy.findByRole('textbox', { name: /handle/i }).type(handle)
- cy.findByRole('button', { name: /continue/i }).click()
-
- cy.findByRole('heading', { name: /finish your profile/i }).should('exist')
- cy.findByText(/your photos & display name is how others see you./i).should(
- 'exist'
- )
-
- cy.findByTestId('coverPhoto-dropzone').attachFile('cover-photo.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByTestId('profileImage-dropzone').attachFile('profile-picture.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByRole('textbox', { name: /display name/i }).type(name)
- cy.findByRole('button', { name: /continue/i }).click()
-
- cy.findByRole('heading', { name: /select your genres/i }).should('exist')
- cy.findByText(/start by picking some of your favorite genres./i).should(
- 'exist'
- )
-
- cy.findByText(name).should('exist')
- cy.findByText(`@${handle}`).should('exist')
-
- const genres = [/^acoustic/i, /^pop/i, /^lo-fi/i, /^electronic/i]
-
- for (const genre of genres) {
- cy.findByRole('checkbox', { name: genre }).check()
- }
-
- cy.findByRole('button', { name: /continue/i }).click()
-
- cy.findByRole('heading', { name: /follow at least 3 artists/i }).should(
- 'exist'
- )
- cy.findByText(/curate your feed with tracks uploaded/i).should('exist')
-
- cy.findByRole('radiogroup', { name: /genre/i }).within(() => {
- cy.findByRole('radio', { name: /featured/i }).should('be.checked')
-
- for (const genre of genres) {
- cy.findByRole('radio', { name: genre }).should('exist')
- }
- })
-
- function selectArtist(sectionName: RegExp) {
- cy.findByRole('group', { name: sectionName }).within(() => {
- cy.findAllByRole('checkbox', { checked: false }).first().click()
- })
- }
-
- selectArtist(/pick featured artists/i)
-
- cy.findByRole('radio', { name: /acoustic/i }).click()
- selectArtist(/pick acoustic artists/i)
-
- cy.findByRole('radio', { name: /electronic/i }).click()
- selectArtist(/pick electronic artists/i)
-
- cy.findByRole('button', { name: /continue/i }).click()
-
- if (!isMobile) {
- cy.findByRole('heading', { name: /get the app/i }).click()
- cy.findByText(/take audius with you/i).should('exist')
- cy.findByRole('button', { name: /continue/i }).click()
- }
-
- cy.findByRole('dialog', {
- name: /welcome to audius/i,
- timeout: 120000
- }).within(() => {
- cy.findByRole('button', { name: /start listening/i }).click()
- })
-}
-
-describe('Sign Up', () => {
- beforeEach(() => {
- localStorage.setItem('FeatureFlagOverride:sign_up_redesign', 'enabled')
- })
-
- context('desktop', () => {
- it('can navigate to signup from trending', () => {
- cy.visit('trending')
- cy.findByText(/have an account\?/i).should('exist')
- cy.findByRole('link', { name: /sign up/i }).click()
- assertOnSignUpPage()
- })
-
- it('/signup goes to sign-up', () => {
- cy.visit('signup')
- assertOnSignUpPage()
- })
-
- it('can navigate to sign-up from sign-in', () => {
- cy.visit('signin')
- cy.findByRole('link', { name: /create an account/i }).click()
-
- assertOnSignUpPage()
- })
-
- it('can navigate to sign-up from the public site', () => {
- cy.visit('')
- cy.findByRole('link', { name: /sign up/i }).click()
- assertOnSignUpPage()
- })
-
- it('should create an account', () => {
- testSignUp({ isMobile: false })
- })
- })
-
- context('mobile', () => {
- beforeEach(() => {
- cy.viewport('iphone-x')
- })
-
- it('can navigate to signup from trending', () => {
- cy.visit('trending')
- cy.findByRole('link', { name: /sign up/i }).click()
- assertOnSignUpPage()
- })
-
- it('/signup goes to sign-up', () => {
- cy.visit('signup')
- assertOnSignUpPage()
- })
-
- it('can navigate to sign-up from sign-in', () => {
- cy.visit('signin')
- cy.findByRole('link', { name: /create an account/i }).click()
-
- assertOnSignUpPage()
- })
-
- it('can navigate to sign-up from the public site', () => {
- cy.visit('')
- cy.findByRole('button', { name: /open nav menu/i }).click()
- cy.findByRole('link', { name: /sign up/i }).click()
-
- assertOnSignUpPage()
- })
-
- it('should create an account', () => {
- testSignUp({ isMobile: true })
- })
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/album.cy.ts b/packages/probers/cypress/e2e/smoke/album.cy.ts
deleted file mode 100644
index db3859b0c84..00000000000
--- a/packages/probers/cypress/e2e/smoke/album.cy.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { route, name } from '../../fixtures/album.json'
-
-describe('Smoke test -- album page', () => {
- it('Should load an album page when visited!', () => {
- cy.visit(route)
- cy.findByRole('heading', { name, level: 1, timeout: 10000 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/feed.cy.ts b/packages/probers/cypress/e2e/smoke/feed.cy.ts
deleted file mode 100644
index 4bf7b92ccb6..00000000000
--- a/packages/probers/cypress/e2e/smoke/feed.cy.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import user from '../../fixtures/user.json'
-
-describe('Smoke test -- feed page', () => {
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should load feed page when visited', () => {
- const base64Entropy = Buffer.from(user.entropy).toString('base64')
- cy.visit(`trending?login=${base64Entropy}`)
-
- cy.findByText(user.name, {
- timeout: Cypress.env('initialLoadTimeout')
- }).should('exist')
-
- cy.visit('feed')
-
- cy.findByRole('heading', { name: /your feed/i, level: 1 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/playlist.cy.ts b/packages/probers/cypress/e2e/smoke/playlist.cy.ts
deleted file mode 100644
index db085793410..00000000000
--- a/packages/probers/cypress/e2e/smoke/playlist.cy.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { route, name } from '../../fixtures/playlist.json'
-
-describe('Smoke test -- playlist page', () => {
- it('should load a playlist page when visited', () => {
- cy.visit(route)
- cy.findByRole('heading', { name, level: 1, timeout: 20000 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/remix.cy.ts b/packages/probers/cypress/e2e/smoke/remix.cy.ts
deleted file mode 100644
index e9d7a6b5f99..00000000000
--- a/packages/probers/cypress/e2e/smoke/remix.cy.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { route, name } from '../../fixtures/remix.json'
-
-describe('Smoke test -- remix page', () => {
- it('should load a remix page when visited', () => {
- cy.visit(route)
- cy.findByRole('heading', { name, level: 1 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/remixes.cy.ts b/packages/probers/cypress/e2e/smoke/remixes.cy.ts
deleted file mode 100644
index 0c0f721f1fc..00000000000
--- a/packages/probers/cypress/e2e/smoke/remixes.cy.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { route } from '../../fixtures/remixes.json'
-
-describe('Smoke test -- remixes page', () => {
- it('should load a remixes page when visited', () => {
- cy.visit(route)
- cy.findByRole('heading', {
- name: 'Remixes',
- level: 1,
- timeout: 10000
- }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/track.cy.ts b/packages/probers/cypress/e2e/smoke/track.cy.ts
deleted file mode 100644
index 29071fa2dc4..00000000000
--- a/packages/probers/cypress/e2e/smoke/track.cy.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { route, name } from '../../fixtures/track.json'
-
-describe('Smoke test -- track page', () => {
- it('should load a track page when visited', () => {
- cy.visit(route)
- cy.findByRole('heading', { name, level: 1 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/trending.cy.ts b/packages/probers/cypress/e2e/smoke/trending.cy.ts
deleted file mode 100644
index b2feb220c0d..00000000000
--- a/packages/probers/cypress/e2e/smoke/trending.cy.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-describe('Smoke test -- trending page', () => {
- it('should load trending page when visited', () => {
- cy.visit('trending')
- cy.findByRole('heading', { name: /trending/i, level: 1 }).should('exist')
- })
-})
diff --git a/packages/probers/cypress/e2e/smoke/upload.cy.ts b/packages/probers/cypress/e2e/smoke/upload.cy.ts
deleted file mode 100644
index 55e8471669b..00000000000
--- a/packages/probers/cypress/e2e/smoke/upload.cy.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import user from '../../fixtures/user.json'
-describe('Smoke test -- upload page', () => {
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should load upload page when visited', () => {
- const base64Entropy = Buffer.from(user.entropy).toString('base64')
- cy.visit(`trending?login=${base64Entropy}`)
-
- cy.findByText(user.name, {
- timeout: Cypress.env('initialLoadTimeout')
- }).should('exist')
-
- cy.visit('upload')
-
- cy.findByRole('heading', { name: /upload your music/i, level: 1 }).should(
- 'exist'
- )
- })
-})
diff --git a/packages/probers/cypress/e2e/uilts.ts b/packages/probers/cypress/e2e/uilts.ts
deleted file mode 100644
index 0d3433de167..00000000000
--- a/packages/probers/cypress/e2e/uilts.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export const waitForTransaction = (transactionNumber: number) => {
- cy.intercept({ method: 'POST', url: '**/relay' }).as(
- `relayCheck-${transactionNumber}`
- )
- cy.wait(`@relayCheck-${transactionNumber}`).then((xhr) => {
- const { blockHash, blockNumber } = xhr.response.body.receipt
- cy.intercept({
- url: '**/block_confirmation*',
- query: { blockhash: blockHash, blocknumber: String(blockNumber) }
- }).as(`blockConfirmation-${blockNumber}`)
-
- waitForBlockConfirmation(`@blockConfirmation-${blockNumber}`)
- })
-}
-
-const waitForBlockConfirmation = (routeAlias, retries = 3) => {
- cy.wait(routeAlias, { timeout: 10000 }).then((xhr) => {
- const { block_passed } = xhr.response.body.data
- if (block_passed) {
- } else if (retries > 0) waitForBlockConfirmation(routeAlias, retries - 1)
- // wait for the next response
- else throw new Error('All requests returned non-200 response')
- })
-}
diff --git a/packages/probers/cypress/e2e/uploadCollection.cy.ts b/packages/probers/cypress/e2e/uploadCollection.cy.ts
deleted file mode 100644
index c40dfd3fb91..00000000000
--- a/packages/probers/cypress/e2e/uploadCollection.cy.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import dayjs from 'dayjs'
-
-import aiAttribution from '../fixtures/aiAttribution.json'
-import remix from '../fixtures/remix.json'
-const timestamp = dayjs().format('YYMMDD_HHmmss')
-
-const visitUpload = () => {
- cy.login()
- cy.findByRole('link', { name: /upload track/i }).click()
- cy.findByRole('heading', { name: /upload your music/i, level: 1 }).should(
- 'exist'
- )
-}
-
-const completeUpload = () => {
- cy.findByRole('button', { name: /complete upload/i }).click()
-
- cy.findByRole('dialog', { name: /confirm upload/i }).within(() => {
- cy.findByRole('button', { name: /upload/i }).click()
- })
-
- cy.findByRole('heading', {
- name: /uploading your/i,
- level: 1
- }).should('exist')
-
- cy.findByRole('main').within(() => {
- cy.findByRole('progressbar', { name: /upload in progress/i }).should(
- 'have.attr',
- 'aria-valuenow',
- '0'
- )
-
- const assertProgress = (progress: number) => {
- cy.waitUntil(
- () => {
- return cy
- .findByRole('progressbar', { name: /upload in progress/i })
- .then((progressbar) => {
- return Number(progressbar.attr('aria-valuenow')) > progress
- })
- },
- { timeout: 100000, interval: 5000 }
- )
- }
-
- assertProgress(0)
- assertProgress(10)
- assertProgress(20)
- assertProgress(30)
- assertProgress(40)
- assertProgress(50)
- assertProgress(60)
- assertProgress(70)
- assertProgress(80)
- assertProgress(90)
- })
-
- cy.findByText(/finalizing upload/i).should('exist')
-
- cy.findByRole('heading', {
- name: /your upload is complete/i,
- level: 3,
- timeout: 100000
- }).should('exist')
-}
-
-describe('Upload Collection', () => {
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should upload a playlist', () => {
- visitUpload()
-
- // Select track
-
- cy.findByTestId('upload-dropzone').attachFile(
- ['track-small.mp3', 'track-small-2.mp3'],
- {
- subjectType: 'drag-n-drop'
- }
- )
-
- cy.findByRole('radiogroup', { name: 'Release Type' }).within(() => {
- cy.findByRole('radio', { name: 'Playlist' }).click({ force: true })
- })
-
- cy.findByRole('button', { name: /continue uploading/i }).click()
-
- // Complete track form
-
- cy.findByRole('heading', {
- name: /complete your playlist/i,
- level: 1
- }).should('exist')
- cy.findByRole('button', { name: /add artwork/i }).click()
-
- cy.findByTestId('upload-dropzone').attachFile('track-artwork.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByRole('textbox', { name: /Playlist Name/i })
- .clear()
- .type(`Test playlist ${timestamp}`)
-
- let i = 1
- cy.findAllByRole('textbox', { name: /track name/i }).each(($el) => {
- cy.wrap($el).clear().type(`Test track ${i++} ${timestamp}`)
- })
-
- cy.findByRole('combobox', { name: /pick a genre/i })
- .click()
- .type('pro')
- cy.findByRole('option', { name: /electronic - progressive house/i }).click()
-
- cy.findByRole('combobox', { name: /pick a mood/i }).click()
- cy.findByRole('option', { name: /tender/i }).click()
-
- cy.findByRole('textbox', { name: /tags/i })
- .type('tag1{enter}')
- .type('tag2')
- .tab()
-
- cy.findByRole('textbox', { name: /playlist description/i }).type(
- 'Test Description'
- )
-
- completeUpload()
-
- cy.findByRole('link', { name: /visit playlist page/i }).click()
- cy.findByRole('heading', { name: /playlist/i, level: 1 }).should('exist')
-
- cy.findByRole('table').within(() => {
- cy.findByRole('cell', { name: /Test track 1/ })
- cy.findByRole('cell', { name: /Test track 2/ })
- })
- })
-
- it('should upload a album', () => {
- visitUpload()
-
- // Select track
-
- cy.findByTestId('upload-dropzone').attachFile(
- ['track-small.mp3', 'track-small-2.mp3'],
- {
- subjectType: 'drag-n-drop'
- }
- )
-
- cy.findByRole('radiogroup', { name: 'Release Type' }).within(() => {
- cy.findByRole('radio', { name: 'Album' }).click({ force: true })
- })
-
- cy.findByRole('button', { name: /continue uploading/i }).click()
-
- // Complete track form
-
- cy.findByRole('heading', {
- name: /complete your album/i,
- level: 1
- }).should('exist')
- cy.findByRole('button', { name: /add artwork/i }).click()
-
- cy.findByTestId('upload-dropzone').attachFile('track-artwork.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByRole('textbox', { name: /Album Name/i })
- .clear()
- .type(`Test album ${timestamp}`)
-
- let i = 1
- cy.findAllByRole('textbox', { name: /track name/i }).each(($el) => {
- cy.wrap($el).clear().type(`Test track ${i++} ${timestamp}`)
- })
-
- cy.findByRole('combobox', { name: /pick a genre/i })
- .click()
- .type('pro')
- cy.findByRole('option', { name: /electronic - progressive house/i }).click()
-
- cy.findByRole('combobox', { name: /pick a mood/i }).click()
- cy.findByRole('option', { name: /tender/i }).click()
-
- cy.findByRole('textbox', { name: /tags/i })
- .type('tag1{enter}')
- .type('tag2')
- .tab()
-
- cy.findByRole('textbox', { name: /album description/i }).type(
- 'Test Description'
- )
-
- completeUpload()
-
- cy.findByRole('link', { name: /visit album page/i }).click()
- cy.findByRole('heading', { name: /album/i, level: 1 }).should('exist')
-
- cy.findByRole('table').within(() => {
- cy.findByRole('cell', { name: /Test track 1/ })
- cy.findByRole('cell', { name: /Test track 2/ })
- })
- })
-})
diff --git a/packages/probers/cypress/e2e/uploadTrack.cy.ts b/packages/probers/cypress/e2e/uploadTrack.cy.ts
deleted file mode 100644
index e50f2b91ec0..00000000000
--- a/packages/probers/cypress/e2e/uploadTrack.cy.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import dayjs from 'dayjs'
-
-import aiAttribution from '../fixtures/aiAttribution.json'
-import remix from '../fixtures/remix.json'
-const timestamp = dayjs().format('YYMMDD_HHmmss')
-
-const visitUpload = () => {
- cy.login()
- cy.findByRole('link', { name: /upload track/i }).click()
- cy.findByRole('heading', { name: /upload your music/i, level: 1 }).should(
- 'exist'
- )
-}
-
-const completeUpload = () => {
- cy.findByRole('button', { name: /complete upload/i }).click()
-
- cy.findByRole('dialog', { name: /confirm upload/i }).within(() => {
- cy.findByRole('button', { name: /upload/i }).click()
- })
-
- cy.findByRole('heading', {
- name: /uploading your track/i,
- level: 1
- }).should('exist')
-
- cy.findByRole('main').within(() => {
- cy.findByRole('progressbar', { name: /upload in progress/i }).should(
- 'have.attr',
- 'aria-valuenow',
- '0'
- )
-
- const assertProgress = (progress: number) => {
- cy.waitUntil(
- () => {
- return cy
- .findByRole('progressbar', { name: /upload in progress/i })
- .then((progressbar) => {
- return Number(progressbar.attr('aria-valuenow')) > progress
- })
- },
- { timeout: 100000, interval: 5000 }
- )
- }
-
- assertProgress(0)
- assertProgress(10)
- assertProgress(20)
- assertProgress(30)
- assertProgress(40)
- assertProgress(50)
- assertProgress(60)
- assertProgress(70)
- assertProgress(80)
- assertProgress(90)
- })
-
- cy.findByText(/finalizing upload/i).should('exist')
-
- cy.findByRole('heading', {
- name: /your upload is complete/i,
- level: 3,
- timeout: 100000
- }).should('exist')
-}
-
-describe('Upload Track', () => {
- beforeEach(() => {
- localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
- })
-
- it('should upload a single track that is a remix and ai attributed', () => {
- visitUpload()
-
- // Select track
-
- cy.findByTestId('upload-dropzone').attachFile('track-small.mp3', {
- subjectType: 'drag-n-drop'
- })
- cy.findByRole('button', { name: /continue uploading/i }).click()
-
- // Complete track form
-
- cy.findByRole('heading', { name: /complete your track/i, level: 1 }).should(
- 'exist'
- )
- cy.findByRole('button', { name: /add artwork/i }).click()
-
- cy.findByTestId('upload-dropzone').attachFile('track-artwork.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByRole('textbox', { name: /track name/i })
- .clear()
- .type(`Test track ${timestamp}`)
-
- cy.findByRole('combobox', { name: /pick a genre/i }).click()
- cy.findByRole('option', { name: /alternative/i }).click()
-
- cy.findByRole('combobox', { name: /pick a mood/i }).click()
- cy.findByRole('option', { name: /easygoing/i }).click()
-
- cy.findByRole('textbox', { name: /tags/i })
- .type('tag1{enter}')
- .type('tag2')
- .tab()
-
- cy.findByRole('textbox', { name: /description/i }).type('Test Description')
-
- cy.findByRole('button', { name: /remix settings/i }).click()
- cy.findByRole('dialog', { name: /remix settings/i }).within(() => {
- cy.findByRole('checkbox', { name: /hide remixes of this track/i }).should(
- 'exist'
- )
- cy.findByRole('checkbox', { name: /hide remixes/i }).should('exist')
- cy.findByRole('checkbox', { name: /identify as remix/i }).check()
- cy.findByRole('textbox').type(`staging.audius.co/${remix.route}`)
- cy.contains(`${remix.name} By df`)
- cy.findByRole('button', { name: /save/i }).click()
- })
-
- cy.findByRole('button', { name: /access & sale/i }).click()
- cy.findByRole('dialog', { name: /access & sale/i }).within(() => {
- cy.findAllByRole('alert')
- .first()
- .within(() => {
- cy.findByText(/this track is marked as a remix/i).should('exist')
- })
- cy.findByRole('radiogroup', { name: /access & sale/i }).within(() => {
- cy.findByRole('radio', { name: /hidden/i }).click()
- cy.findByRole('group', { name: /visible track details/i }).within(
- () => {
- cy.findByRole('checkbox', { name: /share button/i }).click()
- }
- )
- })
-
- cy.findByRole('button', { name: /save/i }).click()
- })
-
- cy.findByRole('button', { name: /attribution/i }).click()
- cy.findByRole('dialog', { name: /attribution/i }).within(() => {
- cy.findByRole('checkbox', {
- name: /mark this track as ai generated/i
- }).click()
- cy.findByRole('combobox', { name: /find users/i }).type(
- aiAttribution.inputName
- )
- })
- cy.findByRole('option', { name: aiAttribution.name }).click()
- cy.findByRole('dialog', { name: /attribution/i }).within(() => {
- cy.findByRole('textbox', { name: /isrc/i }).type('US-123-45-67890')
- cy.findByRole('textbox', { name: /iswc/i }).type('T-123456789-0')
- cy.findByRole('radiogroup', { name: /allow attribution/i }).within(() => {
- cy.findByRole('radio', { name: /allow attribution/i }).click({
- force: true // segmented controls overlap inputs
- })
- })
-
- cy.findByRole('radiogroup', { name: /commercial use/i }).within(() => {
- cy.findByRole('radio', { name: /^commercial use/i }).click({
- force: true // segmented controls overlap inputs
- })
- })
-
- cy.findByRole('radiogroup', { name: /derivative works/i }).within(() => {
- cy.findByRole('radio', { name: /share-alike/i }).click({ force: true })
- })
-
- cy.findByRole('heading', {
- name: 'Attribution ShareAlike CC BY-SA'
- }).should('exist')
-
- cy.findByRole('button', { name: /save/i }).click()
- })
-
- completeUpload()
-
- cy.findByRole('link', { name: /visit track page/i }).click()
- cy.findByRole('heading', { name: /track/i, level: 1 }).should('exist')
- })
-
- it('should upload a single track with a single stem', () => {
- visitUpload()
-
- // Select track
-
- cy.findByTestId('upload-dropzone').attachFile('track.mp3', {
- subjectType: 'drag-n-drop'
- })
- cy.findByRole('button', { name: /continue uploading/i }).click()
-
- // Complete track form
-
- cy.findByRole('heading', { name: /complete your track/i, level: 1 }).should(
- 'exist'
- )
- cy.findByRole('button', { name: /change artwork/i }).click()
-
- cy.findByTestId('upload-dropzone').attachFile('track-artwork.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByRole('textbox', { name: /track name/i })
- .clear()
- .type(`Test track stems ${timestamp}`)
-
- cy.findByRole('combobox', { name: /pick a genre/i }).click()
- cy.findByRole('option', { name: /alternative/i }).click()
-
- cy.findByRole('button', { name: /stems & downloads/i }).click()
- cy.findByRole('dialog', { name: /stems & downloads/i }).within(() => {
- cy.findByRole('checkbox', {
- name: /allow full track download/i
- }).check()
- cy.findByTestId('upload-dropzone').attachFile('track-small.mp3', {
- subjectType: 'drag-n-drop'
- })
- cy.findByRole('button', { name: /select type/i }).click()
- })
- // Listbox is outside the dialog
- cy.findByRole('listbox', { name: /select type/i }).within(() => {
- cy.findByText(/instrumental/i).click()
- })
-
- // Re-enter the dialog and save
- cy.findByRole('dialog', { name: /stems & downloads/i }).within(() => {
- cy.findByRole('button', { name: /save/i }).click()
- })
- completeUpload()
-
- cy.findByRole('link', { name: /visit track page/i }).click()
- cy.findByRole('heading', { name: /track/i, level: 1 }).should('exist')
- cy.findByRole('button', { name: /stems & downloads/i }).click()
- cy.findByText(/full track/i).should('exist')
- cy.findByText(/track-small.mp3/i).should('exist')
- cy.findByText(/instrumental/i).should('exist')
- })
-
- it('should upload a single track with a pay-gate', () => {
- visitUpload()
-
- // Select track
-
- cy.findByTestId('upload-dropzone').attachFile('track-small.mp3', {
- subjectType: 'drag-n-drop'
- })
- cy.findByRole('button', { name: /continue uploading/i }).click()
-
- // Complete track form
-
- cy.findByRole('heading', { name: /complete your track/i, level: 1 }).should(
- 'exist'
- )
- cy.findByRole('button', { name: /add artwork/i }).click()
-
- cy.findByTestId('upload-dropzone').attachFile('track-artwork.jpeg', {
- subjectType: 'drag-n-drop'
- })
-
- cy.findByRole('textbox', { name: /track name/i })
- .clear()
- .type(`Test premium pay-gated track ${timestamp}`)
-
- cy.findByRole('combobox', { name: /pick a genre/i }).click()
- cy.findByRole('option', { name: /alternative/i }).click()
-
- // Set pay-gated
- cy.findByRole('button', { name: /access & sale/i }).click()
- cy.findByRole('dialog', { name: /access & sale/i }).within(() => {
- cy.findByRole('radiogroup', { name: /access & sale/i }).within(() => {
- cy.findByRole('radio', { name: /premium \(pay-to-unlock\)/i }).click()
- cy.findByRole('textbox', { name: /cost to unlock/i }).type('1.05')
- cy.findByRole('textbox', { name: /start time/i }).type('15')
- })
-
- cy.findByRole('button', { name: /save/i }).click()
- })
-
- completeUpload()
-
- cy.findByRole('link', { name: /visit track page/i }).click()
- cy.findByRole('heading', { name: /pay-gated track/i, level: 1 }).should(
- 'exist'
- )
- cy.findByRole('button', { name: /preview/i }).should('exist')
- cy.findByText(/premium track/i).should('exist')
- cy.findByText(/users can unlock/i).should('exist')
- cy.findByText(/purchase of \$1\.05/i).should('exist')
- })
-})
diff --git a/packages/probers/cypress/fixtures/aiAttribution.json b/packages/probers/cypress/fixtures/aiAttribution.json
deleted file mode 100644
index 3ed5402250d..00000000000
--- a/packages/probers/cypress/fixtures/aiAttribution.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "email": "prober+ai@audius.co",
- "password": "Pa$$w0rdTest",
- "route": "probersai",
- "inputName": "ai DO NOT DELETE",
- "name": "probers ai DO NOT DELETE"
-}
diff --git a/packages/probers/cypress/fixtures/album.json b/packages/probers/cypress/fixtures/album.json
deleted file mode 100644
index bab244083ff..00000000000
--- a/packages/probers/cypress/fixtures/album.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "name": "probers_album_do_not_delete",
- "route": "df/album/probers_album_do_not_delete-512"
-}
diff --git a/packages/probers/cypress/fixtures/cover-photo.jpeg b/packages/probers/cypress/fixtures/cover-photo.jpeg
deleted file mode 100644
index 974852b9538..00000000000
Binary files a/packages/probers/cypress/fixtures/cover-photo.jpeg and /dev/null differ
diff --git a/packages/probers/cypress/fixtures/playlist.json b/packages/probers/cypress/fixtures/playlist.json
deleted file mode 100644
index 12bc275a362..00000000000
--- a/packages/probers/cypress/fixtures/playlist.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "route": "df/playlist/probers_playlist_do_not_delete-511",
- "name": "PROBERS_PLAYLIST_DO_NOT_DELETE"
-}
diff --git a/packages/probers/cypress/fixtures/profile-picture.jpeg b/packages/probers/cypress/fixtures/profile-picture.jpeg
deleted file mode 100644
index 7defae6fa76..00000000000
Binary files a/packages/probers/cypress/fixtures/profile-picture.jpeg and /dev/null differ
diff --git a/packages/probers/cypress/fixtures/ray_stack_Trace.png b/packages/probers/cypress/fixtures/ray_stack_Trace.png
deleted file mode 100644
index db1b9cddf42..00000000000
Binary files a/packages/probers/cypress/fixtures/ray_stack_Trace.png and /dev/null differ
diff --git a/packages/probers/cypress/fixtures/remix.json b/packages/probers/cypress/fixtures/remix.json
deleted file mode 100644
index 6996604dd90..00000000000
--- a/packages/probers/cypress/fixtures/remix.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "route": "df/probers_remix_do_not_delete-2859",
- "name": "probers_remix_do_not_delete"
-}
diff --git a/packages/probers/cypress/fixtures/remixes.json b/packages/probers/cypress/fixtures/remixes.json
deleted file mode 100644
index ab92f606056..00000000000
--- a/packages/probers/cypress/fixtures/remixes.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "route": "mb430/traektoria-source-2217/remixes"
-}
diff --git a/packages/probers/cypress/fixtures/track-small-2.mp3 b/packages/probers/cypress/fixtures/track-small-2.mp3
deleted file mode 100644
index 4659f9fbb29..00000000000
Binary files a/packages/probers/cypress/fixtures/track-small-2.mp3 and /dev/null differ
diff --git a/packages/probers/cypress/fixtures/track-small.mp3 b/packages/probers/cypress/fixtures/track-small.mp3
deleted file mode 100644
index 4659f9fbb29..00000000000
Binary files a/packages/probers/cypress/fixtures/track-small.mp3 and /dev/null differ
diff --git a/packages/probers/cypress/fixtures/track.json b/packages/probers/cypress/fixtures/track.json
deleted file mode 100644
index 28aab83955e..00000000000
--- a/packages/probers/cypress/fixtures/track.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "route": "sebastian12/bachgavotte-1",
- "name": "probers_track_do_not_delete"
-}
diff --git a/packages/probers/cypress/fixtures/user.json b/packages/probers/cypress/fixtures/user.json
deleted file mode 100644
index 4b890ab1e11..00000000000
--- a/packages/probers/cypress/fixtures/user.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "email": "prober+test@audius.co",
- "password": "Pa$$w0rdTest",
- "name": "Prober Test",
- "handle": "proberTest",
- "entropy": "bdaba824b6e02ab7868c5a2dfdfc7e9f"
-}
diff --git a/packages/probers/cypress/support/commands.ts b/packages/probers/cypress/support/commands.ts
deleted file mode 100644
index 86747dee2d5..00000000000
--- a/packages/probers/cypress/support/commands.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import '@testing-library/cypress/add-commands'
-import 'cypress-file-upload'
-import 'cypress-wait-until'
-import 'cypress-plugin-tab'
-
-import user from '../fixtures/user.json'
-const base64Entropy = Buffer.from(user.entropy).toString('base64')
-
-declare global {
- // eslint-disable-next-line @typescript-eslint/no-namespace
- namespace Cypress {
- interface Chainable {
- /**
- * Custom command to log in user.
- * @example cy.login()
- */
- login(): Chainable>
- }
- }
-}
-
-Cypress.Commands.add('login', () => {
- cy.visit(`trending?login=${base64Entropy}`)
- cy.findByRole('link', { name: user.name }).should('exist')
-})
diff --git a/packages/probers/cypress/support/e2e.ts b/packages/probers/cypress/support/e2e.ts
deleted file mode 100644
index 42c4b9ce200..00000000000
--- a/packages/probers/cypress/support/e2e.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import './commands'
-
-Cypress.on('uncaught:exception', () => {
- // returning false here prevents Cypress from
- // failing the test
- return false
-})
diff --git a/packages/probers/cypress/tsconfig.json b/packages/probers/cypress/tsconfig.json
deleted file mode 100644
index bf494fa7df0..00000000000
--- a/packages/probers/cypress/tsconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "compilerOptions": {
- "target": "es5",
- "lib": ["es5", "dom"],
- "types": ["cypress", "@testing-library/cypress", "cypress-file-upload", "cypress-wait-until"],
- "resolveJsonModule": true,
- "esModuleInterop": true
- },
- "include": ["**/*.ts"]
-}
\ No newline at end of file
diff --git a/packages/probers/package.json b/packages/probers/package.json
deleted file mode 100644
index 6544d3c7c81..00000000000
--- a/packages/probers/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "name": "probers",
- "private": true,
- "version": "1.5.72",
- "description": "Automated client tests",
- "scripts": {
- "cypress:open": "cypress open",
- "cypress:open-stage": "cypress open --env configFile=stage",
- "cypress:open-rc-stage": "cypress open --env configFile=rc-stage",
- "cypress:run": "cypress run",
- "cypress:run-stage": "cypress run --env configFile=stage",
- "cypress:run-rc-stage": "cypress run --env configFile=rc-stage",
- "test:target": "env-cmd -f .env jest --runInBand",
- "test": "npm run cypress:run",
- "test:ci": "npm run cypress:run",
- "lint": "eslint --cache --ext=js,jsx,ts,tsx cypress",
- "lint:fix": "eslint --cache --fix --ext=js,jsx,ts,tsx cypress"
- },
- "author": "",
- "license": "ISC",
- "dependencies": {
- "@testing-library/cypress": "^9.0.0",
- "cypress": "^13.0.0",
- "cypress-file-upload": "^5.0.8",
- "cypress-wait-until": "^1.7.2",
- "dayjs": "^1.11.6",
- "lodash": "4.17.21",
- "web3": "4.1.1"
- },
- "standard": {
- "env": [
- "jest"
- ],
- "ignore": []
- },
- "devDependencies": {
- "cypress-plugin-tab": "^1.0.5",
- "eslint": "8.56.0",
- "eslint-plugin-cypress": "2.12.1",
- "typescript": "5.0.4"
- }
-}
diff --git a/packages/spl/package.json b/packages/spl/package.json
index 1a6170b8d29..505aea4d3ca 100644
--- a/packages/spl/package.json
+++ b/packages/spl/package.json
@@ -1,6 +1,6 @@
{
"name": "@audius/spl",
- "version": "0.0.28",
+ "version": "0.0.29",
"description": "The core Typescript mappings to the Audius Solana Programs",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
diff --git a/packages/sql-ts/package.json b/packages/sql-ts/package.json
index 33fdb554e89..9297b116ff4 100644
--- a/packages/sql-ts/package.json
+++ b/packages/sql-ts/package.json
@@ -1,7 +1,7 @@
{
"name": "@audius/sql-ts",
"private": true,
- "version": "1.0.30",
+ "version": "1.0.31",
"description": "",
"scripts": {
"start": "ts-node src/index.ts"
diff --git a/packages/trpc-server/package.json b/packages/trpc-server/package.json
index f4d0747ea50..67fd9dbd19d 100644
--- a/packages/trpc-server/package.json
+++ b/packages/trpc-server/package.json
@@ -1,6 +1,6 @@
{
"name": "@audius/trpc-server",
- "version": "0.0.28",
+ "version": "0.0.29",
"private": true,
"main": "src/index.ts",
"scripts": {
diff --git a/packages/web/.gitignore b/packages/web/.gitignore
index f641c6ea719..797bf6b97db 100644
--- a/packages/web/.gitignore
+++ b/packages/web/.gitignore
@@ -60,3 +60,7 @@ yarn-error.log*
.idea
.yalc
yalc.lock
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/
diff --git a/packages/web/e2e/auth.setup.ts b/packages/web/e2e/auth.setup.ts
new file mode 100644
index 00000000000..0fc66178482
--- /dev/null
+++ b/packages/web/e2e/auth.setup.ts
@@ -0,0 +1,15 @@
+import { expect } from '@playwright/test'
+import { test as setup } from './test'
+
+const base64Entropy = 'YmRhYmE4MjRiNmUwMmFiNzg2OGM1YTJkZmRmYzdlOWY'
+const authFile = 'playwright/.auth/user.json'
+
+setup('authenticate', async ({ page }) => {
+ await page.goto(`/feed?login=${base64Entropy}`)
+ const usernameLocator = page.getByText('probertest')
+ await expect(usernameLocator).toBeVisible()
+ await page.evaluate(() => {
+ localStorage.setItem('HAS_REQUESTED_BROWSER_PUSH_PERMISSION', 'true')
+ })
+ await page.context().storageState({ path: authFile })
+})
diff --git a/packages/probers/cypress/fixtures/track.mp3 b/packages/web/e2e/files/stem-1.mp3
similarity index 100%
rename from packages/probers/cypress/fixtures/track.mp3
rename to packages/web/e2e/files/stem-1.mp3
diff --git a/packages/web/e2e/files/stem-2.mp3 b/packages/web/e2e/files/stem-2.mp3
new file mode 100644
index 00000000000..29073a5fe47
Binary files /dev/null and b/packages/web/e2e/files/stem-2.mp3 differ
diff --git a/packages/web/e2e/files/track-2.mp3 b/packages/web/e2e/files/track-2.mp3
new file mode 100644
index 00000000000..29073a5fe47
Binary files /dev/null and b/packages/web/e2e/files/track-2.mp3 differ
diff --git a/packages/probers/cypress/fixtures/track-artwork.jpeg b/packages/web/e2e/files/track-artwork.jpeg
similarity index 100%
rename from packages/probers/cypress/fixtures/track-artwork.jpeg
rename to packages/web/e2e/files/track-artwork.jpeg
diff --git a/packages/web/e2e/files/track.mp3 b/packages/web/e2e/files/track.mp3
new file mode 100644
index 00000000000..29073a5fe47
Binary files /dev/null and b/packages/web/e2e/files/track.mp3 differ
diff --git a/packages/web/e2e/page-object-models/modals.ts b/packages/web/e2e/page-object-models/modals.ts
new file mode 100644
index 00000000000..6d234170f96
--- /dev/null
+++ b/packages/web/e2e/page-object-models/modals.ts
@@ -0,0 +1,235 @@
+import { Locator, Page } from '@playwright/test'
+import path from 'path'
+
+export class StemsAndDownloadsModal {
+ public readonly locator: Locator
+
+ private readonly trackDownloadInput: Locator
+ private readonly dropzoneFileInput: Locator
+ private readonly saveButton: Locator
+
+ constructor(page: Page) {
+ this.locator = page.getByRole('dialog', {
+ name: /stems & downloads/i
+ })
+ this.trackDownloadInput = this.locator.getByRole('checkbox', {
+ name: /allow full track download/i
+ })
+ this.dropzoneFileInput = this.locator
+ .getByTestId('upload-dropzone')
+ .locator('input[type=file]')
+ this.saveButton = this.locator.getByRole('button', { name: /save/i })
+ }
+
+ async setAllowTrackDownload(allow: boolean) {
+ if (allow) {
+ await this.trackDownloadInput.check()
+ } else {
+ await this.trackDownloadInput.uncheck()
+ }
+ }
+
+ async setStems(files: Array<{ filename: string; type?: string } | string>) {
+ await this.dropzoneFileInput.setInputFiles(
+ files.map((file) =>
+ path.join(
+ __dirname,
+ '..',
+ 'files',
+ typeof file === 'string' ? file : file.filename
+ )
+ )
+ )
+ for (const file of files) {
+ if (typeof file === 'string' || !file.type) {
+ continue
+ }
+ await this.locator
+ .getByRole('listitem')
+ .filter({ hasText: file.filename })
+ .getByRole('button', { name: /select type/i })
+ .click()
+ await this.locator
+ .page()
+ .getByRole('listbox', { name: /select type/i })
+ .getByRole('option', { name: file.type })
+ .click()
+ }
+ }
+
+ async save() {
+ await this.saveButton.click()
+ }
+}
+
+export class AttributionModal {
+ private readonly locator: Locator
+ private readonly allowAttribution: Locator
+ private readonly commercialUse: Locator
+ private readonly derivativeWorks: Locator
+ private readonly saveButton: Locator
+
+ constructor(page: Page) {
+ this.locator = page.getByRole('dialog', { name: /attribution/i })
+ this.allowAttribution = this.locator.getByRole('radiogroup', {
+ name: /allow attribution/i
+ })
+ this.commercialUse = this.locator.getByRole('radiogroup', {
+ name: /commercial use/i
+ })
+ this.derivativeWorks = this.locator.getByRole('radiogroup', {
+ name: /derivative works/i
+ })
+ this.saveButton = this.locator.getByRole('button', { name: /save/i })
+ }
+
+ async markAsAIGenerated(user: string) {
+ await this.locator
+ .getByRole('checkbox', {
+ name: /mark this track as ai generated/i
+ })
+ .click()
+ await this.locator.getByRole('combobox', { name: /find users/i }).fill(user)
+ // This option is mounted to the page
+ await this.locator.page().getByRole('option', { name: user }).click()
+ }
+
+ async setISRC(isrc: string) {
+ await this.locator.getByRole('textbox', { name: /isrc/i }).fill(isrc)
+ }
+ async setISWC(iswc: string) {
+ await this.locator.getByRole('textbox', { name: /iswc/i }).fill(iswc)
+ }
+
+ async setAllowAttribution(allow: boolean) {
+ if (allow) {
+ await this.allowAttribution
+ .getByRole('radio', { name: /allow attribution/i })
+ .check({ force: true }) // segmented control
+ } else {
+ await this.allowAttribution
+ .getByRole('radio', { name: /no attribution/i })
+ .check({ force: true }) // segmented control
+ }
+ }
+
+ async setAllowCommercialUse(allow: boolean) {
+ if (allow) {
+ await this.commercialUse
+ .getByRole('radio', { name: /^commercial use/i })
+ .check({ force: true }) // segmented control
+ } else {
+ await this.commercialUse
+ .getByRole('radio', { name: /non-commercial use/i })
+ .check({ force: true }) // segmented control
+ }
+ }
+
+ async setDerivativeWorks(
+ permission: 'Not-Allowed' | 'Share-Alike' | 'Allowed'
+ ) {
+ await this.derivativeWorks
+ .getByRole('radio', { name: permission, exact: true })
+ .check({ force: true }) // segmented control
+ }
+
+ async save() {
+ await this.saveButton.click()
+ }
+}
+
+type VisibleDetail = 'Genre' | 'Mood' | 'Tags' | 'Share Button' | 'Play Count'
+export class AccessAndSaleModal {
+ public readonly locator: Locator
+ public readonly remixAlert: Locator
+
+ private readonly radioGroup: Locator
+ private readonly visibleTrackDetails: Locator
+ private readonly priceInput: Locator
+ private readonly previewSecondsInput: Locator
+ private readonly saveButton: Locator
+
+ constructor(page: Page) {
+ this.locator = page.getByRole('dialog', {
+ name: /access & sale/i
+ })
+ this.remixAlert = this.locator
+ .getByRole('alert')
+ .first()
+ .getByText('this track is marked as a remix')
+ this.radioGroup = this.locator.getByRole('radiogroup', {
+ name: /access & sale/i
+ })
+ this.visibleTrackDetails = this.radioGroup.getByRole('group', {
+ name: /visible track details/i
+ })
+ this.priceInput = this.radioGroup.getByRole('textbox', {
+ name: /cost to unlock/i
+ })
+ this.previewSecondsInput = this.radioGroup.getByRole('textbox', {
+ name: /start time/i
+ })
+ this.saveButton = this.locator.getByRole('button', { name: /save/i })
+ }
+
+ async save() {
+ await this.saveButton.click()
+ }
+
+ async setHidden(visibleDetails: Partial>) {
+ await this.radioGroup.getByRole('radio', { name: /hidden/i }).check()
+ for (const name of Object.keys(visibleDetails)) {
+ const checkbox = this.visibleTrackDetails.getByRole('checkbox', { name })
+ if (visibleDetails[name]) {
+ await checkbox.check()
+ } else {
+ await checkbox.uncheck()
+ }
+ }
+ }
+
+ async setPremium({
+ price,
+ previewSeconds
+ }: {
+ price: string
+ previewSeconds: string
+ }) {
+ await this.radioGroup
+ .getByRole('radio', {
+ name: /premium \(pay-to-unlock\)/i
+ })
+ .check()
+ await this.priceInput.fill(price)
+ await this.previewSecondsInput.fill(previewSeconds)
+ }
+}
+
+export class RemixSettingsModal {
+ public readonly locator: Locator
+
+ constructor(page: Page) {
+ this.locator = page.getByRole('dialog', {
+ name: /remix settings/i
+ })
+ }
+
+ async hideRemixes() {
+ await this.locator
+ .getByRole('checkbox', { name: /hide remixes of this track/i })
+ .check()
+ }
+
+ async setAsRemixOf(remixUrl: string, remixTitle: string) {
+ await this.locator
+ .getByRole('checkbox', { name: /identify as remix/i })
+ .check()
+ await this.locator.getByRole('textbox').pressSequentially(remixUrl)
+ const remixTrack = this.locator.getByText(remixTitle).first()
+ await remixTrack.click()
+ }
+
+ async save() {
+ await this.locator.getByRole('button', { name: /save/i }).click()
+ }
+}
diff --git a/packages/web/e2e/page-object-models/socialActions.ts b/packages/web/e2e/page-object-models/socialActions.ts
new file mode 100644
index 00000000000..1adb22d6180
--- /dev/null
+++ b/packages/web/e2e/page-object-models/socialActions.ts
@@ -0,0 +1,102 @@
+import { Locator, Page, expect } from '@playwright/test'
+
+export class SocialActions {
+ private readonly page: Page
+ public readonly favoriteButton: Locator
+ public readonly unfavoriteButton: Locator
+ public readonly repostButton: Locator
+ public readonly unrepostButton: Locator
+
+ constructor(page: Page) {
+ this.page = page
+ const trackActions = page.getByRole('group', {
+ name: /track actions/i
+ })
+ this.favoriteButton = trackActions.getByRole('button', {
+ name: /favorite$/i
+ })
+ this.unfavoriteButton = trackActions.getByRole('button', {
+ name: /favorited$/i
+ })
+ this.repostButton = trackActions.getByRole('button', {
+ name: /repost$/i
+ })
+ this.unrepostButton = trackActions.getByRole('button', {
+ name: /reposted$/i
+ })
+ }
+
+ async waitForConfirmation() {
+ return this.page
+ .waitForResponse(async (response) => {
+ if (response.url().includes('block_confirmation')) {
+ const json = await response.json()
+ return json.data.block_passed
+ }
+ })
+ .catch((e) => {
+ // Swallow error - prevents flakes
+ console.warn('Confirmation timed out', e)
+ })
+ }
+
+ async favorite() {
+ // Setup confirmation listener
+ const confirmationPromise = this.waitForConfirmation()
+
+ // Unfavorited => Favorited
+ await this.favoriteButton.click()
+
+ // Wait for indexing, reload
+ await confirmationPromise
+ await this.favoriteButton.page().reload()
+
+ // Check that it persists after reload
+ await expect(this.unfavoriteButton).toBeVisible()
+ }
+
+ async unfavorite() {
+ // Setup confirmation listener
+ const confirmationPromise = this.waitForConfirmation()
+
+ // Favorited => Unfavorited
+ await this.unfavoriteButton.click()
+
+ // Wait for indexing, reload
+ await confirmationPromise
+ await this.unfavoriteButton.page().reload()
+
+ // Check that it persists after reload
+ await expect(this.favoriteButton).toBeVisible()
+ }
+
+ async repost() {
+ // Setup confirmation listener
+ const confirmationPromise = this.waitForConfirmation()
+
+ // Unreposted => Reposted
+ await this.repostButton.click()
+
+ // Wait for indexing, reload
+ await confirmationPromise
+ await this.repostButton.page().reload()
+
+ // Check that it persists after reload
+ await expect(this.unrepostButton).toBeVisible()
+ }
+
+ async unrepost() {
+ // Setup confirmation listener
+ const confirmationPromise = this.waitForConfirmation()
+
+ // Reposted => Unreposted
+ await this.unrepostButton.click()
+
+ // Wait for indexing, reload
+ await confirmationPromise
+ await this.unrepostButton.page().reload()
+
+ // Check that it persists after reload
+ await expect(this.repostButton).toBeVisible()
+ }
+}
diff --git a/packages/web/e2e/page-object-models/upload.ts b/packages/web/e2e/page-object-models/upload.ts
new file mode 100644
index 00000000000..d9f340c0e68
--- /dev/null
+++ b/packages/web/e2e/page-object-models/upload.ts
@@ -0,0 +1,293 @@
+import { Locator, Page, expect } from '@playwright/test'
+import path from 'path'
+
+class BaseEditPage {
+ protected readonly artworkButton: Locator
+ protected readonly dropzoneFileInput: Locator
+ protected readonly titleInput: Locator
+ protected readonly genreBox: Locator
+ protected readonly genreList: Locator
+ protected readonly moodBox: Locator
+ protected readonly moodList: Locator
+ protected readonly tagsInput: Locator
+ protected readonly descriptionInput: Locator
+ protected readonly completeButton: Locator
+
+ constructor(page: Page) {
+ this.artworkButton = page.getByRole('button', { name: /artwork$/i })
+ this.dropzoneFileInput = page
+ .getByTestId('upload-dropzone')
+ .locator('input[type=file]')
+ this.genreBox = page.getByRole('combobox', { name: /pick a genre/i })
+ this.genreList = page
+ .getByLabel(/pick a genre/i)
+ .locator('.rc-virtual-list') // ant-d uses a virtualized list
+ this.moodBox = page.getByRole('combobox', { name: /pick a mood/i })
+ this.moodList = page.getByLabel(/pick a mood/i).locator('.rc-virtual-list') // ant-d uses a virtualized list
+ this.tagsInput = page.getByRole('textbox', { name: /tags/i })
+ this.descriptionInput = page.getByRole('textbox', { name: /description/i })
+ this.completeButton = page.getByRole('button', { name: /complete upload/i })
+ }
+
+ async setArtwork(file: string) {
+ await this.artworkButton.click()
+ await this.dropzoneFileInput.setInputFiles(
+ path.join(__dirname, '..', 'files', file)
+ )
+ await this.dropzoneFileInput.page().getByLabel('close popup').click()
+ }
+
+ async setTitle(title: string) {
+ await this.titleInput.fill(title)
+ }
+
+ async setGenre(genre: string) {
+ await this.genreBox.fill(genre)
+ await this.genreList.getByRole('option', { name: genre }).click()
+ }
+
+ async setMood(mood: string) {
+ await this.moodBox.fill(mood)
+ await this.moodList.getByRole('option', { name: mood }).click()
+ }
+
+ async setTags(tags: string[]) {
+ for (const tag of tags) {
+ await this.tagsInput.fill(tag)
+ await this.tagsInput.press('Enter')
+ }
+ }
+
+ async setDescription(description: string) {
+ await this.descriptionInput.fill(description)
+ }
+
+ async complete() {
+ await this.completeButton.click()
+ const confirmUploadModal = this.completeButton.page().getByRole('dialog', {
+ name: /confirm upload/i
+ })
+ await confirmUploadModal.getByRole('button', { name: /upload/i }).click()
+ }
+}
+
+export class EditTrackPage extends BaseEditPage {
+ protected readonly titleInput: Locator
+ private readonly remixSettingsButton: Locator
+ private readonly accessAndSaleSettingsButton: Locator
+ private readonly attributionSettingsButton: Locator
+ private readonly stemsAndDownloadsSettingsButton: Locator
+
+ constructor(page: Page) {
+ super(page)
+ this.titleInput = page.getByRole('textbox', { name: /track name/i })
+ this.remixSettingsButton = page.getByRole('button', {
+ name: /remix settings/i
+ })
+ this.accessAndSaleSettingsButton = page.getByRole('button', {
+ name: /access & sale/i
+ })
+ this.attributionSettingsButton = page.getByRole('button', {
+ name: /attribution/i
+ })
+ this.stemsAndDownloadsSettingsButton = page.getByRole('button', {
+ name: /stems & downloads/i
+ })
+ }
+
+ async openRemixSettings() {
+ await this.remixSettingsButton.click()
+ }
+
+ async openAccessAndSaleSettings() {
+ await this.accessAndSaleSettingsButton.click()
+ }
+
+ async openAttributionSettings() {
+ await this.attributionSettingsButton.click()
+ }
+
+ async openStemsAndDownloadsSettings() {
+ await this.stemsAndDownloadsSettingsButton.click()
+ }
+}
+
+export class EditPlaylistPage extends BaseEditPage {
+ protected readonly titleInput: Locator
+ protected readonly trackList: Locator
+
+ constructor(page: Page) {
+ super(page)
+ this.titleInput = page.getByRole('textbox', { name: /playlist name/i })
+ this.trackList = page.getByRole('list', { name: /track list/i })
+ }
+
+ async setTrackName(index: number, name: string) {
+ const trackItem = this.trackList.getByRole('listitem').nth(index)
+ const nameInput = trackItem.getByRole('textbox', { name: /track name/i })
+ await nameInput.fill(name)
+ }
+
+ async setTrackDetails(
+ index: number,
+ {
+ name,
+ genre,
+ mood,
+ tags
+ }: {
+ name?: string
+ genre?: string
+ mood?: string
+ tags?: string[]
+ }
+ ) {
+ const trackItem = this.trackList.getByRole('listitem').nth(index)
+ const checkbox = trackItem.getByRole('checkbox', {
+ name: /override details for this track/i
+ })
+ if (genre || mood || tags) {
+ await checkbox.check()
+ }
+ if (name) {
+ await this.setTrackName(index, name)
+ }
+ if (genre) {
+ await this.setTrackGenre(index, genre)
+ }
+ if (mood) {
+ await this.setTrackMood(index, mood)
+ }
+ if (tags) {
+ await this.addTrackTags(index, tags)
+ }
+ }
+
+ private async setTrackGenre(index: number, genre: string) {
+ const trackItem = this.trackList.getByRole('listitem').nth(index)
+ const genreBox = trackItem.getByRole('combobox', { name: /pick a genre/i })
+ const genreList = genreBox
+ .page()
+ .getByLabel(/pick a genre/i)
+ .locator('.rc-virtual-list') // ant-d uses a virtualized list
+ await genreBox.fill(genre)
+ await genreList.getByRole('option', { name: genre }).click()
+ }
+
+ private async setTrackMood(index: number, mood: string) {
+ const trackItem = this.trackList.getByRole('listitem').nth(index)
+ const moodBox = trackItem.getByRole('combobox', { name: /pick a mood/i })
+ const moodList = moodBox
+ .page()
+ .getByLabel(/pick a mood/i)
+ .locator('.rc-virtual-list') // ant-d uses a virtualized list
+ await moodBox.fill(mood)
+ await moodList.getByRole('option', { name: mood }).click()
+ }
+
+ private async addTrackTags(index: number, tags: string[]) {
+ const trackItem = this.trackList.getByRole('listitem').nth(index)
+ const tagsInput = trackItem.getByRole('textbox', { name: /tags/i })
+ for (const tag of tags) {
+ await tagsInput.fill(tag)
+ await tagsInput.press('Enter')
+ }
+ }
+}
+
+export class EditAlbumPage extends EditPlaylistPage {
+ protected readonly titleInput: Locator
+
+ constructor(page: Page) {
+ super(page)
+ this.titleInput = page.getByRole('textbox', { name: /album name/i })
+ }
+}
+
+export class UploadSelectPage {
+ private readonly dropzoneFileInput: Locator
+ private readonly releaseType: Locator
+ private readonly continueButton: Locator
+
+ constructor(page: Page) {
+ this.dropzoneFileInput = page
+ .getByTestId('upload-dropzone')
+ .locator('input[type=file]')
+ this.releaseType = page.getByRole('radiogroup', {
+ name: /release type/i
+ })
+ this.continueButton = page.getByRole('button', {
+ name: /continue uploading/i
+ })
+ }
+
+ async setTracks(...files: string[]) {
+ await this.dropzoneFileInput.setInputFiles(
+ files.map((file) => path.join(__dirname, '..', 'files', file))
+ )
+ }
+
+ async setReleaseType(type: 'Track' | 'Playlist' | 'Album') {
+ await this.releaseType
+ .getByRole('radio', { name: type })
+ .check({ force: true })
+ }
+
+ async continue() {
+ await this.continueButton.click()
+ }
+}
+
+export class UploadFinishPage {
+ private readonly progressBar: Locator
+ private readonly uploadingHeading: Locator
+ private readonly finalizing: Locator
+ private readonly successHeading: Locator
+
+ constructor(page: Page, type: 'Track' | 'Tracks' | 'Album' | 'Playlist') {
+ this.progressBar = page.getByRole('progressbar', {
+ name: /upload in progress/i
+ })
+ this.uploadingHeading = page.getByRole('heading', {
+ name: `Uploading Your ${type}`
+ })
+ this.finalizing = page.getByText(/finalizing upload/i)
+ this.successHeading = page.getByRole('heading', {
+ name: /your upload is complete/i
+ })
+ }
+
+ async assertCompletes() {
+ // Assert uploading
+ await expect(this.uploadingHeading).toBeVisible()
+
+ // Assert progress
+ await this.assertProgress(1)
+ await this.assertProgress(10)
+ await this.assertProgress(20)
+ await this.assertProgress(30)
+ await this.assertProgress(40)
+ await this.assertProgress(50)
+ await this.assertProgress(60)
+ await this.assertProgress(70)
+ await this.assertProgress(80)
+ await this.assertProgress(90)
+ await this.assertProgress(99)
+
+ // Assert finalizing
+ await expect(this.finalizing).toBeVisible({ timeout: 60 * 1000 })
+
+ // Assert success
+ await expect(this.successHeading).toBeVisible({ timeout: 60 * 1000 })
+ }
+
+ private async assertProgress(progress: number) {
+ await expect
+ .poll(
+ async () =>
+ Number(await this.progressBar.getAttribute('aria-valuenow')),
+ { timeout: 60 * 1000 }
+ )
+ .toBeGreaterThanOrEqual(progress)
+ }
+}
diff --git a/packages/web/e2e/play.test.ts b/packages/web/e2e/play.test.ts
new file mode 100644
index 00000000000..90a5d8c6a9e
--- /dev/null
+++ b/packages/web/e2e/play.test.ts
@@ -0,0 +1,36 @@
+import { expect } from '@playwright/test'
+import { test } from './test'
+
+declare global {
+ interface Window {
+ audio: {
+ paused: boolean
+ }
+ }
+}
+
+test('should play a trending track', async ({ page }) => {
+ await page.goto('trending')
+
+ const trendingList = page.getByRole('list', {
+ name: /weekly trending tracks/i
+ })
+ const skeletons = trendingList.locator('[aria-busy]')
+ const items = trendingList.getByRole('listitem')
+ const playButton = page.getByRole('button', { name: /play track/i })
+ const pauseButton = page.getByRole('button', { name: /pause track/i })
+ const playHoverIcon = items.first().getByRole('img', { name: 'Play' })
+
+ const isPlayingWatcher = page.waitForFunction(() => !window.audio.paused)
+ const isPausedWatcher = page.waitForFunction(() => window.audio.paused)
+
+ await expect(skeletons).toHaveCount(0)
+ await playHoverIcon.hover()
+ await expect(playHoverIcon).toBeVisible()
+ await playHoverIcon.click()
+ await expect(pauseButton).toBeVisible()
+ await isPlayingWatcher
+ await pauseButton.click()
+ await expect(playButton).toBeVisible()
+ await isPausedWatcher
+})
diff --git a/packages/web/e2e/smoke.test.ts b/packages/web/e2e/smoke.test.ts
new file mode 100644
index 00000000000..621febdf302
--- /dev/null
+++ b/packages/web/e2e/smoke.test.ts
@@ -0,0 +1,66 @@
+import { expect } from '@playwright/test'
+import { test } from './test'
+
+test('should load an album page', async ({ page }) => {
+ await page.goto('df/album/probers_album_do_not_delete-512')
+ const heading = page.getByRole('heading', {
+ name: 'probers_album_do_not_delete',
+ level: 1
+ })
+ await expect(heading).toBeVisible()
+})
+
+test('should load the feed page', async ({ page }) => {
+ await page.goto('feed')
+ const heading = page.getByRole('heading', { name: 'Your Feed', level: 1 })
+ await expect(heading).toBeVisible()
+})
+
+test('should load a playlist page', async ({ page }) => {
+ await page.goto('df/playlist/probers_playlist_do_not_delete-511')
+ const heading = page.getByRole('heading', {
+ name: 'PROBERS_PLAYLIST_DO_NOT_DELETE'
+ })
+ await expect(heading).toBeVisible()
+})
+
+test('should load a remix page', async ({ page }) => {
+ await page.goto('df/probers_remix_do_not_delete-2859')
+ const heading = page.getByRole('heading', {
+ name: 'probers_remix_do_not_delete'
+ })
+ await expect(heading).toBeVisible()
+})
+
+test('should load a remixes page', async ({ page }) => {
+ await page.goto('mb430/traektoria-source-2217/remixes')
+ const heading = page.getByRole('heading', { name: 'Remixes', level: 1 })
+ await expect(heading).toBeVisible()
+})
+
+test('should load a track page', async ({ page }) => {
+ await page.goto('sebastian12/bachgavotte-1')
+ const heading = page.getByRole('heading', {
+ name: 'probers_track_do_not_delete',
+ level: 1
+ })
+ await expect(heading).toBeVisible()
+})
+
+test('should load trending page', async ({ page }) => {
+ await page.goto('trending')
+ const heading = page.getByRole('heading', {
+ name: 'Trending',
+ level: 1
+ })
+ await expect(heading).toBeVisible()
+})
+
+test('should load upload page', async ({ page }) => {
+ await page.goto(`upload`)
+ const heading = page.getByRole('heading', {
+ name: 'Upload Your Music',
+ level: 1
+ })
+ await expect(heading).toBeVisible()
+})
diff --git a/packages/web/e2e/socials.test.ts b/packages/web/e2e/socials.test.ts
new file mode 100644
index 00000000000..03c39b6ab45
--- /dev/null
+++ b/packages/web/e2e/socials.test.ts
@@ -0,0 +1,44 @@
+import { expect } from '@playwright/test'
+import { SocialActions } from './page-object-models/socialActions'
+import { test } from './test'
+
+test('should favorite/unfavorite a track', async ({ page }) => {
+ await page.goto('sebastian12/bachgavotte-1')
+
+ const socialActions = new SocialActions(page)
+ // On initial load, the favorite button will be showing. Make sure to wait for
+ // the unfavorite button in case it comes, but allow failure.
+ await expect(
+ socialActions.unfavoriteButton,
+ 'Check for unfavorite (ok if fails)'
+ )
+ .toBeVisible()
+ .catch(() => {})
+
+ if (await socialActions.unfavoriteButton.isVisible()) {
+ await socialActions.unfavorite()
+ await socialActions.favorite()
+ } else {
+ await socialActions.favorite()
+ await socialActions.unfavorite()
+ }
+})
+
+test('should repost/unrepost a track', async ({ page }) => {
+ await page.goto('sebastian12/bachgavotte-1')
+
+ const socialActions = new SocialActions(page)
+ // On initial load, the repost button will be showing. Make sure to wait for
+ // the unrepost button in case it comes, but continue if it doesn't.
+ await expect(socialActions.unrepostButton, 'Check for unrepost (ok if fails)')
+ .toBeVisible()
+ .catch(() => {})
+
+ if (await socialActions.unrepostButton.isVisible()) {
+ await socialActions.unrepost()
+ await socialActions.repost()
+ } else {
+ await socialActions.repost()
+ await socialActions.unrepost()
+ }
+})
diff --git a/packages/web/e2e/test.ts b/packages/web/e2e/test.ts
new file mode 100644
index 00000000000..ecd8a1498a0
--- /dev/null
+++ b/packages/web/e2e/test.ts
@@ -0,0 +1,34 @@
+import { Page, expect, test as base } from '@playwright/test'
+
+/**
+ * The initial page load is slow because we need to wait for the
+ * JS to hydrate, which takes a while. These wrappers wait until a specific
+ * client-only element is mounted before considering the navigation complete.
+ */
+export const test = base.extend<{}>({
+ page: async ({ page }, use) => {
+ const baseGoTo = page.goto.bind(page)
+ page.goto = async (
+ url: Parameters[0],
+ options: Parameters[1] = {}
+ ) => {
+ const timeout = options.timeout ?? 60 * 1000
+ const response = await baseGoTo(url, { waitUntil: 'load', ...options })
+ await expect(page.getByTestId('app-hydrated')).toBeAttached({
+ timeout
+ })
+ return response
+ }
+
+ const baseReload = page.reload.bind(page)
+ page.reload = async (options: Parameters[0]) => {
+ const timeout = options?.timeout ?? 60 * 1000
+ const reponse = await baseReload(options)
+ await expect(page.getByTestId('app-hydrated')).toBeAttached({
+ timeout
+ })
+ return reponse
+ }
+ await use(page)
+ }
+})
diff --git a/packages/web/e2e/uploadCollection.test.ts b/packages/web/e2e/uploadCollection.test.ts
new file mode 100644
index 00000000000..d6028452f07
--- /dev/null
+++ b/packages/web/e2e/uploadCollection.test.ts
@@ -0,0 +1,190 @@
+import { expect } from '@playwright/test'
+import {
+ EditAlbumPage,
+ EditPlaylistPage,
+ UploadFinishPage,
+ UploadSelectPage
+} from './page-object-models/upload'
+import { test } from './test'
+
+test('should upload a playlist', async ({ page }) => {
+ const timestamp = Date.now()
+ const playlistName = `Test playlist ${timestamp}`
+ const playlistDescription = 'Test description'
+ const trackOneDetails = { name: `Test track 1 ${timestamp}` }
+ const trackTwoDetails = {
+ name: `Test track 2 ${timestamp}`,
+ genre: 'Alternative',
+ mood: 'Energizing',
+ tags: ['TAG3', 'TAG4']
+ }
+ const trackDetails = [trackOneDetails, trackTwoDetails]
+ const genre = 'Electronic - Progressive House'
+ const mood = 'Tender'
+ const tags = ['TAG1', 'TAG2']
+
+ await page.goto('upload')
+
+ const selectPage = new UploadSelectPage(page)
+ await selectPage.setTracks('track.mp3', 'track-2.mp3')
+ await selectPage.setReleaseType('Playlist')
+ await selectPage.continue()
+
+ await expect(
+ page.getByRole('heading', { name: /complete your playlist/i })
+ ).toBeVisible()
+
+ const editPage = new EditPlaylistPage(page)
+ await editPage.setArtwork('track-artwork.jpeg')
+ await editPage.setTitle(playlistName)
+ await editPage.setGenre(genre)
+ await editPage.setMood(mood)
+ await editPage.setTags(tags)
+ await editPage.setDescription(playlistDescription)
+
+ for (let i = 0; i < trackDetails.length; i++) {
+ await editPage.setTrackDetails(i, trackDetails[i])
+ }
+
+ await editPage.complete()
+
+ const finishPage = new UploadFinishPage(page, 'Playlist')
+ await finishPage.assertCompletes()
+
+ // Vist collection page
+ await page.getByRole('link', { name: /visit playlist page/i }).click()
+
+ // Assert title
+ const header = page.getByRole('heading', { name: playlistName, level: 1 })
+ await expect(header).toBeVisible()
+
+ // Assert description
+ const description = page.getByText(playlistDescription)
+ await expect(description).toBeVisible()
+
+ // Assert track list
+ const trackTable = page.getByRole('table')
+ const trackOne = trackTable.getByRole('cell', { name: trackOneDetails.name })
+ const trackTwo = trackTable.getByRole('cell', { name: trackTwoDetails.name })
+ await expect(trackOne).toBeVisible()
+ await expect(trackTwo).toBeVisible()
+
+ // Visit track 1
+ await trackOne.getByRole('link', { name: trackOneDetails.name }).click()
+
+ // Assert tagged
+ const tag1 = page.getByRole('link', { name: tags[0] })
+ const tag2 = page.getByRole('link', { name: tags[1] })
+ await expect(tag1).toBeVisible()
+ await expect(tag2).toBeVisible()
+
+ // Assert genre and mood
+ await expect(page.getByText(genre)).toBeVisible()
+ await expect(page.getByText(mood)).toBeVisible()
+
+ await page.goBack()
+
+ // Visit track 2
+ await trackTwo.getByRole('link', { name: trackTwoDetails.name }).click()
+
+ // Assert tagged differently
+ const tag3 = page.getByRole('link', { name: trackTwoDetails.tags[0] })
+ const tag4 = page.getByRole('link', { name: trackTwoDetails.tags[1] })
+ await expect(tag3).toBeVisible()
+ await expect(tag4).toBeVisible()
+
+ // Assert different genre and mood
+ await expect(page.getByText(trackTwoDetails.genre)).toBeVisible()
+ await expect(page.getByText(trackTwoDetails.mood)).toBeVisible()
+})
+
+test('should upload an album', async ({ page }) => {
+ const timestamp = Date.now()
+ const playlistName = `Test album ${timestamp}`
+ const playlistDescription = 'Test description'
+ const trackOneDetails = { name: `Test track 1 ${timestamp}` }
+ const trackTwoDetails = {
+ name: `Test track 2 ${timestamp}`,
+ genre: 'Alternative',
+ mood: 'Energizing',
+ tags: ['TAG3', 'TAG4']
+ }
+ const trackDetails = [trackOneDetails, trackTwoDetails]
+ const genre = 'Electronic - Progressive House'
+ const mood = 'Tender'
+ const tags = ['TAG1', 'TAG2']
+
+ await page.goto('upload')
+
+ const selectPage = new UploadSelectPage(page)
+ await selectPage.setTracks('track.mp3', 'track-2.mp3')
+ await selectPage.setReleaseType('Album')
+ await selectPage.continue()
+
+ await expect(
+ page.getByRole('heading', { name: /complete your album/i })
+ ).toBeVisible()
+
+ const editPage = new EditAlbumPage(page)
+ await editPage.setArtwork('track-artwork.jpeg')
+ await editPage.setTitle(playlistName)
+ await editPage.setGenre(genre)
+ await editPage.setMood(mood)
+ await editPage.setTags(tags)
+ await editPage.setDescription(playlistDescription)
+
+ for (let i = 0; i < trackDetails.length; i++) {
+ await editPage.setTrackDetails(i, trackDetails[i])
+ }
+
+ await editPage.complete()
+
+ const finishPage = new UploadFinishPage(page, 'Album')
+ await finishPage.assertCompletes()
+
+ // Vist collection page
+ await page.getByRole('link', { name: /visit album page/i }).click()
+
+ // Assert title
+ const header = page.getByRole('heading', { name: playlistName, level: 1 })
+ await expect(header).toBeVisible()
+
+ // Assert description
+ const description = page.getByText(playlistDescription)
+ await expect(description).toBeVisible()
+
+ // Assert track list
+ const trackTable = page.getByRole('table')
+ const trackOne = trackTable.getByRole('cell', { name: trackOneDetails.name })
+ const trackTwo = trackTable.getByRole('cell', { name: trackTwoDetails.name })
+ await expect(trackOne).toBeVisible()
+ await expect(trackTwo).toBeVisible()
+
+ // Visit track 1
+ await trackOne.getByRole('link', { name: trackOneDetails.name }).click()
+
+ // Assert tagged
+ const tag1 = page.getByRole('link', { name: tags[0] })
+ const tag2 = page.getByRole('link', { name: tags[1] })
+ await expect(tag1).toBeVisible()
+ await expect(tag2).toBeVisible()
+
+ // Assert genre and mood
+ await expect(page.getByText(genre)).toBeVisible()
+ await expect(page.getByText(mood)).toBeVisible()
+
+ await page.goBack()
+
+ // Visit track 2
+ await trackTwo.getByRole('link', { name: trackTwoDetails.name }).click()
+
+ // Assert tagged differently
+ const tag3 = page.getByRole('link', { name: trackTwoDetails.tags[0] })
+ const tag4 = page.getByRole('link', { name: trackTwoDetails.tags[1] })
+ await expect(tag3).toBeVisible()
+ await expect(tag4).toBeVisible()
+
+ // Assert different genre and mood
+ await expect(page.getByText(trackTwoDetails.genre)).toBeVisible()
+ await expect(page.getByText(trackTwoDetails.mood)).toBeVisible()
+})
diff --git a/packages/web/e2e/uploadTrack.test.ts b/packages/web/e2e/uploadTrack.test.ts
new file mode 100644
index 00000000000..a5e9ff6de20
--- /dev/null
+++ b/packages/web/e2e/uploadTrack.test.ts
@@ -0,0 +1,224 @@
+import { expect } from '@playwright/test'
+import {
+ EditTrackPage,
+ UploadFinishPage,
+ UploadSelectPage
+} from './page-object-models/upload'
+import {
+ RemixSettingsModal,
+ AccessAndSaleModal,
+ AttributionModal,
+ StemsAndDownloadsModal
+} from './page-object-models/modals'
+import { test } from './test'
+
+test('should upload a remix, hidden, AI-attributed track', async ({ page }) => {
+ const trackTitle = `Test track ${Date.now()}`
+ const trackDescription = 'Test description'
+ const genre = 'Alternative'
+ const mood = 'Easygoing'
+ const tags = ['TAG1', 'TAG2']
+ const remixUrl = 'staging.audius.co/sebastian12/probers_track_do_not_delete'
+ const remixName = 'probers_track_do_not_delete'
+ const aiAttributionName = 'probers ai DO NOT DELETE'
+ const isrc = 'US-123-45-67890'
+ const iswc = 'T-123456789-0'
+
+ await page.goto('upload')
+
+ const selectPage = new UploadSelectPage(page)
+ await selectPage.setTracks('track.mp3')
+ await selectPage.continue()
+
+ await expect(
+ page.getByRole('heading', { name: /complete your track/i, level: 1 })
+ ).toBeVisible()
+
+ const editPage = new EditTrackPage(page)
+ await editPage.setArtwork('track-artwork.jpeg')
+ await editPage.setTitle(trackTitle)
+ await editPage.setDescription(trackDescription)
+ await editPage.setGenre(genre)
+ await editPage.setMood(mood)
+ await editPage.setTags(tags)
+
+ await editPage.openRemixSettings()
+ const remixSettingsModal = new RemixSettingsModal(page)
+ await remixSettingsModal.setAsRemixOf(remixUrl, remixName)
+ await remixSettingsModal.save()
+
+ await editPage.openAccessAndSaleSettings()
+ const accessAndSaleModal = new AccessAndSaleModal(page)
+ expect(accessAndSaleModal.remixAlert).toBeVisible()
+ // Only public and hidden allowed for remixes
+ await expect(
+ accessAndSaleModal.locator.getByRole('radio', { disabled: false })
+ ).toHaveCount(2)
+ await accessAndSaleModal.setHidden({ ['Share Button']: true })
+ await accessAndSaleModal.save()
+
+ await editPage.openAttributionSettings()
+ const attributionModal = new AttributionModal(page)
+ await attributionModal.markAsAIGenerated(aiAttributionName)
+ await attributionModal.setISRC(isrc)
+ await attributionModal.setISWC(iswc)
+ await attributionModal.setAllowAttribution(true)
+ await attributionModal.setAllowCommercialUse(true)
+ await attributionModal.setDerivativeWorks('Allowed')
+ await attributionModal.save()
+
+ await editPage.complete()
+
+ const uploadingPage = new UploadFinishPage(page, 'Track')
+ await uploadingPage.assertCompletes()
+
+ // Vist track page
+ await page.getByRole('link', { name: /visit track page/i }).click()
+
+ // Assert title
+ const trackHeading = page.getByRole('heading', {
+ name: trackTitle,
+ level: 1
+ })
+ await expect(trackHeading).toBeVisible()
+
+ // Assert hidden
+ const hidden = page.getByRole('heading', {
+ name: /hidden track/i,
+ level: 5
+ })
+ await expect(hidden.first()).toBeVisible()
+
+ // Assert tagged
+ const tag1 = page.getByRole('link', { name: tags[0] })
+ await expect(tag1).toBeVisible()
+ const tag2 = page.getByRole('link', { name: tags[1] })
+ await expect(tag1).toBeVisible()
+ await expect(tag2).toBeVisible()
+
+ // Assert description
+ const description = page.getByRole('heading', {
+ name: trackDescription,
+ level: 3
+ })
+ await expect(description).toBeVisible()
+
+ // Assert genre and mood
+ await expect(page.getByText(genre)).toBeVisible()
+ await expect(page.getByText(mood)).toBeVisible()
+
+ // Assert shareable
+ await expect(page.getByRole('button', { name: /share/i })).toBeVisible()
+
+ // Assert remix
+ await expect(page.getByText('ORIGINAL TRACK')).toBeVisible()
+ await expect(page.getByRole('link', { name: remixName })).toBeVisible()
+
+ // Assert AI generated
+ await expect(page.getByText('generated with ai').first()).toBeVisible()
+
+ // Assert ISRC
+ // TODO
+
+ // Assert ISWC
+ // TODO
+
+ // Assert license
+ // TODO
+})
+
+test('should upload a premium track', async ({ page }) => {
+ const trackTitle = `Test premium track ${Date.now()}`
+ const genre = 'Alternative'
+ const price = '1.05'
+ const previewSeconds = '15'
+
+ await page.goto('upload')
+
+ const selectPage = new UploadSelectPage(page)
+ await selectPage.setTracks('track.mp3')
+ await selectPage.continue()
+
+ const editPage = new EditTrackPage(page)
+ await editPage.setArtwork('track-artwork.jpeg')
+ await editPage.setTitle(trackTitle)
+ await editPage.setGenre(genre)
+
+ await editPage.openAccessAndSaleSettings()
+ const accessAndSaleModal = new AccessAndSaleModal(page)
+ await accessAndSaleModal.setPremium({ price, previewSeconds })
+ await accessAndSaleModal.save()
+
+ await editPage.complete()
+
+ const uploadingPage = new UploadFinishPage(page, 'Track')
+ await uploadingPage.assertCompletes()
+
+ // Vist track page
+ await page.getByRole('link', { name: /visit track page/i }).click()
+
+ // Assert title
+ const trackHeading = page.getByRole('heading', {
+ name: trackTitle,
+ level: 1
+ })
+ await expect(trackHeading).toBeVisible()
+
+ // Assert premium
+ const premium = page.getByRole('heading', {
+ name: /premium track/i,
+ level: 5
+ })
+ await expect(premium.first()).toBeVisible()
+
+ // Assert price
+ await expect(page.getByText('$' + price)).toBeVisible()
+})
+
+test('should upload a track with free stems', async ({ page }) => {
+ const trackTitle = `Test stems track ${Date.now()}`
+ const genre = 'Alternative'
+
+ await page.goto('upload')
+
+ const selectPage = new UploadSelectPage(page)
+ await selectPage.setTracks('track.mp3')
+ await selectPage.continue()
+
+ const editPage = new EditTrackPage(page)
+ await editPage.setArtwork('track-artwork.jpeg')
+ await editPage.setTitle(trackTitle)
+ await editPage.setGenre(genre)
+
+ await editPage.openStemsAndDownloadsSettings()
+ const stemsAndDownloadsModal = new StemsAndDownloadsModal(page)
+ await stemsAndDownloadsModal.setAllowTrackDownload(true)
+ await stemsAndDownloadsModal.setStems([
+ { filename: 'stem-1.mp3', type: 'Instrumental' },
+ { filename: 'stem-2.mp3', type: 'Lead Vocals' }
+ ])
+ await stemsAndDownloadsModal.save()
+
+ await editPage.complete()
+
+ const uploadingPage = new UploadFinishPage(page, 'Track')
+ await uploadingPage.assertCompletes()
+
+ // Vist track page
+ await page.getByRole('link', { name: /visit track page/i }).click()
+
+ // Assert title
+ const trackHeading = page.getByRole('heading', {
+ name: trackTitle,
+ level: 1
+ })
+ await expect(trackHeading).toBeVisible()
+
+ // Assert Stems & Downloads
+ await page.getByRole('button', { name: /stems & downloads/i }).click()
+ await expect(page.getByText(/full track/i)).toBeVisible()
+ await expect(page.getByText(/stem-1.mp3/i)).toBeVisible()
+ await expect(page.getByText(/instrumental/i)).toBeVisible()
+ await expect(page.getByText(/stem-2.mp3/i)).toBeVisible()
+ await expect(page.getByText(/lead vocals/i)).toBeVisible()
+})
diff --git a/packages/web/package.json b/packages/web/package.json
index cb5f08492c0..05001296b22 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -3,7 +3,7 @@
"productName": "Audius",
"description": "The Audius web client reference implementation",
"author": "Audius",
- "version": "1.5.72",
+ "version": "1.5.73",
"private": true,
"scripts": {
"DEV & BUILD========================================": "",
@@ -31,6 +31,7 @@
"start": "npm run write-sha && npm run publish-scripts && env-cmd ./env/.env.git vite",
"stylelint:fix": "npm run stylelint -- --fix",
"stylelint": "stylelint 'src/**/*.css'",
+ "test:e2e": "npx playwright test",
"test:coverage": "vitest --resetMocks=false --coverage --watchAll=false",
"test": "vitest",
"typecheck:watch": "tsc --watch",
@@ -148,7 +149,6 @@
"numeral": "2.0.6",
"orbit-controls": "0.0.1",
"perspective-camera": "2.0.1",
- "pixi.js": "4.8.9",
"prop-types": "15.7.2",
"query-string": "6.13.5",
"raw-loader": "0.5.1",
@@ -209,6 +209,7 @@
"@electron/notarize": "2.2.0",
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@pinata/sdk": "1.1.13",
+ "@playwright/test": "1.42.1",
"@redux-devtools/extension": "3.2.4",
"@testing-library/react": "12.0.0",
"@types/amplitude-js": "8.0.2",
diff --git a/packages/web/playwright.config.ts b/packages/web/playwright.config.ts
new file mode 100644
index 00000000000..db7f051d9ed
--- /dev/null
+++ b/packages/web/playwright.config.ts
@@ -0,0 +1,110 @@
+import { defineConfig, devices } from '@playwright/test'
+import fs from 'fs'
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+const authFileExists = fs.existsSync('playwright/.auth/user.json')
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+ testDir: './e2e',
+ /* Run tests in files in parallel */
+ fullyParallel: true,
+ /* Fail the build on CI if you accidentally left test.only in the source code. */
+ forbidOnly: !!process.env.CI,
+ /* Retry on CI only */
+ retries: process.env.CI ? 2 : 0,
+ /* Opt out of parallel tests on CI. */
+ workers: process.env.CI ? 1 : undefined,
+ /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+ reporter: process.env.CI
+ ? [
+ ['junit', { outputFile: 'report.xml', outputDir: 'playwright-report' }],
+ ['html', { open: 'never' }],
+ ['line'],
+ ['blob']
+ ]
+ : 'html',
+ /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+ use: {
+ /* Base URL to use in actions like `await page.goto('/')`. */
+ baseURL: 'http://localhost:3001',
+
+ /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+ trace: 'on-first-retry',
+
+ /* Set the default timeout for actions like "click" */
+ actionTimeout: 10 * 1000
+ },
+
+ /* Total timeout for individual tests */
+ timeout: 5 * 60 * 1000,
+
+ /* Timeout for each assertion */
+ expect: {
+ timeout: 10 * 1000
+ },
+
+ /* Configure projects for major browsers */
+ projects: [
+ {
+ name: 'setup',
+ testMatch: /.*\.setup.ts/
+ },
+ {
+ name: 'chromium',
+ dependencies: authFileExists ? undefined : ['setup'],
+ testIgnore: /.*\.setup.ts/,
+ use: {
+ ...devices['Desktop Chrome'],
+ storageState: 'playwright/.auth/user.json'
+ }
+ }
+
+ // {
+ // name: 'firefox',
+ // use: { ...devices['Desktop Firefox'] },
+ // },
+
+ // {
+ // name: 'webkit',
+ // use: { ...devices['Desktop Safari'] },
+ // },
+
+ /* Test against mobile viewports. */
+ // {
+ // name: 'Mobile Chrome',
+ // use: { ...devices['Pixel 5'] },
+ // },
+ // {
+ // name: 'Mobile Safari',
+ // use: { ...devices['iPhone 12'] },
+ // },
+
+ /* Test against branded browsers. */
+ // {
+ // name: 'Microsoft Edge',
+ // use: { ...devices['Desktop Edge'], channel: 'msedge' },
+ // },
+ // {
+ // name: 'Google Chrome',
+ // use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+ // },
+ ],
+
+ /* Run your local dev server before starting the tests */
+ webServer: {
+ command: 'npm run start:spa:stage',
+ url: 'http://localhost:3001',
+ reuseExistingServer: !process.env.CI,
+ stdout: 'pipe',
+ stderr: 'pipe',
+ timeout: 60000 * 5
+ }
+})
diff --git a/packages/web/src/app/web-player/WebPlayer.jsx b/packages/web/src/app/web-player/WebPlayer.jsx
index 74f7a10f6c9..c1ee135a583 100644
--- a/packages/web/src/app/web-player/WebPlayer.jsx
+++ b/packages/web/src/app/web-player/WebPlayer.jsx
@@ -484,6 +484,10 @@ class WebPlayer extends Component {
{this.props.isChatEnabled ? : null}
+
+ {/* This is used in E2E tests to determine that client-side JS is loaded */}
+
+
{this.props.showCookieBanner ? : null}
@@ -991,7 +995,9 @@ class WebPlayer extends Component {
-
+
+
+
diff --git a/packages/web/src/assets/styles/colors.css b/packages/web/src/assets/styles/colors.css
index bb248e4ad2f..e1e9cbdea81 100644
--- a/packages/web/src/assets/styles/colors.css
+++ b/packages/web/src/assets/styles/colors.css
@@ -97,25 +97,39 @@
--next-and-previous-buttons: var(--harmony-neutral);
--segmented-progress-bar-segment-1: linear-gradient(
- 180deg; #ed75f9 0%; #cc0fe0 100%
+ 180deg,
+ #ed75f9 0%,
+ #cc0fe0 100%
);
--segmented-progress-bar-segment-2: linear-gradient(
- 180deg; #e477fb 0%; #b815db 100%
+ 180deg,
+ #e477fb 0%,
+ #b815db 100%
);
--segmented-progress-bar-segment-3: linear-gradient(
- 180deg; #d069f5 0%; #9f0ad4 100%
+ 180deg,
+ #d069f5 0%,
+ #9f0ad4 100%
);
--segmented-progress-bar-segment-4: linear-gradient(
- 180deg; #cc75fa 0%; #8908ce 100%
+ 180deg,
+ #cc75fa 0%,
+ #8908ce 100%
);
--segmented-progress-bar-segment-5: linear-gradient(
- 180deg; #af4dff 0%; #7305c8 100%
+ 180deg,
+ #af4dff 0%,
+ #7305c8 100%
);
--segmented-progress-bar-segment-6: linear-gradient(
- 180deg; #9c45ff 0%; #5c03c2 100%
+ 180deg,
+ #9c45ff 0%,
+ #5c03c2 100%
);
--segmented-progress-bar-segment-7: linear-gradient(
- 180deg; #833bfb 0%; #4600bc 100%
+ 180deg,
+ #833bfb 0%,
+ #4600bc 100%
);
}
diff --git a/packages/web/src/common/store/pages/signon/actions.ts b/packages/web/src/common/store/pages/signon/actions.ts
index 42b5441d1d7..a5580c13dbd 100644
--- a/packages/web/src/common/store/pages/signon/actions.ts
+++ b/packages/web/src/common/store/pages/signon/actions.ts
@@ -3,7 +3,8 @@ import {
InstagramProfile,
TwitterProfile,
TikTokProfile,
- Image
+ Image,
+ toastActions
} from '@audius/common/store'
import { createCustomAction } from 'typesafe-actions'
@@ -65,7 +66,6 @@ export const NEXT_PAGE = 'SIGN_ON/NEXT_PAGE'
export const PREVIOUS_PAGE = 'SIGN_ON/PREVIOUS_PAGE'
export const GO_TO_PAGE = 'SIGN_ON/GO_TO_PAGE'
-export const SET_TOAST = 'SIGN_ON/SET_TOAST'
export const UPDATE_ROUTE_ON_COMPLETION = 'SIGN_ON/UPDATE_ROUTE_ON_COMPLETION'
export const UPDATE_ROUTE_ON_EXIT = 'SIGN_ON/UPDATE_ROUTE_ON_EXIT'
@@ -421,26 +421,10 @@ export function removeFollowArtists(userIds: ID[]) {
return { type: REMOVE_FOLLOW_ARTISTS, userIds }
}
-/**
- * Sets a toast appearing over signon
- */
-export const showToast = (text: string) => ({
- type: SET_TOAST,
- text
-})
-
-/**
- * Clears a toast appearing over signon
- */
-export const clearToast = () => ({
- type: SET_TOAST,
- text: null
-})
-
-export const showRequiresAccountModal = () => ({
- type: SET_TOAST,
- text: 'Oops, it looks like you need an account to do that!'
-})
+export const showRequiresAccountModal = () =>
+ toastActions.toast({
+ content: 'Oops, it looks like you need an account to do that!'
+ })
/**
* Opens the signin/up modal in mobile and routes to the page on desktop
diff --git a/packages/web/src/common/store/pages/signon/reducer.js b/packages/web/src/common/store/pages/signon/reducer.js
index 398fb75df41..596a30aa936 100644
--- a/packages/web/src/common/store/pages/signon/reducer.js
+++ b/packages/web/src/common/store/pages/signon/reducer.js
@@ -31,7 +31,6 @@ import {
SIGN_IN_FAILED,
SIGN_IN_SUCCEEDED,
CONFIGURE_META_MASK,
- SET_TOAST,
UPDATE_ROUTE_ON_COMPLETION,
UPDATE_ROUTE_ON_EXIT,
ADD_FOLLOW_ARTISTS,
@@ -74,7 +73,6 @@ const initialState = {
profileImage: null, // Object with file blob & url
coverPhoto: null, // Object with file blob & url
status: 'editing', // 'editing', 'loading', 'success', or 'failure'
- toastText: null,
page: Pages.EMAIL,
startedSignUpProcess: false,
/** @deprecated */
@@ -409,12 +407,6 @@ const actionsMap = {
otp: createTextField()
}
},
- [SET_TOAST](state, action) {
- return {
- ...state,
- toastText: action.text
- }
- },
[UPDATE_ROUTE_ON_COMPLETION](state, action) {
return {
...state,
diff --git a/packages/web/src/common/store/pages/signon/sagas.ts b/packages/web/src/common/store/pages/signon/sagas.ts
index 5386125d602..097d8098aef 100644
--- a/packages/web/src/common/store/pages/signon/sagas.ts
+++ b/packages/web/src/common/store/pages/signon/sagas.ts
@@ -813,7 +813,7 @@ function* signIn(action: ReturnType) {
}
})
)
- yield* put(signOnActions.showToast(messages.incompleteAccount))
+ yield* put(toastActions.toast({ content: messages.incompleteAccount }))
const trackEvent = make(Name.SIGN_IN_WITH_INCOMPLETE_ACCOUNT, {
handle: signInResponse.handle
@@ -826,7 +826,7 @@ function* signIn(action: ReturnType) {
accountAlreadyExisted: true
})
)
- yield* put(signOnActions.showToast(messages.incompleteAccount))
+ yield* put(toastActions.toast({ content: messages.incompleteAccount }))
} else {
yield* put(
signOnActions.signInFailed(
@@ -1038,18 +1038,6 @@ function* watchFollowArtists() {
yield* takeLatest(signOnActions.FOLLOW_ARTISTS, followArtists)
}
-function* watchShowToast() {
- yield* takeLatest(
- signOnActions.SET_TOAST,
- function* (action: ReturnType) {
- if (action.text) {
- yield* delay(5000)
- yield* put(signOnActions.clearToast())
- }
- }
- )
-}
-
function* watchOpenSignOn() {
yield* takeLatest(
signOnActions.OPEN_SIGN_ON,
@@ -1085,7 +1073,6 @@ export default function sagas() {
watchFollowArtists,
watchGetArtistsToFollow,
watchConfigureMetaMask,
- watchShowToast,
watchOpenSignOn,
watchSignOnError,
watchSendWelcomeEmail,
diff --git a/packages/web/src/common/store/pages/signon/selectors.ts b/packages/web/src/common/store/pages/signon/selectors.ts
index c3840040097..18fc5a63503 100644
--- a/packages/web/src/common/store/pages/signon/selectors.ts
+++ b/packages/web/src/common/store/pages/signon/selectors.ts
@@ -31,7 +31,6 @@ export const getIsMobileSignOnVisible = (state: AppState) =>
state.signOn.isMobileSignOnVisible
export const getStatus = (state: AppState) => state.signOn.status
export const getPage = (state: AppState) => state.signOn.page
-export const getToastText = (state: AppState) => state.signOn.toastText
export const getRouteOnCompletion = (state: AppState) =>
state.signOn.routeOnCompletion
export const getRouteOnExit = (state: AppState) => state.signOn.routeOnExit
diff --git a/packages/web/src/common/store/pages/signon/types.ts b/packages/web/src/common/store/pages/signon/types.ts
index c4709562756..4e51a34a007 100644
--- a/packages/web/src/common/store/pages/signon/types.ts
+++ b/packages/web/src/common/store/pages/signon/types.ts
@@ -64,7 +64,6 @@ export default interface SignOnPageState {
suggestedFollowEntries: User[]
followIds: ID[]
status: EditingStatus
- toastText: string | null
hidePreviewHint: boolean
followArtists: FollowArtists
isMobileSignOnVisible: boolean
diff --git a/packages/web/src/common/utils/isMobileWeb.ts b/packages/web/src/common/utils/isMobileWeb.ts
index 74976277d84..2bc0f0f4c5d 100644
--- a/packages/web/src/common/utils/isMobileWeb.ts
+++ b/packages/web/src/common/utils/isMobileWeb.ts
@@ -20,8 +20,5 @@ export const isMobileWeb = () => {
if (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)
check = true
- if (navigator.userAgent === 'probers' && window.innerWidth < 500) {
- check = true
- }
return check
}
diff --git a/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx b/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx
index 8b569be428f..4fc5ff3d4da 100644
--- a/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx
+++ b/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx
@@ -51,7 +51,9 @@ const AnimatedButton = ({
disabledClassName = '',
wrapperClassName = '',
stopPropagation = false,
- disableAnimationOnMount = true
+ disableAnimationOnMount = true,
+ uniqueKey,
+ ...buttonProps
}: AnimatedButtonProps) => {
const [isPaused, setIsPaused] = useState(true)
const [getDidMount, setDidMount] = useInstanceVar(false)
@@ -122,7 +124,7 @@ const AnimatedButton = ({
}
return href ? (
-
+
{buttonElement}
) : (
diff --git a/packages/web/src/components/app-redirect-popover/components/AppRedirectPopover.tsx b/packages/web/src/components/app-redirect-popover/components/AppRedirectPopover.tsx
index f3a368e5a4a..369d3105e73 100644
--- a/packages/web/src/components/app-redirect-popover/components/AppRedirectPopover.tsx
+++ b/packages/web/src/components/app-redirect-popover/components/AppRedirectPopover.tsx
@@ -109,8 +109,7 @@ export const AppRedirectPopover = (props: AppRedirectPopoverProps) => {
!matchPath(history.location.pathname, { path: '/', exact: true }) &&
animDelay &&
!isDismissed &&
- isMobile &&
- !(navigator.userAgent === 'probers')
+ isMobile
useEffect(() => {
shouldShow && incrementScroll()
@@ -194,7 +193,7 @@ export const AppRedirectPopover = (props: AppRedirectPopoverProps) => {
style={props}
>
diff --git a/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.module.css b/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.module.css
index 2773fd52962..4d1fd18f538 100644
--- a/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.module.css
+++ b/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.module.css
@@ -1,7 +1,3 @@
-.button {
- width: 100%;
-}
-
.tooltip :global(.ant-tooltip-inner) {
border-radius: 8px;
padding: 12px 24px;
diff --git a/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx b/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx
index edc7a264aa1..ea867d52959 100644
--- a/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx
+++ b/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx
@@ -72,7 +72,6 @@ export const StripeBuyAudioButton = () => {
diff --git a/packages/web/src/components/client-only/ClientOnly.tsx b/packages/web/src/components/client-only/ClientOnly.tsx
index 09b716a6d98..812e11f9a0b 100644
--- a/packages/web/src/components/client-only/ClientOnly.tsx
+++ b/packages/web/src/components/client-only/ClientOnly.tsx
@@ -1,4 +1,6 @@
-import { ReactNode, useEffect, useState } from 'react'
+import { ReactNode, useContext } from 'react'
+
+import { SsrContext } from 'ssr/SsrContext'
type ClientOnlyProps = {
children: ReactNode
@@ -14,12 +16,7 @@ type ClientOnlyProps = {
export const ClientOnly = (props: ClientOnlyProps) => {
const { children, fallback = null } = props
- const [isClientSide, setIsClientSide] = useState(false)
-
- // useEffect only runs on the client
- useEffect(() => {
- setIsClientSide(true)
- }, [])
+ const { isServerSide } = useContext(SsrContext)
- return <>{isClientSide ? children : fallback}
+ return <>{isServerSide ? fallback : children}
}
diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx
index fe829765c62..b8e42d5fa19 100644
--- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx
+++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx
@@ -299,7 +299,7 @@ const CollectibleDetailsModal = ({
tooltipClassName={styles.shareTooltip}
>
)}
-
-
- Done
-
+
+
+ Done
+
+
diff --git a/packages/web/src/components/cover-photo/CoverPhoto.module.css b/packages/web/src/components/cover-photo/CoverPhoto.module.css
index a2ff8a47bb0..b73efe43254 100644
--- a/packages/web/src/components/cover-photo/CoverPhoto.module.css
+++ b/packages/web/src/components/cover-photo/CoverPhoto.module.css
@@ -1,19 +1,21 @@
.coverPhoto {
width: 100%;
- height: 100%;
- min-height: 376px;
+ height: 376px;
position: relative;
display: flex;
justify-content: center;
+ overflow: hidden;
}
.placeholder,
.photo {
position: absolute;
width: 100%;
+ height: 100%;
min-height: 376px;
display: flex;
background-position: center;
+ z-index: 0;
}
.photo {
@@ -47,6 +49,7 @@
.hide {
opacity: 0;
}
+
.show {
opacity: 1;
}
diff --git a/packages/web/src/components/cover-photo/CoverPhoto.tsx b/packages/web/src/components/cover-photo/CoverPhoto.tsx
index 43f397aa9bd..9467524db9b 100644
--- a/packages/web/src/components/cover-photo/CoverPhoto.tsx
+++ b/packages/web/src/components/cover-photo/CoverPhoto.tsx
@@ -104,25 +104,27 @@ const CoverPhoto = ({
isUrl={false}
wrapperClassName={styles.photo}
imageStyle={backgroundStyle}
+ useBlur={shouldBlur}
usePlaceholder={false}
immediate={immediate}
- useBlur={shouldBlur}
>
{processing ? loadingElement : null}
-
- {edit ? (
-
- ) : null}
-
+
+
+ {edit ? (
+
+ ) : null}
+
+
)
}
diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx
index b28fe28b6ea..3b3f4f966c6 100644
--- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx
+++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx
@@ -370,7 +370,7 @@ export const AccessAndSaleTriggerLegacy = (
renderValue={() => null}
previewOverride={(toggleMenu) => (
)
@@ -126,7 +117,9 @@ export const Dropzone = ({
{subtextAboveIcon}
) : null}
-
+
) : null}
diff --git a/packages/web/src/components/upload/TrackPreview.tsx b/packages/web/src/components/upload/TrackPreview.tsx
index 7eb19c19272..4fed8450824 100644
--- a/packages/web/src/components/upload/TrackPreview.tsx
+++ b/packages/web/src/components/upload/TrackPreview.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { ComponentPropsWithoutRef, useState } from 'react'
import { StemCategory, stemCategoryFriendlyNames } from '@audius/common/models'
import { Nullable } from '@audius/common/utils'
@@ -74,7 +74,7 @@ const fileTypeIcon = (type: string) => {
}
}
-type TrackPreviewProps = {
+type TrackPreviewProps = ComponentPropsWithoutRef<'div'> & {
index: number
displayIndex: boolean
onRemove: () => void
@@ -102,7 +102,8 @@ export const TrackPreview = (props: TrackPreviewProps) => {
onEditStemCategory,
allowCategorySwitch = true,
allowDelete = true,
- className
+ className,
+ ...divProps
} = props
const {
name: trackTitle,
@@ -127,7 +128,7 @@ export const TrackPreview = (props: TrackPreviewProps) => {
)
return (
-
+
{displayIndex ? (
{index + 1}
diff --git a/packages/web/src/components/upload/UploadArtwork.module.css b/packages/web/src/components/upload/UploadArtwork.module.css
index 7a7e3f459d3..ada106c1958 100644
--- a/packages/web/src/components/upload/UploadArtwork.module.css
+++ b/packages/web/src/components/upload/UploadArtwork.module.css
@@ -27,7 +27,7 @@
.button {
position: absolute;
- bottom: 32px;
+ bottom: var(--harmony-spacing-l);
left: 0;
right: 0;
diff --git a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx
index 51f1f07eb20..471e5d83b4d 100644
--- a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx
+++ b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx
@@ -22,7 +22,7 @@ const { getCoinflowState } = withdrawUSDCSelectors
const messages = {
holdOn: 'Hold on!',
preparingTransfer:
- "We're getting your transfer ready. This could take a few moments, Please don't leave this page."
+ "We're getting your transfer ready. This could take a few moments. Please don't leave this page."
}
export const PrepareTransfer = () => {
diff --git a/packages/web/src/hooks/useTabs/useTabs.tsx b/packages/web/src/hooks/useTabs/useTabs.tsx
index aaf2dfc0957..bb35a74234b 100644
--- a/packages/web/src/hooks/useTabs/useTabs.tsx
+++ b/packages/web/src/hooks/useTabs/useTabs.tsx
@@ -21,6 +21,7 @@ import { throttle } from 'lodash'
import { animated, useTransition, useSpring } from 'react-spring'
import { useDrag } from 'react-use-gesture'
+import { ClientOnly } from 'components/client-only/ClientOnly'
import { SeoLink } from 'components/link'
import Tooltip from 'components/tooltip/Tooltip'
@@ -268,20 +269,21 @@ const TabBar = memo(
}
return (
-
- {to && pathname ? (
-
- {tabElement}
-
- ) : (
- {tabElement}
- )}
-
+
+
+ {to && pathname ? (
+
+ {tabElement}
+
+ ) : (
+ {tabElement}
+ )}
+
+
)
})}
diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx
index 3b3ad92228f..061769a80b3 100644
--- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx
+++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx
@@ -134,11 +134,7 @@ const RewardPanel = ({
? messages.viewDetails
: panelButtonText
- const buttonVariant = needsDisbursement
- ? 'primary'
- : hasDisbursed
- ? 'secondary'
- : 'common'
+ const buttonVariant = needsDisbursement ? 'primary' : 'secondary'
return (
{buttonMessage}
diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx
index d71b8e46848..32df62712da 100644
--- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx
+++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx
@@ -50,7 +50,7 @@ const RewardPanel = ({
{description()}
|