-
Notifications
You must be signed in to change notification settings - Fork 0
DM-49102 Remove Production related code from the web app #164
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.
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
dd4338b
Remove any code that uses the Production db table
emanehab99 ad40a6c
Fix the link in error page in the case there is no referer page
emanehab99 b7dd52d
update test
emanehab99 9393f8d
update test
emanehab99 d34cabb
address review comments
emanehab99 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,10 +16,9 @@ | |
| from sqlalchemy.ext.asyncio import async_scoped_session | ||
| from starlette.exceptions import HTTPException as StarletteHTTPException | ||
|
|
||
| from lsst.cmservice import db | ||
| from lsst.cmservice.common.enums import LevelEnum | ||
| from lsst.cmservice.config import config | ||
| from lsst.cmservice.web_app.pages.campaigns import get_campaign_details, search_campaigns | ||
| from lsst.cmservice.web_app.pages.campaigns import get_all_campaigns, get_campaign_details, search_campaigns | ||
| from lsst.cmservice.web_app.pages.group_details import get_group_by_id | ||
| from lsst.cmservice.web_app.pages.job_details import get_job_by_id | ||
| from lsst.cmservice.web_app.pages.script_details import get_script_by_id | ||
|
|
@@ -96,16 +95,15 @@ async def get_campaigns( | |
| ) -> HTMLResponse: | ||
| try: | ||
| async with session.begin(): | ||
| production_list = {} | ||
| productions = await db.Production.get_rows(session) | ||
| for p in productions: | ||
| children = await p.children(session) | ||
| production_campaigns = [] | ||
| for c in children: | ||
| campaign_details = await get_campaign_details(session, c) | ||
| production_campaigns.append(campaign_details) | ||
| production_list[p.name] = production_campaigns | ||
|
|
||
| production_list: dict[str, list] = {} | ||
| campaigns = await get_all_campaigns(session) | ||
| for campaign in campaigns: | ||
| production_name = campaign.fullname.split("/")[0] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think |
||
| campaign_details = await get_campaign_details(session, campaign) | ||
| if production_name in production_list: | ||
| production_list[production_name].append(campaign_details) | ||
| else: | ||
| production_list[production_name] = [campaign_details] | ||
| return templates.TemplateResponse( | ||
| name="pages/campaigns.html", | ||
| request=request, | ||
|
|
@@ -124,11 +122,13 @@ async def error_page( | |
| request: Request, | ||
| error_code: int, | ||
| ) -> HTMLResponse: | ||
| referer = request.headers.get("referer") | ||
| response = templates.TemplateResponse( | ||
| name="pages/error.html", | ||
| request=request, | ||
| context={ | ||
| "error_code": error_code, | ||
| "referer": referer if referer is not None else request.url_for("get_campaigns"), | ||
| }, | ||
| ) | ||
| return response | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Making this a
collections.defaultdictwould avoid the need for an if-statement later.