Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/client/cypress/support/Pages/AggregateHelper.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import "cypress-wait-until";
import { v4 as uuidv4 } from "uuid";
import { ObjectsRegistry } from "../Objects/Registry";
import type CodeMirror from "codemirror";
import type { EntityItemsType } from "./AssertHelper";
Expand Down Expand Up @@ -1174,7 +1173,7 @@ export class AggregateHelper {
}

public GenerateUUID() {
let id = uuidv4();
let id = crypto.randomUUID();
id = "Cy" + id.split("-")[0];
cy.wrap(id).as("guid");
}
Expand Down
3 changes: 1 addition & 2 deletions app/client/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import EditorNavigation, {
require("cy-verify-downloads").addCustomCommand();
require("cypress-file-upload");
const path = require("path");
import { v4 as uuidv4 } from "uuid";

const dayjs = require("dayjs");
const loginPage = require("../locators/LoginPage.json");
Expand Down Expand Up @@ -325,7 +324,7 @@ Cypress.Commands.add("tabPopertyUpdate", (tabId, newTabName) => {
});

Cypress.Commands.add("generateUUID", () => {
let id = uuidv4();
let id = crypto.randomUUID();
return id.split("-")[0];
});

Expand Down
2 changes: 0 additions & 2 deletions app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@
"unescape-js": "^1.1.4",
"url-search-params-polyfill": "^8.0.0",
"usehooks-ts": "^3.1.0",
"uuid": "^9.0.0",
"validate-color": "^2.2.4",
"web-vitals": "3.5.2",
"yjs": "^13.5.12",
Expand Down Expand Up @@ -296,7 +295,6 @@
"@types/tern": "0.22.0",
"@types/tinycolor2": "^1.4.2",
"@types/toposort": "^2.0.3",
"@types/uuid": "^9.0.5",
"@types/zipcelx": "^1.5.0",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import {
import React, { useCallback, useMemo, useState } from "react";
import type { FieldArrayFieldsProps } from "redux-form";
import styled from "styled-components";
import { v4 as uuid } from "uuid";
import type {
FunctionCallingConfigFormToolField,
FunctionCallingEntityType,
Expand Down Expand Up @@ -90,7 +89,7 @@ export const FunctionCallingConfigForm = ({

const handleAddFunctionButtonClick = useCallback(
(option: FunctionCallingEntityTypeOption) => {
const id = uuid();
const id = crypto.randomUUID();

fields.push({
id,
Expand Down
3 changes: 1 addition & 2 deletions app/client/src/instrumentation/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
} from "@grafana/faro-web-tracing";
import log from "loglevel";
import { isTracingEnabled } from "instrumentation/utils";
import { v4 as uuidv4 } from "uuid";
import { error as errorLogger } from "loglevel";
import type { User } from "constants/userConstants";

Expand Down Expand Up @@ -128,7 +127,7 @@ class AppsmithTelemetry {

// eslint-disable-next-line @typescript-eslint/no-explicit-any
public captureException(exception: any, hint?: Record<string, any>): string {
const eventId = uuidv4();
const eventId = crypto.randomUUID();

if (!this.faro) {
return eventId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
import { v4 as uuid } from "uuid";

export const LAYOUT_WRAPPER_ID = uuid();
export const LAYOUT_WRAPPER_ID = crypto.randomUUID();
11 changes: 1 addition & 10 deletions app/client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12072,13 +12072,6 @@ __metadata:
languageName: node
linkType: hard

"@types/uuid@npm:^9.0.5":
version: 9.0.8
resolution: "@types/uuid@npm:9.0.8"
checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
languageName: node
linkType: hard

"@types/wait-on@npm:^5.2.0":
version: 5.3.4
resolution: "@types/wait-on@npm:5.3.4"
Expand Down Expand Up @@ -13727,7 +13720,6 @@ __metadata:
"@types/tern": 0.22.0
"@types/tinycolor2": ^1.4.2
"@types/toposort": ^2.0.3
"@types/uuid": ^9.0.5
"@types/web": ^0.0.99
"@types/zipcelx": ^1.5.0
"@typescript-eslint/eslint-plugin": ^6.7.4
Expand Down Expand Up @@ -13961,7 +13953,6 @@ __metadata:
unescape-js: ^1.1.4
url-search-params-polyfill: ^8.0.0
usehooks-ts: ^3.1.0
uuid: ^9.0.0
validate-color: ^2.2.4
web-vitals: 3.5.2
webpack: ^5.98.0
Expand Down Expand Up @@ -34827,7 +34818,7 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:^9.0.0, uuid@npm:^9.0.1":
"uuid@npm:^9.0.1":
version: 9.0.1
resolution: "uuid@npm:9.0.1"
bin:
Expand Down