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

FD-1681 - Preferred Terminology or OLS Search w/ Ontology Filters for Mapping Edit and Reset #146

Merged
merged 8 commits into from
Nov 19, 2024
+685 −419
Merged

FD-1681 - Preferred Terminology or OLS Search w/ Ontology Filters for Mapping Edit and Reset #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfc58b8
both pref terminologies and ols search mappings showing up when selected
yelenacox Nov 18, 2024
aac54a9
committing to switch branches
yelenacox Nov 18, 2024
a9b5f3a
pref term mappings and ols mappings saving
yelenacox Nov 18, 2024
a35771c
Merge branch 'main' into fd-1681/pref-term-edit
yelenacox Nov 19, 2024
9040959
fixed systems match to use ontologyApis
yelenacox Nov 19, 2024
4c041a6
Removed duplicate OLS search from MappingSearch
yelenacox Nov 19, 2024
4ea054c
committing to switch branches
yelenacox Nov 19, 2024
149bea9
Preferred terminology or ols search with ontology filters for edit an…
yelenacox Nov 19, 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
166 changes: 0 additions & 166 deletions src/components/Error/AssignMappingsCheckboxes.jsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/Manager/MappingsFunctions/GetMappingsModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export const GetMappingsModal = ({
table,
terminology,
}) => {
const { tableId } = useParams();
const [form] = Form.useForm();
const { Search } = Input;
const { searchUrl, vocabUrl, setSelectedKey, user } = useContext(myContext);
Expand All @@ -43,6 +42,7 @@ export const GetMappingsModal = ({
setUnformattedPref,
prefTypeKey,
ontologyApis,
setPrefTerminologies,
} = useContext(SearchContext);
const [page, setPage] = useState(0);
const entriesPerPage = 1000;
Expand All @@ -62,7 +62,6 @@ export const GetMappingsModal = ({
setSelectedBoxes,
} = useContext(MappingContext);
let ref = useRef();

// since the code is passed through searchProp, the '!!' forces it to be evaluated as a boolean.
// if there is a searchProp being passed, it evaluates to true and runs the search function.
// inputValue and currentSearchProp for the search bar is set to the passed searchProp.
Expand Down Expand Up @@ -144,6 +143,7 @@ export const GetMappingsModal = ({
setApiPreferencesCode(undefined);
setSelectedBoxes([]);
setSelectedKey(null);
setPrefTerminologies([]);
};

// Sets currentSearchProp to the value of the search bar and sets page to 0.
Expand Down
Loading