@@ -214,30 +191,7 @@ exports[`TicketRouterForm updates should save changes 1`] = `
-
diff --git a/src/components/flow/routers/ticket/helpers.ts b/src/components/flow/routers/ticket/helpers.ts
index 0332cfa62..cbff66fb6 100644
--- a/src/components/flow/routers/ticket/helpers.ts
+++ b/src/components/flow/routers/ticket/helpers.ts
@@ -7,8 +7,23 @@ import { NodeEditorSettings, FormEntry } from 'store/nodeEditor';
import { createUUID } from 'utils';
import { TicketRouterFormState } from 'components/flow/routers/ticket/TicketRouterForm';
-export const nodeToState = (settings: NodeEditorSettings): TicketRouterFormState => {
- let ticketer: FormEntry = { value: null };
+export const getOriginalAction = (settings: NodeEditorSettings): OpenTicket => {
+ const action =
+ settings.originalAction ||
+ (settings.originalNode.node.actions.length > 0 && settings.originalNode.node.actions[0]);
+
+ if (action.type === Types.open_ticket) {
+ return action as OpenTicket;
+ }
+};
+
+export const nodeToState = (
+ settings: NodeEditorSettings,
+ initialTicketer: any
+): TicketRouterFormState => {
+ let ticketer: FormEntry = initialTicketer
+ ? { value: { uuid: initialTicketer.id, name: initialTicketer.name } }
+ : { value: null };
let subject = { value: '@run.flow.name' };
let body = { value: '@results' };
let resultName = { value: 'Result' };
@@ -56,13 +71,3 @@ export const stateToNode = (
return createWebhookBasedNode(newAction, settings.originalNode, true);
};
-
-export const getOriginalAction = (settings: NodeEditorSettings): OpenTicket => {
- const action =
- settings.originalAction ||
- (settings.originalNode.node.actions.length > 0 && settings.originalNode.node.actions[0]);
-
- if (action.type === Types.open_ticket) {
- return action as OpenTicket;
- }
-};
diff --git a/src/components/mediaplayer/MediaPlayer.module.scss b/src/components/mediaplayer/MediaPlayer.module.scss
index 76e6c66af..f4c16b03e 100644
--- a/src/components/mediaplayer/MediaPlayer.module.scss
+++ b/src/components/mediaplayer/MediaPlayer.module.scss
@@ -3,6 +3,7 @@
line-height: 1em !important;
letter-spacing: 1em !important;
cursor: pointer;
+ display: flex;
&.playing {
.circle_progress {
@@ -36,11 +37,10 @@
&:hover {
color: cornflowerblue;
}
-
- position: relative;
- font-size: 10px;
+ align-self: center;
+ position: absolute;
+ margin-left: -1px;
+ font-size: 12px;
color: #aaa;
- top: -16px;
- left: 0px;
}
}
diff --git a/src/components/mediaplayer/MediaPlayer.tsx b/src/components/mediaplayer/MediaPlayer.tsx
index 7e9db3621..1f84df9e8 100644
--- a/src/components/mediaplayer/MediaPlayer.tsx
+++ b/src/components/mediaplayer/MediaPlayer.tsx
@@ -50,11 +50,13 @@ export class MediaPlayer extends React.Component
0 ? Math.floor((currentTime / duration) * 100) : 0;
+
return {
- currentSeconds: this.ele.ended ? 0 : currentTime,
+ currentSeconds: this.ele.ended || progress === 100 ? 0 : currentTime,
durationSeconds: duration,
- playing: currentTime > 0,
- progress: duration > 0 ? Math.floor((currentTime / duration) * 100) : 0
+ playing: currentTime > 0 && !this.ele.ended,
+ progress: progress
};
});
}
@@ -66,17 +68,18 @@ export class MediaPlayer extends React.Component): void {
+ if (e !== null) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+
if (this.state.playing) {
this.ele.pause();
this.ele.currentTime = 0;
} else {
+ this.ele.load();
this.ele.play();
}
-
- if (e !== null) {
- e.preventDefault();
- e.stopPropagation();
- }
}
private handleRef(ref: HTMLAudioElement): any {
@@ -102,9 +105,18 @@ export class MediaPlayer extends React.Component {
+ e.preventDefault();
+ e.stopPropagation();
+ }}
onMouseDown={this.handleTogglePlay}
>
-
+