Skip to content

Commit

Permalink
Merge branch 'master' into domains
Browse files Browse the repository at this point in the history
  • Loading branch information
bexsoft committed Apr 14, 2022
2 parents edf5f19 + bbb4090 commit e0f8b30
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,6 @@ const ListObjects = ({
setObjectDetailsView(false);
setSearchObjects("");
} else {
console.log("AQUI", decodedIPaths);
setLoadingObjectInfo(true);
setObjectDetailsView(true);
setLoadingVersions(true);
Expand All @@ -501,9 +500,7 @@ const ListObjects = ({
]);

useEffect(() => {
console.log("SET PATH");
if (loading) {
console.log("STE");
if (displayListObjects) {
let pathPrefix = "";
if (internalPaths) {
Expand Down Expand Up @@ -597,7 +594,6 @@ const ListObjects = ({
// It is a folder, we remove loader & set original results list
setLoadingObjectsList(false);
setRecords(recordsInElement);
console.log("1");
} else {
// This code prevents the program from opening a file when a substring of that file is entered as a new folder.
// Previously, if there was a file test1.txt and the folder test was created with the same prefix, the program
Expand All @@ -618,10 +614,8 @@ const ListObjects = ({
!found
) {
// This is a folder, we set the original results list
console.log("2");
setRecords(recordsInElement);
} else {
console.log("3");
// This is a file. We change URL & Open file details view.
setObjectDetailsView(true);
setSelectedObjectView(internalPaths);
Expand All @@ -642,26 +636,22 @@ const ListObjects = ({
}`
)
.then((res: BucketObjectItemsList) => {
console.log("4");
const records: BucketObjectItem[] = res.objects || [];

setRecords(records);
})
.catch(() => {
console.log("5");
});
}

setLoadingObjectsList(false);
}
})
.catch((err: ErrorResponseHandler) => {
console.log("6");
setLoadingObjectsList(false);
setErrorSnackMessage(err);
});
} else {
console.log("7", recordsInElement);
setRecords(recordsInElement);
setLoadingObjectsList(false);
}
Expand All @@ -671,7 +661,6 @@ const ListObjects = ({
setErrorSnackMessage(err);
});
} else {
console.log("8");
setLoadingObjectsList(false);
}
}
Expand Down
3 changes: 1 addition & 2 deletions portal-ui/src/screens/Console/Console.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ const Console = ({
.invoke("POST", "/api/v1/service/restart", {})
.then((res) => {
console.log("success restarting service");
console.log(res);
serverIsLoading(false);
serverNeedsRestart(false);
})
Expand All @@ -202,7 +201,7 @@ const Console = ({
}
serverIsLoading(false);
console.log("failure restarting service");
console.log(err);
console.error(err);
});
};

Expand Down
2 changes: 1 addition & 1 deletion portal-ui/src/screens/Console/Heal/Heal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const Heal = ({ classes, distributedSetup }: IHeal) => {
setBucketList(buckets);
})
.catch((err: ErrorResponseHandler) => {
console.log(err);
console.error(err);
});
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ const TenantSizeResources = ({
name="resourcesMemoryLimit"
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
let value = parseInt(e.target.value);
console.log("value", value);
if (e.target.value === "") {
updateField("resourcesMemoryLimitError", "");
} else if (isNaN(value)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ const TenantEncryption = ({
setRefreshEncryptionInfo(false);
})
.catch((err: ErrorResponseHandler) => {
console.log(err);
console.error(err);
setRefreshEncryptionInfo(false);
});
}
Expand Down
2 changes: 1 addition & 1 deletion portal-ui/src/screens/Console/Watch/Watch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const Watch = ({
setBucketList(buckets);
})
.catch((err: ErrorResponseHandler) => {
console.log(err);
console.error(err);
});
};
useEffect(() => {
Expand Down

0 comments on commit e0f8b30

Please sign in to comment.