pulled down dev changes

client/components/Origin.js

@@ -2,7 +2,8 @@ import React, { useEffect } from 'react';
 import {
  updateOriginSecretKey,
  updateOriginAccessId,
- updateAccountId,
+ updateAccountId,,
+ updateOriginBuckets
 } from '../slice';
 import { useDispatch, useSelector } from 'react-redux';
 import { getUserBuckets } from '../services/getBuckets';
@@ -26,6 +27,22 @@ const Origin = (props) => {
  );
  }
 
+ let bucketSelect;
+
+ const requireAccountId = props.name === 'CloudFlare' ? true : false;
+
+ if (!requireAccountId) {
+ bucketSelect = origin.accessId && origin.secretKey && (
+ <BucketSelect remote={'origin'}></BucketSelect>
+ );
+ } else {
+ bucketSelect = origin.accessId && origin.secretKey && origin.accountId && (
+ <BucketSelect remote={'origin'}></BucketSelect>
+ );
+ }
+
+ //REFACTOR TO RTK QUERY.
+ //THIS GETS THE BUCKETS.
  useEffect(() => {
  if (origin.accessId && origin.secretKey) {
  if (origin.name === 'Cloudflare' && !origin.accountId) return;

client/slice.js

@@ -52,10 +52,12 @@ const slice = createSlice({
  state.origin = origin;
  state.destination = destination;
  },
- updateSelectedBucket: (state, action) => {
+ updateOriginBuckets: (state, action) => {
+ state.origin.buckets = action.payload;
+ } updateSelectedBucket: (state, action) => {
  state[action.payload.remote].selectedBucket = action.payload.bucket;
  },
-  },
+ },
  extraReducers: (builder) => {
  builder.addCase(getUserBuckets.fulfilled),
  (state, action) => {
@@ -77,5 +79,6 @@ export const {
  updateDestinationSecretKey,
  updateDestinationAccessId,
  updateAccountId,
+ updateOriginBuckets,
  updateSelectedBucket,
 } = slice.actions;