From d8fb7943622d86c0c6aa6e6736f8d8e4a53323c1 Mon Sep 17 00:00:00 2001
From: Marc Fallows <marc@canva.com>
Date: Fri, 23 Jun 2017 13:37:02 +1000
Subject: [PATCH] Use uuid for action IDs instead of Math.random (fixes #1109)

---
 addons/actions/package.json        |  3 ++-
 addons/actions/src/preview.js      |  5 +++--
 addons/actions/src/preview.test.js | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 addons/actions/src/preview.test.js

diff --git a/addons/actions/package.json b/addons/actions/package.json
index f01a34fe71d6..36fe1213090f 100644
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@@ -25,7 +25,8 @@
     "deep-equal": "^1.0.1",
     "json-stringify-safe": "^5.0.1",
     "prop-types": "^15.5.8",
-    "react-inspector": "^2.0.0"
+    "react-inspector": "^2.0.0",
+    "uuid": "^3.1.0"
   },
   "devDependencies": {
     "react": "^15.5.4",
diff --git a/addons/actions/src/preview.js b/addons/actions/src/preview.js
index 0e8a0a85d7d2..7eece2d95cb7 100644
--- a/addons/actions/src/preview.js
+++ b/addons/actions/src/preview.js
@@ -2,6 +2,7 @@
 
 import addons from '@storybook/addons';
 import stringify from 'json-stringify-safe';
+import uuid from 'uuid/v1';
 import { EVENT_ID } from './';
 
 function _format(arg) {
@@ -16,9 +17,9 @@ export function action(name) {
   const handler = function(..._args) {
     const args = Array.from(_args).map(_format);
     const channel = addons.getChannel();
-    const randomId = Math.random().toString(16).slice(2);
+    const id = uuid();
     channel.emit(EVENT_ID, {
-      id: randomId,
+      id,
       data: { name, args },
     });
   };
diff --git a/addons/actions/src/preview.test.js b/addons/actions/src/preview.test.js
new file mode 100644
index 000000000000..be8154c2971a
--- /dev/null
+++ b/addons/actions/src/preview.test.js
@@ -0,0 +1,27 @@
+import addons from '@storybook/addons';
+import uuid from 'uuid/v1';
+import { action } from './preview';
+
+jest.mock('uuid/v1');
+jest.mock('@storybook/addons');
+
+describe('preview', () => {
+  describe('action()', () => {
+    it('should use a uuid for action ids', () => {
+      const channel = { emit: jest.fn() };
+      const uuidGenerator = (function*() {
+        yield '42';
+        yield '24';
+      })();
+      uuid.mockImplementation(() => uuidGenerator.next().value);
+      addons.getChannel.mockReturnValue(channel);
+      const fn = action('foo');
+
+      fn();
+      fn();
+      expect(channel.emit).toHaveBeenCalledTimes(2);
+      expect(channel.emit.mock.calls[0][1].id).toBe('42');
+      expect(channel.emit.mock.calls[1][1].id).toBe('24');
+    });
+  });
+});