Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace CFS #3782

Merged
merged 25 commits into from Mar 9, 2018
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4be65a9
feat(media): Replace CFS
aldeed Feb 16, 2018
f129e5c
fix: Product grid image fixes
aldeed Feb 23, 2018
9988ac0
fix(files): FileRecord clone renamed to fullClone
aldeed Feb 23, 2018
06d542c
fix: Fix file cloning
aldeed Feb 23, 2018
5596d22
tests: Try fixing some test failures related to Media
aldeed Feb 23, 2018
9ab25ae
fix: Media bugs when admin
aldeed Feb 23, 2018
45bbf29
fix: Issues with image display for admins
aldeed Feb 23, 2018
c9b6eb8
feat: Add migration to drop unused file-related collections
aldeed Feb 23, 2018
5d8d71c
fix: transformWrite works
aldeed Feb 23, 2018
5c11224
fix: Bump file-collections to not swallow transform errors
aldeed Feb 23, 2018
3a02eba
fix: Ignore dropCollection errors in Media migration
aldeed Feb 25, 2018
f0ba27c
(fix): Pass media in separate props to productGridItems
spencern Feb 26, 2018
a8ff697
(fix): Return empty cursor with this.ready() instead of []
spencern Feb 26, 2018
573f88f
fix: pass product id into getTopVariants in product settings actionView
spencern Feb 27, 2018
1b014cb
fix: use correct file download endpoint on server
spencern Feb 28, 2018
71f6aba
update .snyk file
spencern Mar 6, 2018
cea1a9d
Merge branch 'release-1.9.0' into feat-1221-aldeed-npm-cfs
aldeed Mar 8, 2018
e0a6e8a
fix: Make MediaGallery drag reorg work
aldeed Mar 8, 2018
4a6044c
Merge branch 'release-1.9.0' into feat-1221-aldeed-npm-cfs
aldeed Mar 8, 2018
683e9ed
fix: Images appear in search w/o errors now
aldeed Mar 9, 2018
5637686
feat: Move MediaUploader to components
aldeed Mar 9, 2018
677593d
fix: Brand media grid looks and works better now
aldeed Mar 9, 2018
1baecd8
fix: call direct media record update when resolving revisions
spencern Mar 9, 2018
3d1d137
Merge branch 'release-1.9.0' into feat-1221-aldeed-npm-cfs
aldeed Mar 9, 2018
6d67476
Merge branch 'release-1.9.0' into feat-1221-aldeed-npm-cfs
spencern Mar 9, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions .meteor/packages
Expand Up @@ -14,7 +14,7 @@ es5-shim@4.7.0 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.10.0 # Enable ECMAScript2015+ syntax in app code
audit-argument-checks@1.0.7 # ensure meteor method argument validation
browser-policy@1.1.0 # security-related policies enforced by newer browsers
juliancwirko:postcss # CSS post-processing plugin (replaces standard-minifier-css)
juliancwirko:postcss@1.3.0 # CSS post-processing plugin (replaces standard-minifier-css)
session@1.1.7 # ReactiveDict whose contents are preserved across Hot Code Push
tracker@1.1.3 # Meteor transparent reactive programming library
mongo@1.4.2
Expand Down Expand Up @@ -53,18 +53,11 @@ aldeed:collection2
aldeed:schema-index
aldeed:template-extension
bozhao:accounts-instagram
cfs:filesystem
cfs:graphicsmagick
cfs:gridfs
cfs:standard-packages
cfs:storage-adapter
cfs:ui
dispatch:run-as-user
matb33:collection-hooks
meteorhacks:ssr
meteorhacks:subs-manager
ongoworks:security
raix:ui-dropped-event
tmeasday:publish-counts
percolate:migrations
gadicc:blaze-react-component
Expand Down
52 changes: 15 additions & 37 deletions .meteor/versions
Expand Up @@ -16,8 +16,8 @@ allow-deny@1.1.0
audit-argument-checks@1.0.7
autoupdate@1.4.0
babel-compiler@7.0.4
babel-runtime@1.2.2
base64@1.0.11
babel-runtime@1.2.0
base64@1.0.10
binary-heap@1.0.10
blaze@2.3.2
blaze-html-templates@1.1.2
Expand All @@ -28,29 +28,9 @@ browser-policy@1.1.0
browser-policy-common@1.0.11
browser-policy-content@1.1.0
browser-policy-framing@1.1.0
caching-compiler@1.1.11
caching-compiler@1.1.9
caching-html-compiler@1.1.2
callback-hook@1.1.0
cfs:access-point@0.1.49
cfs:base-package@0.0.30
cfs:collection@0.5.5
cfs:collection-filters@0.2.4
cfs:data-man@0.0.6
cfs:file@0.1.17
cfs:filesystem@0.1.2
cfs:graphicsmagick@0.0.18
cfs:gridfs@0.0.34
cfs:http-methods@0.0.32
cfs:http-publish@0.0.13
cfs:power-queue@0.9.11
cfs:reactive-list@0.0.9
cfs:reactive-property@0.0.4
cfs:standard-packages@0.5.10
cfs:storage-adapter@0.2.4
cfs:tempstore@0.1.6
cfs:ui@0.1.3
cfs:upload-http@0.0.20
cfs:worker@0.1.5
check@1.3.0
coffeescript@1.0.17
dburles:factory@1.1.0
Expand All @@ -65,11 +45,11 @@ dispatch:run-as-user@1.1.1
dynamic-import@0.3.0
ecmascript@0.10.4
ecmascript-runtime@0.5.0
ecmascript-runtime-client@0.6.2
ecmascript-runtime-client@0.6.0
ecmascript-runtime-server@0.5.0
ejson@1.1.0
email@1.2.3
es5-shim@4.7.3
es5-shim@4.7.0
facebook-config-ui@1.0.1
facebook-oauth@1.4.0
gadicc:blaze-react-component@1.4.0
Expand All @@ -83,9 +63,9 @@ http@1.4.0
id-map@1.1.0
johanbrook:publication-collector@1.1.0
jquery@1.11.11
juliancwirko:postcss@1.2.0
juliancwirko:postcss@1.3.0
launch-screen@1.1.1
less@2.7.12
less@2.7.11
livedata@1.0.18
localstorage@1.2.0
logging@1.1.19
Expand All @@ -99,19 +79,18 @@ meteorhacks:subs-manager@1.6.4
meteortesting:browser-tests@0.1.2
meteortesting:mocha@0.5.0
minifier-css@1.3.1
minifier-js@2.3.2
minifier-js@2.3.1
minimongo@1.4.3
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modules@0.11.4
modules-runtime@0.9.2
modules@0.11.3
modules-runtime@0.9.1
momentjs:moment@2.19.4
mongo@1.4.3
mongo@1.4.2
mongo-dev-server@1.1.0
mongo-id@1.0.6
mongo-livedata@1.0.12
npm-bcrypt@0.9.3
npm-mongo@2.2.34
npm-mongo@2.2.33
oauth@1.2.1
oauth-encryption@1.3.0
oauth1@1.2.0
Expand All @@ -123,11 +102,10 @@ percolate:migrations@0.9.8
practicalmeteor:chai@2.1.0_1
practicalmeteor:mocha-core@1.0.1
practicalmeteor:sinon@1.14.1_2
promise@0.10.2
promise@0.10.1
raix:eventemitter@0.1.3
raix:ui-dropped-event@0.0.7
random@1.1.0
rate-limit@1.0.9
rate-limit@1.0.8
reactive-dict@1.2.0
reactive-var@1.0.11
reload@1.2.0
Expand All @@ -143,7 +121,7 @@ socket-stream-client@0.1.0
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.10
standard-minifier-js@2.3.2
standard-minifier-js@2.3.1
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
Expand Down
92 changes: 91 additions & 1 deletion .snyk
@@ -1,68 +1,128 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.10.1
version: v1.10.2
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
'npm:hoek:20180212':
- nexmo > jsonwebtoken > joi > hoek:
reason: No patch available
expires: '2018-03-22T04:22:44.834Z'
npm > request > hawk > hoek:
reason: no patch available
expires: '2018-04-05T17:36:16.541Z'
- nexmo > jsonwebtoken > joi > topo > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > request > hawk > boom > hoek:
reason: no patch available
expires: '2018-04-05T17:36:16.541Z'
- prerender-node > request > hawk > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > request > hawk > sntp > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- prerender-node > request > hawk > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > request > hawk > cryptiles > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- prerender-node > request > hawk > sntp > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-registry-client > request > hawk > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- prerender-node > request > hawk > cryptiles > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-registry-client > request > hawk > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-registry-client > request > hawk > sntp > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: no patch availalbe
expires: '2018-03-22T04:22:44.834Z'
npm > npm-registry-client > request > hawk > cryptiles > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-lifecycle > node-gyp > request > hawk > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > libcipm > npm-lifecycle > node-gyp > request > hawk > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > libcipm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runner > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > libcipm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runner > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
npm > libcipm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
reason: no patch
expires: '2018-04-05T17:36:16.541Z'
- jest > jest-cli > jest-runner > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
'@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > gcs-resumable-upload > google-auto-auth > gcp-metadata > retry-request > request > hawk > hoek':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- jest > jest-cli > jest-runner > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > cryptiles > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
'@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > gcs-resumable-upload > google-auto-auth > gcp-metadata > retry-request > request > hawk > boom > hoek':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- jest > jest-cli > jest-runner > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
'@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > gcs-resumable-upload > google-auto-auth > gcp-metadata > retry-request > request > hawk > sntp > hoek':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- jest > jest-cli > jest-runner > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > boom > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
'@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > gcs-resumable-upload > google-auto-auth > gcp-metadata > retry-request > request > hawk > cryptiles > boom > hoek':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- jest > jest-cli > jest-runner > jest-runtime > jest-haste-map > sane > fsevents > node-pre-gyp > request > hawk > sntp > hoek:
reason: no patch available
expires: '2018-03-22T04:22:44.834Z'
Expand Down Expand Up @@ -93,15 +153,27 @@ ignore:
- eslint-config-react-tools > babel-eslint > babel-types > lodash:
reason: no patch available
expires: '2018-03-22T04:49:05.875Z'
authorize-net > 42-cent-base > lodash:
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- eslint-config-react-tools > eslint-plugin-class-property > eslint > table > lodash:
reason: no patch available
expires: '2018-03-22T04:49:05.875Z'
twilio > lodash:
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- eslint-config-react-tools > eslint-plugin-class-property > eslint > lodash:
reason: no patch available
expires: '2018-03-22T04:49:05.875Z'
velocity-react > lodash:
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- eslint-config-react-tools > eslint > table > lodash:
reason: no patch available
expires: '2018-03-22T04:49:05.875Z'
npm > cli-table2 > lodash:
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- eslint-config-react-tools > eslint > inquirer > lodash:
reason: no patch available
expires: '2018-03-22T04:49:05.875Z'
Expand Down Expand Up @@ -324,4 +396,22 @@ ignore:
- '*':
reason: no patch available and dev dependency
expires: 2018-03-22T08:23:02.718Z
'npm:node-forge:20180226':
- '@reactioncommerce/file-collections > tus-node-server > google-auto-auth > google-auth-library > gtoken > google-p12-pem > node-forge':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- '@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > @google-cloud/common > google-auto-auth > google-auth-library > gtoken > google-p12-pem > node-forge':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
- '@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > gcs-resumable-upload > google-auto-auth > google-auth-library > gtoken > google-p12-pem > node-forge':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
'npm:ssri:20180214':
- npm > npm-registry-client > ssri:
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
'npm:tunnel-agent:20170305':
- '@reactioncommerce/file-collections > tus-node-server > @google-cloud/storage > gcs-resumable-upload > google-auto-auth > gcp-metadata > retry-request > request > tunnel-agent':
reason: no patch
expires: '2018-04-05T17:36:16.542Z'
patch: {}
Expand Up @@ -13,12 +13,11 @@ import CompletedOrder from "../../../checkout/client/components/completedOrder";
class OrdersList extends Component {
static propTypes = {
allOrdersInfo: PropTypes.array,
handleDisplayMedia: PropTypes.func,
isProfilePage: PropTypes.bool
}

render() {
const { allOrdersInfo, handleDisplayMedia } = this.props;
const { allOrdersInfo } = this.props;

if (allOrdersInfo) {
return (
Expand All @@ -32,8 +31,6 @@ class OrdersList extends Component {
order={order.order}
orderSummary={order.orderSummary}
paymentMethods={order.paymentMethods}
productImages={order.productImages}
handleDisplayMedia={handleDisplayMedia}
isProfilePage={this.props.isProfilePage}
/>
);
Expand Down