Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

code identical to dev, testing build pipeline for PR to main #221

Closed
wants to merge 6 commits into from
Closed

code identical to dev, testing build pipeline for PR to main #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ded6316
Export rules yaml working
gerrycampion Feb 21, 2024
d33ee11
main changes merge
SFJohnson24 Jun 24, 2024
77e0419
update getDomain with console logs
SFJohnson24 Jun 24, 2024
6655545
merge main
SFJohnson24 Jun 24, 2024
d820e5f
remove log
SFJohnson24 Jun 25, 2024
de69ee6
turned control bar red
SFJohnson24 Jun 25, 2024
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
10 changes: 9 additions & 1 deletion src/components/Controls/Controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function Controls() {
sx={{
pl: { sm: 2 },
pr: { xs: 1, sm: 1 },
bgcolor: "#DDEEFF",
bgcolor: "#FF0000",
}}
>
<ControlButton
Expand Down Expand Up @@ -164,6 +164,14 @@ export default function Controls() {
<QuickSearchToolbar label="Search YAML..." queryParam={"content"} />
</Toolbar>

{/* TODO:
Get rid of or use ControlButton
Implement YAML
Add closing to csv and yaml
Better naming for these state vars
Move export artifacts to own file
*/}

<PromptDialog
contentText="Discard changes?"
open={discardDialog}
Expand Down
12 changes: 7 additions & 5 deletions src/utils/ExcelDataset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,15 @@ const getRecords = (cols: IVariable[], rows: {}[]): {} => {
};

const getDomainName = (rows: {}[], sheetName: string): string => {
return rows.length > 3 && rows[3]["DOMAIN"]
? rows[3]["DOMAIN"]
: /* This is technically not the domain name,
but it is what the CORE engine currently expects */
sheetName.toUpperCase().replace(".XPT", "");
if (rows.length > 3) {
const domainRow = rows[3];
const domainName = domainRow["DOMAIN"] || domainRow["RDOMAIN"];
return domainName || sheetName.toUpperCase().replace(".XPT", "");
}
return sheetName.toUpperCase().replace(".XPT", "");
};


const mergeDatasetRecords = (
workbook: WorkBook,
datasets: IDataset[]
Expand Down
Loading