chaos/VaultUI
1
0
Fork 0
Code Issues Activity

Add some more handy Object/Map utils.

Browse source
This commit is contained in:
Kitteh 2021-05-07 14:19:34 +01:00
parent ccf420d107
commit 3dadc99580
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/pages/Home.js
View file

@ -4,6 +4,7 @@ import { getMounts } from "../api/getMounts";
import { lookupSelf } from "../api/lookupSelf"; import { lookupSelf } from "../api/lookupSelf";
import { makeElement } from "../htmlUtils.js"; import { makeElement } from "../htmlUtils.js";
import { pageState } from "../globalPageState.js"; import { pageState } from "../globalPageState.js";
import { sortedObjectMap } from "../utils.js";
import i18next from 'i18next'; import i18next from 'i18next';
export class HomePage extends Page { export class HomePage extends Page {
@ -63,7 +64,7 @@ export class HomePage extends Page {
let mounts = await getMounts(); let mounts = await getMounts();
// sort it by secretPath so it's in alphabetical order consistantly. // sort it by secretPath so it's in alphabetical order consistantly.
const mountsMap = new Map(Object.entries(mounts).sort()); const mountsMap = sortedObjectMap(mounts);
mountsMap.forEach(function (mount, baseMount) { mountsMap.forEach(function (mount, baseMount) {
if (typeof mount != 'object') return; if (typeof mount != 'object') return;

3
src/pages/KeyValue/KeyValueSecret.js
View file

@ -5,6 +5,7 @@ import { getCapabilities } from "../../api/getCapabilities";
import { getSecret } from "../../api/getSecret"; import { getSecret } from "../../api/getSecret";
import { makeElement } from "../../htmlUtils.js"; import { makeElement } from "../../htmlUtils.js";
import { pageState } from "../../globalPageState.js"; import { pageState } from "../../globalPageState.js";
import { sortedObjectMap } from "../../utils.js";
import { undeleteSecret } from "../../api/undeleteSecret"; import { undeleteSecret } from "../../api/undeleteSecret";
import Prism from "prismjs"; import Prism from "prismjs";
import i18next from 'i18next'; import i18next from 'i18next';
@ -125,7 +126,7 @@ export class KeyValueSecretPage extends Page {
return; return;
} }
const secretsMap = new Map(Object.entries(secretInfo).sort()); const secretsMap = sortedObjectMap(secretInfo);
for (let value of secretsMap.values()) { for (let value of secretsMap.values()) {
if (typeof value == 'object') isSecretNestedJson = true; if (typeof value == 'object') isSecretNestedJson = true;

3
src/pages/KeyValue/KeyValueVersions.js
View file

@ -2,6 +2,7 @@ import { Page } from "../../types/Page.js";
import { changePage, setPageContent, setTitleElement } from "../../pageUtils.js"; import { changePage, setPageContent, setTitleElement } from "../../pageUtils.js";
import { getSecretMetadata } from "../../api/getSecretMetadata.js"; import { getSecretMetadata } from "../../api/getSecretMetadata.js";
import { makeElement } from "../../htmlUtils.js"; import { makeElement } from "../../htmlUtils.js";
import { objectToMap } from "../../utils.js";
import { pageState } from "../../globalPageState.js"; import { pageState } from "../../globalPageState.js";
import i18next from 'i18next'; import i18next from 'i18next';
@ -32,7 +33,7 @@ export class KeyValueVersionsPage extends Page {
pageState.currentSecret pageState.currentSecret
); );
new Map(Object.entries(metadata.versions)).forEach((_, ver) => { objectToMap(metadata.versions).forEach((_, ver) => {
versionsList.appendChild(makeElement({ versionsList.appendChild(makeElement({
tag: "li", tag: "li",
children: makeElement({ children: makeElement({

1
src/utils.js
View file

@ -4,6 +4,7 @@ export function removeDoubleSlash(str) {
export const getObjectKeys = (obj) => Object.getOwnPropertyNames(obj); export const getObjectKeys = (obj) => Object.getOwnPropertyNames(obj);
export const objectToMap = (obj) => new Map(Object.entries(obj)); export const objectToMap = (obj) => new Map(Object.entries(obj));
export const sortedObjectMap = (obj) => new Map(Object.entries(obj).sort());
export function getKeyByObjectPropertyValue(map, searchValue) { export function getKeyByObjectPropertyValue(map, searchValue) {
for (let key of getObjectKeys(map)) { for (let key of getObjectKeys(map)) {