@bindu-dashing/dam-solution-v2 5.8.11 → 5.8.13
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.
|
@@ -7,9 +7,11 @@ import DriveContainer from "./DriveContainer";
|
|
|
7
7
|
import useAppParams from "../utilities/useAppParams";
|
|
8
8
|
import { FoldersProvider } from "../utilities/FoldersContext";
|
|
9
9
|
export default function MyDriveMainContainer({ folders, setFolders }) {
|
|
10
|
+
console.log('## MyDriveMainContainer props', folders, setFolders);
|
|
10
11
|
const damConfig = useDamConfig();
|
|
11
12
|
const { rootFolderId, brand, isAdmin } = damConfig;
|
|
12
13
|
const params = useAppParams();
|
|
14
|
+
console.log('## all props', params, rootFolderId);
|
|
13
15
|
const [selectedKeys, setSelectedKeys] = useState([]);
|
|
14
16
|
const [expandedKeys, setExpandedKeys] = useState([]);
|
|
15
17
|
const [globalSearch, setGlobalSearch] = useState("");
|
|
@@ -17,7 +19,11 @@ export default function MyDriveMainContainer({ folders, setFolders }) {
|
|
|
17
19
|
if (params === null || params === void 0 ? void 0 : params.folderId) {
|
|
18
20
|
setSelectedKeys(params.folderId);
|
|
19
21
|
}
|
|
20
|
-
|
|
22
|
+
else if (rootFolderId && !(params === null || params === void 0 ? void 0 : params.folderId)) {
|
|
23
|
+
// If no URL param but rootFolderId is set (from props), use it
|
|
24
|
+
setSelectedKeys(rootFolderId);
|
|
25
|
+
}
|
|
26
|
+
}, [params === null || params === void 0 ? void 0 : params.folderId, rootFolderId]);
|
|
21
27
|
const currentRootId = isArray(selectedKeys)
|
|
22
28
|
? selectedKeys.length
|
|
23
29
|
? selectedKeys[selectedKeys.length - 1]
|
package/build/MyDrive/index.d.ts
CHANGED
package/build/MyDrive/index.js
CHANGED
|
@@ -9,6 +9,7 @@ import { useMemo, useState } from "react";
|
|
|
9
9
|
import process from "process";
|
|
10
10
|
import { ParamsProvider } from "../utilities/useAppParams";
|
|
11
11
|
function App(props) {
|
|
12
|
+
console.log('## receiver props', props);
|
|
12
13
|
const config = useMemo(() => ({
|
|
13
14
|
damAccessKey: props === null || props === void 0 ? void 0 : props.accessKey,
|
|
14
15
|
secretKey: props === null || props === void 0 ? void 0 : props.secretKey,
|
|
@@ -16,6 +17,7 @@ function App(props) {
|
|
|
16
17
|
teamIds: props === null || props === void 0 ? void 0 : props.teamIds,
|
|
17
18
|
styles: props === null || props === void 0 ? void 0 : props.styles,
|
|
18
19
|
appType: props === null || props === void 0 ? void 0 : props.appType,
|
|
20
|
+
initialRootFolderId: (props === null || props === void 0 ? void 0 : props.folderId) || (props === null || props === void 0 ? void 0 : props.id) || (props === null || props === void 0 ? void 0 : props.parentId),
|
|
19
21
|
}), [
|
|
20
22
|
props === null || props === void 0 ? void 0 : props.accessKey,
|
|
21
23
|
props === null || props === void 0 ? void 0 : props.secretKey,
|
|
@@ -24,6 +26,9 @@ function App(props) {
|
|
|
24
26
|
props === null || props === void 0 ? void 0 : props.styles,
|
|
25
27
|
props === null || props === void 0 ? void 0 : props.appType,
|
|
26
28
|
props === null || props === void 0 ? void 0 : props.routerVersion,
|
|
29
|
+
props === null || props === void 0 ? void 0 : props.folderId,
|
|
30
|
+
props === null || props === void 0 ? void 0 : props.id,
|
|
31
|
+
props === null || props === void 0 ? void 0 : props.parentId,
|
|
27
32
|
]);
|
|
28
33
|
const [folders, setFolders] = useState([]);
|
|
29
34
|
if (typeof window !== "undefined" && !window.process) {
|
|
@@ -19,12 +19,12 @@ import { SUBSCRIPTION_EXPIRED_ERROR_MESSAGE } from "./appConstants";
|
|
|
19
19
|
const DamConfigContext = createContext(null);
|
|
20
20
|
export const DamConfigProvider = ({ children, config }) => {
|
|
21
21
|
// console.log(config);
|
|
22
|
-
const { damAccessKey, secretKey, subdomain, teamIds, appType } = config;
|
|
22
|
+
const { damAccessKey, secretKey, subdomain, teamIds, appType, initialRootFolderId } = config;
|
|
23
23
|
const [accessToken, setAccessToken] = useState(null);
|
|
24
24
|
const [user, setDamUser] = useState(null);
|
|
25
25
|
const [brand, setBrand] = useState(null);
|
|
26
26
|
const [loading, setLoading] = useState(false);
|
|
27
|
-
const [rootFolderId, setRootFolderId] = useState(null);
|
|
27
|
+
const [rootFolderId, setRootFolderId] = useState(initialRootFolderId || null);
|
|
28
28
|
const [teams, setTeams] = useState([]);
|
|
29
29
|
const [isAdmin, setIsAdmin] = useState(false);
|
|
30
30
|
const [showPaymentErr, setShowPaymentErr] = useState(false);
|
|
@@ -45,7 +45,9 @@ export const DamConfigProvider = ({ children, config }) => {
|
|
|
45
45
|
setDamUser(userData);
|
|
46
46
|
setLoading(false);
|
|
47
47
|
setBrand(brandData);
|
|
48
|
-
|
|
48
|
+
// Use initialRootFolderId if provided, otherwise use rootFolderId from API
|
|
49
|
+
const apiRootFolderId = get(response, "data.data.rootFolderId");
|
|
50
|
+
setRootFolderId(initialRootFolderId || apiRootFolderId);
|
|
49
51
|
const adminTeamIds = get(response, "data.data.brand.adminTeams", []);
|
|
50
52
|
// console.log(adminTeamIds);
|
|
51
53
|
setIsAdmin(teamIds.reduce((acc, curr) => {
|