@oracle/oraclejet-webdriver 17.0.6 → 17.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,6 +5,8 @@ const OjFilePickerBase_1 = require("./OjFilePickerBase");
5
5
  const fs = require("fs");
6
6
  const path = require("path");
7
7
  const busy_context_utils_1 = require("../../lib/busy-context-utils");
8
+ const filestoreName = '__oj_filepicker_files';
9
+ const filenamePrefix = 'file_';
8
10
  /**
9
11
  * The component WebElement for [oj-file-picker](../../jsdocs/oj.ojFilePicker.html).
10
12
  * Do not instantiate this class directly, instead, use
@@ -70,28 +72,36 @@ class OjFilePicker extends OjFilePickerBase_1.OjFilePickerBase {
70
72
  fileNumber: i
71
73
  };
72
74
  await driver.executeScript(`const file = arguments[0];
75
+ const filestoreName = arguments[1];
76
+ const filenamePrefix = arguments[2];
77
+ const filestore = window[filestoreName] = window[filestoreName] || {};
73
78
  const chunkNumber = file.chunkNumber;
74
- var data = {
79
+ const data = {
75
80
  bytes: file.bytes,
76
81
  path: file.path,
77
82
  type: file.type
78
83
  }
84
+ const fileKey = filenamePrefix + file.fileNumber;
79
85
  if (chunkNumber == 0) {
80
- window['_file' + file.fileNumber] = [data];
86
+ filestore[fileKey] = [data];
81
87
  } else {
82
- window['_file' + file.fileNumber].push(data);
83
- }`, file);
88
+ filestore[fileKey].push(data);
89
+ }`, file, filestoreName, filenamePrefix);
84
90
  }
85
91
  }
86
92
  driver.executeScript(`const numFiles = arguments[0];
93
+ const filestoreName = arguments[1];
94
+ const filenamePrefix = arguments[2];
95
+ const filestore = window[filestoreName];
87
96
  const list = [];
88
97
  for ( let i = 0; i < numFiles; i++) {
89
- const file = window['_file' + i];
90
- delete window['_file' + i];
98
+ const fileKey = filenamePrefix + i;
99
+ const chunks = filestore[fileKey];
100
+ delete filestore[fileKey];
91
101
  list.push({
92
- bytes: file.map(chunk => chunk.bytes).join(''),
93
- path: file[0].path,
94
- type: file[0].type
102
+ bytes: chunks.reduce((acc, chunk) => acc.concat(chunk.bytes), []),
103
+ path: chunks[0].path,
104
+ type: chunks[0].type
95
105
  });
96
106
  }
97
107
  const fileList = list.map((data) => {
@@ -110,7 +120,7 @@ class OjFilePicker extends OjFilePickerBase_1.OjFilePickerBase {
110
120
  }
111
121
  }
112
122
  HTMLInputElement.prototype._pickerTestData = fileList;
113
- `, dataList.length);
123
+ `, dataList.length, filestoreName, filenamePrefix);
114
124
  }
115
125
  }
116
126
  exports.OjFilePicker = OjFilePicker;
@@ -1 +1 @@
1
- {"version":3,"file":"OjFilePicker.js","sourceRoot":"","sources":["../../../elements/oj-file-picker/OjFilePicker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OjFilePicker.js","sourceRoot":"","sources":["../../../elements/oj-file-picker/OjFilePicker.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,9 @@ import * as fs from 'fs';
3
3
  import * as path from 'path';
4
4
  import { whenBusyContextReady } from '../../lib/busy-context-utils';
5
5
  import { WebDriver } from 'selenium-webdriver';
6
+
7
+ const filestoreName = '__oj_filepicker_files';
8
+ const filenamePrefix = 'file_';
6
9
  /**
7
10
  * The component WebElement for [oj-file-picker](../../jsdocs/oj.ojFilePicker.html).
8
11
  * Do not instantiate this class directly, instead, use
@@ -73,32 +76,42 @@ export class OjFilePicker extends OjFilePickerBase {
73
76
  };
74
77
  await driver.executeScript(
75
78
  `const file = arguments[0];
79
+ const filestoreName = arguments[1];
80
+ const filenamePrefix = arguments[2];
81
+ const filestore = window[filestoreName] = window[filestoreName] || {};
76
82
  const chunkNumber = file.chunkNumber;
77
- var data = {
83
+ const data = {
78
84
  bytes: file.bytes,
79
85
  path: file.path,
80
86
  type: file.type
81
87
  }
88
+ const fileKey = filenamePrefix + file.fileNumber;
82
89
  if (chunkNumber == 0) {
83
- window['_file' + file.fileNumber] = [data];
90
+ filestore[fileKey] = [data];
84
91
  } else {
85
- window['_file' + file.fileNumber].push(data);
92
+ filestore[fileKey].push(data);
86
93
  }`,
87
- file
94
+ file,
95
+ filestoreName,
96
+ filenamePrefix
88
97
  );
89
98
  }
90
99
  }
91
100
 
92
101
  driver.executeScript(
93
102
  `const numFiles = arguments[0];
103
+ const filestoreName = arguments[1];
104
+ const filenamePrefix = arguments[2];
105
+ const filestore = window[filestoreName];
94
106
  const list = [];
95
107
  for ( let i = 0; i < numFiles; i++) {
96
- const file = window['_file' + i];
97
- delete window['_file' + i];
108
+ const fileKey = filenamePrefix + i;
109
+ const chunks = filestore[fileKey];
110
+ delete filestore[fileKey];
98
111
  list.push({
99
- bytes: file.map(chunk => chunk.bytes).join(''),
100
- path: file[0].path,
101
- type: file[0].type
112
+ bytes: chunks.reduce((acc, chunk) => acc.concat(chunk.bytes), []),
113
+ path: chunks[0].path,
114
+ type: chunks[0].type
102
115
  });
103
116
  }
104
117
  const fileList = list.map((data) => {
@@ -118,7 +131,9 @@ export class OjFilePicker extends OjFilePickerBase {
118
131
  }
119
132
  HTMLInputElement.prototype._pickerTestData = fileList;
120
133
  `,
121
- dataList.length
134
+ dataList.length,
135
+ filestoreName,
136
+ filenamePrefix
122
137
  );
123
138
  }
124
139
  }
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@oracle/oraclejet-webdriver",
3
3
  "description": "Oracle JET WebDriverJS WebElements",
4
4
  "config": {
5
- "revision": "2024-11-08_07-56-36"
5
+ "revision": "2024-12-04_17-38-59"
6
6
  },
7
7
  "scripts": {
8
8
  "clean": "rimraf built dist dist.failed test/built test_results",
@@ -17,7 +17,7 @@
17
17
  "test": "jest -c test/jest.config.js"
18
18
  },
19
19
  "dependencies": {
20
- "@oracle/oraclejet": "17.0.6"
20
+ "@oracle/oraclejet": "17.0.7"
21
21
  },
22
22
  "devDependencies": {
23
23
  "@oracle/oraclejet-internal-ws-build": "workspace:^",
@@ -50,5 +50,5 @@
50
50
  "@types/selenium-webdriver": ">=3.6.0",
51
51
  "selenium-webdriver": ">=3.6.0"
52
52
  },
53
- "version": "17.0.6"
53
+ "version": "17.0.7"
54
54
  }