Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
SFJohnson24 committed Jun 24, 2024
1 parent 77e0419 commit 6655545
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
7 changes: 0 additions & 7 deletions src/components/Controls/Controls.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { useContext, useState, MouseEvent } from "react";
import AppContext from "../AppContext";
import PromptDialog from "../PromptDialog/PromptDialog";
<<<<<<< HEAD
import { Menu, Toolbar } from "@mui/material";
=======
import { IconButton, Menu, Toolbar, Tooltip } from "@mui/material";
>>>>>>> ded6316eddbb42b4f3bd5f96fc3eeaa1a1c9afd3
import AddIcon from "@mui/icons-material/Add";
import SaveIcon from "@mui/icons-material/Save";
import RestoreIcon from "@mui/icons-material/Restore";
Expand All @@ -17,10 +13,7 @@ import jsYaml from "js-yaml";
import ExportRulesCSV from "./ExportRulesCSV";
import ExportArtifacts from "./ExportArtifacts";
import ExportRulesYAML from "./ExportRulesYAML";
<<<<<<< HEAD
import ControlButton from "./ControlButton";
=======
>>>>>>> ded6316eddbb42b4f3bd5f96fc3eeaa1a1c9afd3

export default function Controls() {
const [discardDialog, setDiscardDialog] = useState<boolean>(false);
Expand Down
5 changes: 0 additions & 5 deletions src/utils/ExcelDataset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,9 @@ const getRecords = (cols: IVariable[], rows: {}[]): {} => {
};

const getDomainName = (rows: {}[], sheetName: string): string => {
console.log(`Sheet Name: ${sheetName}`);
console.log(`Number of Rows: ${rows.length}`);
console.log(`Rows: `, rows);
if (rows.length > 3) {
const domainRow = rows[3];
console.log(`Row 4 (Domain Row):`, domainRow);
const domainName = domainRow["DOMAIN"] || domainRow["RDOMAIN"];
console.log(`Domain Name Extracted: ${domainName}`);
return domainName || sheetName.toUpperCase().replace(".XPT", "");
}
console.log(`Using Sheet Name as Domain: ${sheetName.toUpperCase().replace(".XPT", "")}`);
Expand Down

0 comments on commit 6655545

Please sign in to comment.