Skip to content

Commit

Permalink
Merge pull request #11 from dhis2/refactor
Browse files Browse the repository at this point in the history
refactor: remove unused code
  • Loading branch information
JohanGHole authored Dec 10, 2024
2 parents b93b4e9 + 79600bf commit 91aa496
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 49 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
# secrets: inherit
# with:
# api_version: 42
release:
needs: [lint-commits, lint, test]
uses: dhis2/workflows-platform/.github/workflows/release.yml@v1
# Skips forks and dependabot PRs
if: '!github.event.push.repository.fork'
secrets: inherit
# release:
# needs: [lint-commits, lint, test]
# uses: dhis2/workflows-platform/.github/workflows/release.yml@v1
# # Skips forks and dependabot PRs
# if: '!github.event.push.repository.fork'
# secrets: inherit
6 changes: 5 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react";
import React, { useState } from "react";
import { exportMetadata } from "./utils/exportMetadata";
import TrackerProgramSelector from "./components/TrackerProgramSelector";
import IGConfigForm from "./components/IGConfigForm";
Expand All @@ -21,6 +21,7 @@ const MyApp = () => {
</NoticeBox>
);
}

if (loading || !templates) return <CircularLoader />;

const selectedPrograms = programs.filter((program) =>
Expand All @@ -46,13 +47,16 @@ const MyApp = () => {
selectedProgramIds={selectedProgramIds}
setSelectedProgramIds={setSelectedProgramIds}
/>
<div className={classes.downloadButton}>
<Button
primary
onClick={() => exportMetadata(selectedPrograms, templates, igConfig)}
disabled={selectedPrograms.length === 0 || !igConfig || !templates}
>
Download FHIR IG
</Button>
</div>

</div>
);
};
Expand Down
4 changes: 4 additions & 0 deletions src/App.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
justify-content: center;
font-size: 1rem;
}

.downloadButton {
margin-top: 20px;
}
2 changes: 2 additions & 0 deletions src/components/IGConfigForm.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.container {
padding: 20px;
background-color: #f5f5f5;
max-height: 100%;
overflow: auto;
}

.row {
Expand Down
36 changes: 16 additions & 20 deletions src/components/TrackerProgramSelector.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
import React from "react";
import { MultiSelect, MultiSelectOption } from "@dhis2/ui";
import { Transfer } from "@dhis2/ui";

function TrackerProgramSelector({
programs,
selectedProgramIds,
setSelectedProgramIds,
}) {
const handleSelectionChange = ({ selected }) => {
if (JSON.stringify(selected) !== JSON.stringify(selectedProgramIds)) {
setSelectedProgramIds(selected);
}
const handleSelectionChange = ({selected}) => {
setSelectedProgramIds(Array.isArray(selected) ? selected : []);
};

const options = programs.map((program) => ({
value: program.id,
label: program.displayName,
}));

return (
<MultiSelect
<div>
<Transfer
label="Select Tracker Programs"
selected={selectedProgramIds}
onChange={handleSelectionChange}
placeholder="Select one or more programs"
>
{programs.length > 0 ? (
programs.map((program) => (
<MultiSelectOption
key={program.id}
value={program.id}
label={program.displayName}
/>
))
) : (
<MultiSelectOption disabled label="No programs available" />
)}
</MultiSelect>
options={options}
leftHeader="Available Tracker Programs"
rightHeader="Selected Tracker Programs"
filterable
/>
</div>
);
}

Expand Down
9 changes: 0 additions & 9 deletions src/components/WarningMessage.js

This file was deleted.

13 changes: 0 additions & 13 deletions src/utils/codeValidation.js

This file was deleted.

1 comment on commit 91aa496

@dhis2-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.