{
- history.goBack();
- }}
+ onClick={goBackFunction}
sx={{
border: "#EAEDEE 1px solid",
backgroundColor: "#fff",
borderLeft: 0,
- borderBottom: 0,
borderRadius: 0,
width: 39,
height: 39,
@@ -145,7 +180,7 @@ const BrowserBreadcrumbs = ({
paddingLeft: "6px",
}}
>
-
+
@@ -158,9 +193,14 @@ const BrowserBreadcrumbs = ({
const mapStateToProps = ({ objectBrowser }: ObjectBrowserReducer) => ({
rewindEnabled: get(objectBrowser, "rewind.rewindEnabled", false),
- rewindDate: get(objectBrowser, "rewind.dateToRewind", null),
+ versionsMode: get(objectBrowser, "versionsMode", false),
+ versionedFile: get(objectBrowser, "versionedFile", ""),
});
-const connector = connect(mapStateToProps, null);
+const mapDispatchToProps = {
+ setVersionsModeEnabled,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
export default withStyles(styles)(connector(BrowserBreadcrumbs));
diff --git a/portal-ui/src/screens/Console/ObjectBrowser/actions.ts b/portal-ui/src/screens/Console/ObjectBrowser/actions.ts
index 432706ceb..5b1a3bd29 100644
--- a/portal-ui/src/screens/Console/ObjectBrowser/actions.ts
+++ b/portal-ui/src/screens/Console/ObjectBrowser/actions.ts
@@ -18,7 +18,6 @@ import { IFileItem } from "./reducers";
export const REWIND_SET_ENABLE = "REWIND/SET_ENABLE";
export const REWIND_RESET_REWIND = "REWIND/RESET_REWIND";
-export const REWIND_FILE_MODE_ENABLED = "BUCKET_BROWSER/FILE_MODE_ENABLED";
export const OBJECT_MANAGER_NEW_OBJECT = "OBJECT_MANAGER/NEW_OBJECT";
export const OBJECT_MANAGER_UPDATE_PROGRESS_OBJECT =
@@ -33,6 +32,13 @@ export const OBJECT_MANAGER_CLOSE_LIST = "OBJECT_MANAGER/CLOSE_LIST";
export const OBJECT_MANAGER_SET_SEARCH_OBJECT =
"OBJECT_MANAGER/SET_SEARCH_OBJECT";
+export const BUCKET_BROWSER_VERSIONS_MODE_ENABLED =
+ "BUCKET_BROWSER/VERSIONS_MODE_ENABLED";
+export const BUCKET_BROWSER_VERSIONS_SET_SEARCH =
+ "BUCKET_BROWSER/VERSIONS_SET_SEARCH";
+export const BUCKET_BROWSER_SET_SELECTED_VERSION =
+ "BUCKET_BROWSER/SET_SELECTED_VERSION";
+
interface RewindSetEnabled {
type: typeof REWIND_SET_ENABLE;
bucket: string;
@@ -44,9 +50,10 @@ interface RewindReset {
type: typeof REWIND_RESET_REWIND;
}
-interface FileModeEnabled {
- type: typeof REWIND_FILE_MODE_ENABLED;
+interface VersionsModeEnabled {
+ type: typeof BUCKET_BROWSER_VERSIONS_MODE_ENABLED;
status: boolean;
+ objectName: string;
}
interface OMNewObject {
@@ -77,9 +84,11 @@ interface OMCleanList {
interface OMToggleList {
type: typeof OBJECT_MANAGER_TOGGLE_LIST;
}
+
interface OMOpenList {
type: typeof OBJECT_MANAGER_OPEN_LIST;
}
+
interface OMCloseList {
type: typeof OBJECT_MANAGER_CLOSE_LIST;
}
@@ -89,10 +98,20 @@ interface SetSearchObjects {
searchString: string;
}
+interface SetSearchVersions {
+ type: typeof BUCKET_BROWSER_VERSIONS_SET_SEARCH;
+ searchString: string;
+}
+
+interface SetSelectedversion {
+ type: typeof BUCKET_BROWSER_SET_SELECTED_VERSION;
+ selectedVersion: string;
+}
+
export type ObjectBrowserActionTypes =
| RewindSetEnabled
| RewindReset
- | FileModeEnabled
+ | VersionsModeEnabled
| OMNewObject
| OMUpdateProgress
| OMCompleteObject
@@ -101,7 +120,9 @@ export type ObjectBrowserActionTypes =
| OMToggleList
| OMOpenList
| OMCloseList
- | SetSearchObjects;
+ | SetSearchObjects
+ | SetSearchVersions
+ | SetSelectedversion;
export const setRewindEnable = (
state: boolean,
@@ -122,10 +143,14 @@ export const resetRewind = () => {
};
};
-export const setFileModeEnabled = (status: boolean) => {
+export const setVersionsModeEnabled = (
+ status: boolean,
+ objectName: string = ""
+) => {
return {
- type: REWIND_FILE_MODE_ENABLED,
+ type: BUCKET_BROWSER_VERSIONS_MODE_ENABLED,
status,
+ objectName,
};
};
@@ -188,3 +213,17 @@ export const setSearchObjects = (searchString: string) => {
searchString,
};
};
+
+export const setSearchVersions = (searchString: string) => {
+ return {
+ type: BUCKET_BROWSER_VERSIONS_SET_SEARCH,
+ searchString,
+ };
+};
+
+export const setSelectedVersion = (selectedVersion: string) => {
+ return {
+ type: BUCKET_BROWSER_SET_SELECTED_VERSION,
+ selectedVersion,
+ };
+};
diff --git a/portal-ui/src/screens/Console/ObjectBrowser/reducers.ts b/portal-ui/src/screens/Console/ObjectBrowser/reducers.ts
index cc40ecdca..515fcaa9f 100644
--- a/portal-ui/src/screens/Console/ObjectBrowser/reducers.ts
+++ b/portal-ui/src/screens/Console/ObjectBrowser/reducers.ts
@@ -16,7 +16,7 @@
import {
REWIND_SET_ENABLE,
REWIND_RESET_REWIND,
- REWIND_FILE_MODE_ENABLED,
+ BUCKET_BROWSER_VERSIONS_MODE_ENABLED,
ObjectBrowserActionTypes,
OBJECT_MANAGER_NEW_OBJECT,
OBJECT_MANAGER_UPDATE_PROGRESS_OBJECT,
@@ -27,6 +27,8 @@ import {
OBJECT_MANAGER_CLOSE_LIST,
OBJECT_MANAGER_OPEN_LIST,
OBJECT_MANAGER_SET_SEARCH_OBJECT,
+ BUCKET_BROWSER_VERSIONS_SET_SEARCH,
+ BUCKET_BROWSER_SET_SELECTED_VERSION,
} from "./actions";
export interface Route {
@@ -42,10 +44,13 @@ export interface RewindItem {
}
export interface ObjectBrowserState {
- fileMode: boolean;
rewind: RewindItem;
objectManager: ObjectManager;
searchObjects: string;
+ versionsMode: boolean;
+ versionedFile: string;
+ searchVersions: string;
+ selectedVersion: string;
}
export interface ObjectBrowserReducer {
@@ -74,7 +79,7 @@ const defaultRewind = {
};
const initialState: ObjectBrowserState = {
- fileMode: false,
+ versionsMode: false,
rewind: {
...defaultRewind,
},
@@ -83,6 +88,9 @@ const initialState: ObjectBrowserState = {
managerOpen: false,
},
searchObjects: "",
+ versionedFile: "",
+ searchVersions: "",
+ selectedVersion: "",
};
export function objectBrowserReducer(
@@ -105,8 +113,15 @@ export function objectBrowserReducer(
dateToRewind: null,
};
return { ...state, rewind: resetItem };
- case REWIND_FILE_MODE_ENABLED:
- return { ...state, fileMode: action.status };
+ case BUCKET_BROWSER_VERSIONS_MODE_ENABLED:
+ const objectN = !action.status ? "" : action.objectName;
+
+ return {
+ ...state,
+ versionsMode: action.status,
+ versionedFile: objectN,
+ selectedVersion: "",
+ };
case OBJECT_MANAGER_NEW_OBJECT:
const cloneObjects = [
action.newObject,
@@ -220,6 +235,16 @@ export function objectBrowserReducer(
...state,
searchObjects: action.searchString,
};
+ case BUCKET_BROWSER_VERSIONS_SET_SEARCH:
+ return {
+ ...state,
+ searchVersions: action.searchString,
+ };
+ case BUCKET_BROWSER_SET_SELECTED_VERSION:
+ return {
+ ...state,
+ selectedVersion: action.selectedVersion,
+ };
default:
return state;
}