+ { isSessions && (
+
+ { isLastPlayed && (
+
+ )}
+
+ )}
diff --git a/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js b/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js
index 1a8eb17bf..a94eb5f1a 100644
--- a/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js
+++ b/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js
@@ -10,12 +10,12 @@ import cn from 'classnames';
const PROJECT = 'Using Script';
const DOCUMENTATION = 'Using NPM';
const TABS = [
+ { key: DOCUMENTATION, text: DOCUMENTATION },
{ key: PROJECT, text: PROJECT },
- { key: DOCUMENTATION, text: DOCUMENTATION }
];
class TrackingCodeModal extends React.PureComponent {
- state = { copied: false, changed: false, activeTab: PROJECT };
+ state = { copied: false, changed: false, activeTab: DOCUMENTATION };
setActiveTab = (tab) => {
this.setState({ activeTab: tab });
diff --git a/frontend/app/duck/sessions.js b/frontend/app/duck/sessions.js
index 6fcdb15c5..f8dc4020c 100644
--- a/frontend/app/duck/sessions.js
+++ b/frontend/app/duck/sessions.js
@@ -7,9 +7,9 @@ import withRequestState, { RequestTypes } from './requestStateCreator';
import { getRE } from 'App/utils';
import { LAST_7_DAYS } from 'Types/app/period';
import { getDateRangeFromValue } from 'App/dateRange';
+const name = 'sessions';
const INIT = 'sessions/INIT';
-
const FETCH_LIST = new RequestTypes('sessions/FETCH_LIST');
const FETCH = new RequestTypes('sessions/FETCH');
const FETCH_FAVORITE_LIST = new RequestTypes('sessions/FETCH_FAVORITE_LIST');
@@ -26,6 +26,7 @@ const TOGGLE_CHAT_WINDOW = 'sessions/TOGGLE_CHAT_WINDOW';
const SET_FUNNEL_PAGE_FLAG = 'sessions/SET_FUNNEL_PAGE_FLAG';
const SET_TIMELINE_POINTER = 'sessions/SET_TIMELINE_POINTER';
const SET_SESSION_PATH = 'sessions/SET_SESSION_PATH';
+const LAST_PLAYED_SESSION_ID = `${name}/LAST_PLAYED_SESSION_ID`;
const SET_ACTIVE_TAB = 'sessions/SET_ACTIVE_TAB';
@@ -60,6 +61,7 @@ const initialState = Map({
funnelPage: Map(),
timelinePointer: null,
sessionPath: '',
+ lastPlayedSessionId: null,
});
const reducer = (state = initialState, action = {}) => {
@@ -248,11 +250,21 @@ const reducer = (state = initialState, action = {}) => {
return state.set('timelinePointer', action.pointer);
case SET_SESSION_PATH:
return state.set('sessionPath', action.path);
+ case LAST_PLAYED_SESSION_ID:
+ return updateListItem(state, action.sessionId, { viewed: true }).set('lastPlayedSessionId', action.sessionId);
default:
return state;
}
};
+function updateListItem(state, sourceSessionId, instance) {
+ const list = state.get('list');
+ const index = list.findIndex(({ sessionId }) => sessionId === sourceSessionId);
+ if (index === -1) return state;
+
+ return state.updateIn([ 'list', index ], session => session.merge(instance));
+}
+
export default withRequestState({
_: [ FETCH, FETCH_LIST ],
fetchLiveListRequest: FETCH_LIVE_LIST,
@@ -391,4 +403,11 @@ export function setSessionPath(path) {
type: SET_SESSION_PATH,
path
}
+}
+
+export function updateLastPlayedSession(sessionId) {
+ return {
+ type: LAST_PLAYED_SESSION_ID,
+ sessionId,
+ };
}
\ No newline at end of file
diff --git a/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts b/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts
index e2cd635fd..fa66d5eb4 100644
--- a/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts
+++ b/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts
@@ -31,16 +31,6 @@ export default abstract class BaseScreen {
const screen = document.createElement('div');
- setTimeout(function() {
- iframe.contentDocument?.addEventListener('mousemove', function() {
- overlay.style.display = 'block';
- })
-
- overlay.addEventListener('contextmenu', function() {
- overlay.style.display = 'none';
- })
- }, 10)
-
screen.className = styles.screen;
screen.appendChild(iframe);
screen.appendChild(overlay);
@@ -58,6 +48,20 @@ export default abstract class BaseScreen {
// parentElement.onresize = this.scale;
window.addEventListener('resize', this.scale);
this.scale();
+
+ /* == For the Inspecting Document content == */
+ this.overlay.addEventListener('contextmenu', () => {
+ this.overlay.style.display = 'none'
+ const doc = this.document
+ if (!doc) { return }
+ const returnOverlay = () => {
+ this.overlay.style.display = 'block'
+ doc.removeEventListener('mousemove', returnOverlay)
+ doc.removeEventListener('mouseclick', returnOverlay) // TODO: prevent default in case of input selection
+ }
+ doc.addEventListener('mousemove', returnOverlay)
+ doc.addEventListener('mouseclick', returnOverlay)
+ })
}
get window(): WindowProxy | null {
@@ -70,10 +74,10 @@ export default abstract class BaseScreen {
private boundingRect: DOMRect | null = null;
private getBoundingClientRect(): DOMRect {
- //if (this.boundingRect === null) {
- return this.boundingRect = this.overlay.getBoundingClientRect(); // expensive operation?
- //}
- //return this.boundingRect;
+ if (this.boundingRect === null) {
+ return this.boundingRect = this.overlay.getBoundingClientRect() // expensive operation?
+ }
+ return this.boundingRect
}
getInternalViewportCoordinates({ x, y }: Point): Point {
@@ -85,17 +89,22 @@ export default abstract class BaseScreen {
const screenX = (x - overlayX) * scale;
const screenY = (y - overlayY) * scale;
- return { x: screenX, y: screenY };
+ return { x: Math.round(screenX), y: Math.round(screenY) };
+ }
+
+ getCurrentScroll(): Point {
+ const docEl = this.document?.documentElement
+ const x = docEl ? docEl.scrollLeft : 0
+ const y = docEl ? docEl.scrollTop : 0
+ return { x, y }
}
getInternalCoordinates(p: Point): Point {
const { x, y } = this.getInternalViewportCoordinates(p);
- const docEl = this.document?.documentElement
- const scrollX = docEl ? docEl.scrollLeft : 0
- const scrollY = docEl ? docEl.scrollTop : 0
+ const sc = this.getCurrentScroll()
- return { x: x+scrollX, y: y+scrollY };
+ return { x: x+sc.x, y: y+sc.y };
}
getElementFromInternalPoint({ x, y }: Point): Element | null {
diff --git a/frontend/app/player/MessageDistributor/StatedScreen/Screen/screen.css b/frontend/app/player/MessageDistributor/StatedScreen/Screen/screen.css
index b715986d2..696b38e7a 100644
--- a/frontend/app/player/MessageDistributor/StatedScreen/Screen/screen.css
+++ b/frontend/app/player/MessageDistributor/StatedScreen/Screen/screen.css
@@ -1,4 +1,5 @@
.screen {
+ user-select: none;
overflow: hidden;
position: absolute;
transform-origin: left top;
diff --git a/frontend/app/player/MessageDistributor/managers/AnnotationCanvas.ts b/frontend/app/player/MessageDistributor/managers/AnnotationCanvas.ts
new file mode 100644
index 000000000..26ea3e574
--- /dev/null
+++ b/frontend/app/player/MessageDistributor/managers/AnnotationCanvas.ts
@@ -0,0 +1,85 @@
+export default class AnnotationCanvas {
+ readonly canvas: HTMLCanvasElement
+ private ctx: CanvasRenderingContext2D | null = null
+ private painting: boolean = false
+ constructor() {
+ this.canvas = document.createElement('canvas')
+ Object.assign(this.canvas.style, {
+ position: "fixed",
+ cursor: "url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAAXNSR0IArs4c6QAAAWNJREFUOE+l1D1Lw1AUBuD35Catg5NzaCMRMilINnGok7sguLg4OlRcBTd/hqBVB0ed7KDgIPgXhJoaG10Kgk4a83EkhcYYktimd703z31zzuESSqwGIDs1bRvAIiRcWrZ9ETFUwhJ6XTsDsPH7Le1bz08H42JkGMa09+W2CVhKBmHC7jhYlOgUTPdUEa3Q86+SIDN/j4olf43BtJMFjoJl1AgMUJMUcRInZHT+w7KgYakGoDxVafmue0hBsJeLmaapvPffziFhraDjDMKWZdvHRaNRlCi2mUNHYl55dBwrDysFZWGloTQ2EZTEJoZiTFXVmaos34Ixn9e5qNgCaHR6vW7emcFozNVmN1ERbfb9myww3bVCTK9rPsDrpCh37HnXAC3Ek5lqf9ErM0im1zUG8BmGtCqq4mEIjppoeEESA5g/JIkaLMuv7AVHEgfNohqlU/7Fol3mPodiufvS7Yz7cP4ARjbPWyYPZSMAAAAASUVORK5CYII=') 0 20, crosshair",
+ left: 0,
+ top: 0,
+ //zIndex: 2147483647 - 2,
+ })
+ }
+
+ isPainting() {
+ return this.painting
+ }
+
+ private resizeCanvas = () => {
+ if (!this.canvas.parentElement) { return }
+ this.canvas.width = this.canvas.parentElement.offsetWidth
+ this.canvas.height = this.canvas.parentElement.offsetHeight
+ }
+
+ private lastPosition: [number, number] = [0,0]
+ start = (p: [number, number]) => {
+ this.painting = true
+ this.clrTmID && clearTimeout(this.clrTmID)
+ this.lastPosition = p
+ }
+
+ stop = () => {
+ if (!this.painting) { return }
+ this.painting = false
+ this.fadeOut()
+ }
+
+ move = (p: [number, number]) =>{
+ if (!this.ctx || !this.painting) { return }
+ this.ctx.globalAlpha = 1.0
+ this.ctx.beginPath()
+ this.ctx.moveTo(this.lastPosition[0], this.lastPosition[1])
+ this.ctx.lineTo(p[0], p[1])
+ this.ctx.lineWidth = 8
+ this.ctx.lineCap = "round"
+ this.ctx.lineJoin = "round"
+ this.ctx.strokeStyle = "red"
+ this.ctx.stroke()
+ this.lastPosition = p
+ }
+
+ clrTmID: ReturnType
| null = null
+ private fadeOut() {
+ let timeoutID: ReturnType
+ const fadeStep = () => {
+ if (!this.ctx || this.painting ) { return }
+ this.ctx.globalCompositeOperation = 'destination-out'
+ this.ctx.fillStyle = "rgba(255, 255, 255, 0.1)"
+ this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height)
+ this.ctx.globalCompositeOperation = 'source-over'
+ timeoutID = setTimeout(fadeStep,100)
+ }
+ this.clrTmID = setTimeout(() => {
+ clearTimeout(timeoutID)
+ this.ctx &&
+ this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height)
+ }, 3700)
+ fadeStep()
+ }
+
+ mount(parent: HTMLElement) {
+ parent.appendChild(this.canvas)
+ this.ctx = this.canvas.getContext("2d")
+ window.addEventListener("resize", this.resizeCanvas)
+ this.resizeCanvas()
+ }
+
+ remove() {
+ if (this.canvas.parentNode){
+ this.canvas.parentNode.removeChild(this.canvas)
+ }
+ window.removeEventListener("resize", this.resizeCanvas)
+ }
+}
\ No newline at end of file
diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
index 0b570fd87..b684919f9 100644
--- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
@@ -7,8 +7,8 @@ import store from 'App/store';
import type { LocalStream } from './LocalStream';
import { update, getState } from '../../store';
import { iceServerConfigFromString } from 'App/utils'
-
-import MStreamReader from '../messages/MStreamReader';;
+import AnnotationCanvas from './AnnotationCanvas';
+import MStreamReader from '../messages/MStreamReader';
import JSONRawMessageReader from '../messages/JSONRawMessageReader'
export enum CallingState {
@@ -136,12 +136,14 @@ export default class AssistManager {
//socket.onAny((...args) => console.log(...args))
socket.on("connect", () => {
waitingForMessages = true
- this.setStatus(ConnectionStatus.WaitingMessages)
+ this.setStatus(ConnectionStatus.WaitingMessages) // TODO: happens frequently on bad network
})
socket.on("disconnect", () => {
this.toggleRemoteControl(false)
+ update({ calling: CallingState.NoCall })
})
socket.on('messages', messages => {
+ //console.log(messages.filter(m => m._id === 41 || m._id === 44))
showDisconnectTimeout && clearTimeout(showDisconnectTimeout);
jmr.append(messages) // as RawMessage[]
@@ -173,14 +175,15 @@ export default class AssistManager {
this.setStatus(ConnectionStatus.Disconnected)
}, 30000)
- if (getState().remoteControl === RemoteControlStatus.Requesting ||
- getState().remoteControl === RemoteControlStatus.Enabled) {
- this.toggleRemoteControl(false)
+ if (getState().remoteControl === RemoteControlStatus.Requesting) {
+ this.toggleRemoteControl(false) // else its remaining
}
// Call State
if (getState().calling === CallingState.OnCall) {
update({ calling: CallingState.Reconnecting })
+ } else if (getState().calling === CallingState.Requesting){
+ update({ calling: CallingState.NoCall })
}
})
socket.on('error', e => {
@@ -200,7 +203,7 @@ export default class AssistManager {
private onMouseMove = (e: MouseEvent): void => {
if (!this.socket) { return }
const data = this.md.getInternalCoordinates(e)
- this.socket.emit("move", [ Math.round(data.x), Math.round(data.y) ])
+ this.socket.emit("move", [ data.x, data.y ])
}
private onWheel = (e: WheelEvent): void => {
@@ -213,15 +216,23 @@ export default class AssistManager {
private onMouseClick = (e: MouseEvent): void => {
if (!this.socket) { return; }
- const data = this.md.getInternalViewportCoordinates(e);
+ const data = this.md.getInternalViewportCoordinates(e)
// const el = this.md.getElementFromPoint(e); // requires requestiong node_id from domManager
const el = this.md.getElementFromInternalPoint(data)
if (el instanceof HTMLElement) {
el.focus()
- el.oninput = e => e.preventDefault();
- el.onkeydown = e => e.preventDefault();
+ el.oninput = e => {
+ if (el instanceof HTMLTextAreaElement
+ || el instanceof HTMLInputElement
+ ) {
+ this.socket && this.socket.emit("input", el.value)
+ } else if (el.isContentEditable) {
+ this.socket && this.socket.emit("input", el.innerText)
+ }
+ }
+ //el.onkeydown = e => e.preventDefault()
}
- this.socket.emit("click", [ Math.round(data.x), Math.round(data.y) ]);
+ this.socket.emit("click", [ data.x, data.y ]);
}
private toggleRemoteControl(newState: boolean){
@@ -310,6 +321,8 @@ export default class AssistManager {
this.callConnection && this.callConnection.close()
update({ calling: CallingState.NoCall })
this.callArgs = null
+ this.annot?.remove()
+ this.annot = null
}
private initiateCallEnd = () => {
@@ -355,6 +368,8 @@ export default class AssistManager {
}
}
+ private annot: AnnotationCanvas | null = null
+
private _call() {
if (![CallingState.NoCall, CallingState.Reconnecting].includes(getState().calling)) { return }
update({ calling: CallingState.Connecting })
@@ -379,6 +394,34 @@ export default class AssistManager {
call.on('stream', stream => {
update({ calling: CallingState.OnCall })
this.callArgs && this.callArgs.onStream(stream)
+
+ if (!this.annot) {
+ const annot = this.annot = new AnnotationCanvas()
+ annot.mount(this.md.overlay)
+ annot.canvas.addEventListener("mousedown", e => {
+ if (!this.socket) { return }
+ const data = this.md.getInternalViewportCoordinates(e)
+ annot.start([ data.x, data.y ])
+ this.socket.emit("startAnnotation", [ data.x, data.y ])
+ })
+ annot.canvas.addEventListener("mouseleave", () => {
+ if (!this.socket) { return }
+ annot.stop()
+ this.socket.emit("stopAnnotation")
+ })
+ annot.canvas.addEventListener("mouseup", () => {
+ if (!this.socket) { return }
+ annot.stop()
+ this.socket.emit("stopAnnotation")
+ })
+ annot.canvas.addEventListener("mousemove", e => {
+ if (!this.socket || !annot.isPainting()) { return }
+
+ const data = this.md.getInternalViewportCoordinates(e)
+ annot.move([ data.x, data.y ])
+ this.socket.emit("moveAnnotation", [ data.x, data.y ])
+ })
+ }
});
//call.peerConnection.addEventListener("track", e => console.log('newtrack',e.track))
@@ -409,6 +452,10 @@ export default class AssistManager {
this.socket.close()
document.removeEventListener('visibilitychange', this.onVisChange)
}
+ if (this.annot) {
+ this.annot.remove()
+ this.annot = null
+ }
}
}
diff --git a/frontend/app/player/MessageDistributor/managers/DOMManager.ts b/frontend/app/player/MessageDistributor/managers/DOMManager.ts
index 7c40a4668..685a34f2c 100644
--- a/frontend/app/player/MessageDistributor/managers/DOMManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/DOMManager.ts
@@ -113,8 +113,15 @@ export default class DOMManager extends ListWalker {
logger.error("Node has no childNodes", this.nl[ parentID ]);
return;
}
+
+ if (this.nl[ id ] instanceof HTMLHtmlElement) {
+ // What if some exotic cases?
+ this.nl[ parentID ].replaceChild(this.nl[ id ], childNodes[childNodes.length-1])
+ return
+ }
+
this.nl[ parentID ]
- .insertBefore(this.nl[ id ], childNodes[ index ]);
+ .insertBefore(this.nl[ id ], childNodes[ index ])
}
private applyMessage = (msg: Message): void => {
@@ -257,14 +264,14 @@ export default class DOMManager extends ListWalker {
case "create_i_frame_document":
node = this.nl[ msg.frameID ];
// console.log('ifr', msg, node)
-
+
if (node instanceof HTMLIFrameElement) {
doc = node.contentDocument;
if (!doc) {
logger.warn("No iframe doc", msg, node, node.contentDocument);
return;
}
- this.nl[ msg.id ] = doc.documentElement
+ this.nl[ msg.id ] = doc
return;
} else if (node instanceof Element) { // shadow DOM
try {
diff --git a/frontend/env.js b/frontend/env.js
index a76295cf1..8c5294fd8 100644
--- a/frontend/env.js
+++ b/frontend/env.js
@@ -13,7 +13,7 @@ const oss = {
ORIGIN: () => 'window.location.origin',
API_EDP: () => 'window.location.origin + "/api"',
ASSETS_HOST: () => 'window.location.origin + "/assets"',
- VERSION: '1.5.3',
+ VERSION: '1.5.4',
SOURCEMAP: true,
MINIO_ENDPOINT: process.env.MINIO_ENDPOINT,
MINIO_PORT: process.env.MINIO_PORT,
@@ -21,7 +21,7 @@ const oss = {
MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
ICE_SERVERS: process.env.ICE_SERVERS,
- TRACKER_VERSION: '3.5.3' // trackerInfo.version,
+ TRACKER_VERSION: '3.5.4' // trackerInfo.version,
}
module.exports = {
diff --git a/scripts/helm/db/init_dbs/postgresql/1.5.4/1.5.4.sql b/scripts/helm/db/init_dbs/postgresql/1.5.4/1.5.4.sql
new file mode 100644
index 000000000..e7be94997
--- /dev/null
+++ b/scripts/helm/db/init_dbs/postgresql/1.5.4/1.5.4.sql
@@ -0,0 +1,91 @@
+\set ON_ERROR_STOP true
+SET client_min_messages TO NOTICE;
+BEGIN;
+CREATE OR REPLACE FUNCTION openreplay_version()
+ RETURNS text AS
+$$
+SELECT 'v1.5.4'
+$$ LANGUAGE sql IMMUTABLE;
+
+
+-- to detect duplicate users and delete them if possible
+DO
+$$
+ DECLARE
+ duplicate RECORD;
+ BEGIN
+ IF EXISTS(SELECT user_id
+ FROM users
+ WHERE lower(email) =
+ (SELECT LOWER(email)
+ FROM users AS su
+ WHERE LOWER(su.email) = LOWER(users.email)
+ AND su.user_id != users.user_id
+ LIMIT 1)
+ ORDER BY LOWER(email)) THEN
+ raise notice 'duplicate users detected';
+ FOR duplicate IN SELECT user_id, email, deleted_at, jwt_iat
+ FROM users
+ WHERE lower(email) =
+ (SELECT LOWER(email)
+ FROM users AS su
+ WHERE LOWER(su.email) = LOWER(users.email)
+ AND su.user_id != users.user_id
+ LIMIT 1)
+ ORDER BY LOWER(email)
+ LOOP
+ IF duplicate.deleted_at IS NOT NULL OR duplicate.jwt_iat IS NULL THEN
+ raise notice 'deleting duplicate user: % %',duplicate.user_id,duplicate.email;
+ DELETE FROM users WHERE user_id = duplicate.user_id;
+ END IF;
+ END LOOP;
+ IF EXISTS(SELECT user_id
+ FROM users
+ WHERE lower(email) =
+ (SELECT LOWER(email)
+ FROM users AS su
+ WHERE LOWER(su.email) = LOWER(users.email)
+ AND su.user_id != users.user_id
+ LIMIT 1)
+ ORDER BY LOWER(email)) THEN
+ raise notice 'remaining duplicates, please fix (delete) before finishing update';
+ FOR duplicate IN SELECT user_id, email
+ FROM users
+ WHERE lower(email) =
+ (SELECT LOWER(email)
+ FROM users AS su
+ WHERE LOWER(su.email) = LOWER(users.email)
+ AND su.user_id != users.user_id
+ LIMIT 1)
+ ORDER BY LOWER(email)
+ LOOP
+ raise notice 'user: % %',duplicate.user_id,duplicate.email;
+ END LOOP;
+ RAISE 'Duplicate users' USING ERRCODE = '42710';
+ END IF;
+ END IF;
+ END;
+$$
+LANGUAGE plpgsql;
+
+UPDATE users
+SET email=LOWER(email);
+
+DROP INDEX IF EXISTS autocomplete_value_gin_idx;
+COMMIT;
+
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_clickonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CLICK';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_customonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CUSTOM';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_graphqlonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'GRAPHQL';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_inputonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'INPUT';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_locationonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'LOCATION';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_referreronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REFERRER';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_requestonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REQUEST';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_revidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REVID';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_stateactiononly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'STATEACTION';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_useranonymousidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERANONYMOUSID';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_userbrowseronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERBROWSER';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_usercountryonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERCOUNTRY';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_userdeviceonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERDEVICE';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_useridonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERID';
+CREATE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_value_userosonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USEROS';
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index f1d141861..834a79968 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -6,7 +6,7 @@ CREATE SCHEMA IF NOT EXISTS events;
CREATE OR REPLACE FUNCTION openreplay_version()
RETURNS text AS
$$
-SELECT 'v1.5.3'
+SELECT 'v1.5.4'
$$ LANGUAGE sql IMMUTABLE;
-- --- accounts.sql ---
@@ -898,7 +898,23 @@ $$
CREATE unique index autocomplete_unique ON autocomplete (project_id, value, type);
CREATE index autocomplete_project_id_idx ON autocomplete (project_id);
CREATE INDEX autocomplete_type_idx ON public.autocomplete (type);
- CREATE INDEX autocomplete_value_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops);
+
+ CREATE INDEX autocomplete_value_clickonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CLICK';
+ CREATE INDEX autocomplete_value_customonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'CUSTOM';
+ CREATE INDEX autocomplete_value_graphqlonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'GRAPHQL';
+ CREATE INDEX autocomplete_value_inputonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'INPUT';
+ CREATE INDEX autocomplete_value_locationonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'LOCATION';
+ CREATE INDEX autocomplete_value_referreronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REFERRER';
+ CREATE INDEX autocomplete_value_requestonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REQUEST';
+ CREATE INDEX autocomplete_value_revidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'REVID';
+ CREATE INDEX autocomplete_value_stateactiononly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'STATEACTION';
+ CREATE INDEX autocomplete_value_useranonymousidonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERANONYMOUSID';
+ CREATE INDEX autocomplete_value_userbrowseronly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERBROWSER';
+ CREATE INDEX autocomplete_value_usercountryonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERCOUNTRY';
+ CREATE INDEX autocomplete_value_userdeviceonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERDEVICE';
+ CREATE INDEX autocomplete_value_useridonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USERID';
+ CREATE INDEX autocomplete_value_userosonly_gin_idx ON public.autocomplete USING GIN (value gin_trgm_ops) WHERE type = 'USEROS';
+
CREATE TYPE job_status AS ENUM ('scheduled','running','cancelled','failed','completed');
CREATE TYPE job_action AS ENUM ('delete_user_data');
diff --git a/scripts/helmcharts/databases/Chart.yaml b/scripts/helmcharts/databases/Chart.yaml
index 0aa62594a..24472a68f 100644
--- a/scripts/helmcharts/databases/Chart.yaml
+++ b/scripts/helmcharts/databases/Chart.yaml
@@ -40,3 +40,7 @@ dependencies:
repository: file://charts/redis
version: 12.10.1
condition: redis.enabled
+ - name: minio
+ repository: file://charts/minio
+ version: 3.7.14
+ condition: minio.enabled
diff --git a/scripts/helmcharts/databases/values.yaml b/scripts/helmcharts/databases/values.yaml
index 6c7f28960..6b106e15a 100644
--- a/scripts/helmcharts/databases/values.yaml
+++ b/scripts/helmcharts/databases/values.yaml
@@ -99,6 +99,9 @@ redis:
cpu: 100m
memory: 128Mi
+minio:
+ enabled: true
+
postgresql:
# postgresqlPassword: asayerPostgres
fullnameOverride: postgresql
diff --git a/scripts/helmcharts/init.sh b/scripts/helmcharts/init.sh
index 6e4f70613..281e8586b 100644
--- a/scripts/helmcharts/init.sh
+++ b/scripts/helmcharts/init.sh
@@ -15,7 +15,7 @@ fatal()
exit 1
}
-version="v1.5.3"
+version="v1.5.4"
usr=`whoami`
# Installing k3s
diff --git a/scripts/helmcharts/openreplay/Chart.yaml b/scripts/helmcharts/openreplay/Chart.yaml
index f0b5ef469..be16d6344 100644
--- a/scripts/helmcharts/openreplay/Chart.yaml
+++ b/scripts/helmcharts/openreplay/Chart.yaml
@@ -22,4 +22,4 @@ version: 0.1.0
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
# Ref: https://github.com/helm/helm/issues/7858#issuecomment-608114589
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/alerts/Chart.yaml b/scripts/helmcharts/openreplay/charts/alerts/Chart.yaml
index b39fb2e99..866cf72c2 100644
--- a/scripts/helmcharts/openreplay/charts/alerts/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/alerts/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/assets/Chart.yaml b/scripts/helmcharts/openreplay/charts/assets/Chart.yaml
index b1be7b726..d72174f29 100644
--- a/scripts/helmcharts/openreplay/charts/assets/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/chalice/Chart.yaml b/scripts/helmcharts/openreplay/charts/chalice/Chart.yaml
index 755fb8648..9f09c00db 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/db/Chart.yaml b/scripts/helmcharts/openreplay/charts/db/Chart.yaml
index 796e1ef76..8b775b934 100644
--- a/scripts/helmcharts/openreplay/charts/db/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/db/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/ender/Chart.yaml b/scripts/helmcharts/openreplay/charts/ender/Chart.yaml
index 571ef34c0..cd206be2a 100644
--- a/scripts/helmcharts/openreplay/charts/ender/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/ender/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/http/Chart.yaml b/scripts/helmcharts/openreplay/charts/http/Chart.yaml
index 166b3e22d..729ef006f 100644
--- a/scripts/helmcharts/openreplay/charts/http/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/integrations/Chart.yaml b/scripts/helmcharts/openreplay/charts/integrations/Chart.yaml
index 710f7ffe5..e0ecdb66b 100644
--- a/scripts/helmcharts/openreplay/charts/integrations/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/integrations/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/nginx-ingress/Chart.yaml b/scripts/helmcharts/openreplay/charts/nginx-ingress/Chart.yaml
index b0baf2637..8aa1dcf82 100644
--- a/scripts/helmcharts/openreplay/charts/nginx-ingress/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/nginx-ingress/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml b/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml
index 6780c9ee6..6322318e3 100644
--- a/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml
+++ b/scripts/helmcharts/openreplay/charts/nginx-ingress/templates/configMap.yaml
@@ -82,7 +82,7 @@ data:
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $origin_forwarded_ip;
proxy_set_header X-Real-IP $origin_forwarded_ip;
- proxy_pass http://utilities-pool;
+ proxy_pass http://utilities-openreplay.app.svc.cluster.local:9001;
}
location /assets/ {
rewrite ^/assets/(.*) /sessions-assets/$1 break;
diff --git a/scripts/helmcharts/openreplay/charts/sink/Chart.yaml b/scripts/helmcharts/openreplay/charts/sink/Chart.yaml
index fea7646a4..83bcac763 100644
--- a/scripts/helmcharts/openreplay/charts/sink/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/storage/Chart.yaml b/scripts/helmcharts/openreplay/charts/storage/Chart.yaml
index 879a077c6..cc572ffe1 100644
--- a/scripts/helmcharts/openreplay/charts/storage/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/utilities/Chart.yaml b/scripts/helmcharts/openreplay/charts/utilities/Chart.yaml
index e432835d0..203871558 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/Chart.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-AppVersion: "v1.5.3"
+AppVersion: "v1.5.4"
diff --git a/scripts/helmcharts/openreplay/charts/utilities/values.yaml b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
index 87b3d771d..8265b5aa5 100644
--- a/scripts/helmcharts/openreplay/charts/utilities/values.yaml
+++ b/scripts/helmcharts/openreplay/charts/utilities/values.yaml
@@ -83,6 +83,9 @@ autoscaling:
env:
REDIS_URL: "redis://redis-master.db.svc.cluster.local:6379"
+ debug: 0
+ uws: false
+ redis: false
nodeSelector: {}
diff --git a/scripts/helmcharts/openreplay/files/minio.sh b/scripts/helmcharts/openreplay/files/minio.sh
index 1cc3e0460..903168b1b 100644
--- a/scripts/helmcharts/openreplay/files/minio.sh
+++ b/scripts/helmcharts/openreplay/files/minio.sh
@@ -12,9 +12,7 @@ mc alias set minio http://minio.db.svc.cluster.local:9000 $MINIO_ACCESS_KEY $MIN
function init() {
echo "Initializing minio"
-for bucket in ${buckets[*]}; do
-mc mb minio/${bucket} || true
-mc ilm import minio/${bucket} < /tmp/lifecycle.json
{
"Rules": [
{
@@ -27,13 +25,17 @@ mc ilm import minio/${bucket} <&1
done
}
function init() {
echo "Initializing postgresql"
- psql -f ${pgdir}/init_schema.sql
+ psql -f ${pgdir}/init_schema.sql 2>&1
}
# /bin/bash postgresql.sh migrate $migration_versions
diff --git a/scripts/helmcharts/openreplay/templates/NOTES.txt b/scripts/helmcharts/openreplay/templates/NOTES.txt
index 6881933f1..1479a07c3 100644
--- a/scripts/helmcharts/openreplay/templates/NOTES.txt
+++ b/scripts/helmcharts/openreplay/templates/NOTES.txt
@@ -1,22 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
- {{- range .paths }}
- http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
- {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "openreplay.fullname" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "openreplay.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "openreplay.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
- echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "openreplay.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}
+OpenReplay Installation is complete. Follow along with the SSL configuration from [doc](https://docs.openreplay.com/deployment/deploy-aws#configuretls/ssl).
diff --git a/scripts/helmcharts/vars.yaml b/scripts/helmcharts/vars.yaml
index 25d6a67d6..24ea9344d 100644
--- a/scripts/helmcharts/vars.yaml
+++ b/scripts/helmcharts/vars.yaml
@@ -1,4 +1,4 @@
-fromVersion: "v1.5.3"
+fromVersion: "v1.5.4"
# Databases specific variables
postgresql: &postgres
# For generating passwords
@@ -95,13 +95,6 @@ chalice:
# idp_name: ''
# idp_tenantKey: ''
-utilities:
- replicaCount: 1
- env:
- debug: 0
- uws: false
- cluster: false
-
# If you want to override something
# chartname:
# filedFrom chart/Values.yaml:
diff --git a/tracker/tracker-assist/layout/index.html b/tracker/tracker-assist/layout/index.html
index bc323b16c..e541fc1e3 100644
--- a/tracker/tracker-assist/layout/index.html
+++ b/tracker/tracker-assist/layout/index.html
@@ -9,8 +9,15 @@
-
+
+
+
The agent is requesting remote control
+
+
+
+
+
+
Answer the call so the agent can assist.
+
+
+
+
+