Refactor js file structure #25003
Merged
Refactor js file structure #25003
Conversation
This file contains 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
Update jest, webpack and ts config files to allow for two aliased paths: `app` = `static/js` `grid` = `static/js/grid`
get ready for graph view in grid and other react pages like datasets and dag dependencies
boring-cyborg
bot
added
area:dev-tools
area:UI
bbovenzi
commented
Jul 12, 2022
| @@ -26,8 +26,7 @@ const config = { | |||
| setupFilesAfterEnv: ['./jest-setup.js'], | |||
| moduleDirectories: ['node_modules'], | |||
| moduleNameMapper: { // Listing all aliases | |||
| '^app/(.*)$': '<rootDir>/static/js/$1', | |||
| '^grid/(.*)$': '<rootDir>/static/js/grid/$1', | |||
| '^src/(.*)$': '<rootDir>/static/js/$1', | |||
There was a problem hiding this comment.
src made more sense than app
bbovenzi
commented
Jul 12, 2022
| @@ -17,32 +17,22 @@ | |||
| * under the License. | |||
| */ | |||
|
|
|||
| /* global document */ | |||
| /* | |||
| Base setup for anywhere we add react to the UI | |||
There was a problem hiding this comment.
We will reuse App for datasets and other reactified pages
bbovenzi
commented
Jul 12, 2022
| @@ -22,7 +22,7 @@ import { Button, useDisclosure } from '@chakra-ui/react'; | |||
|
|
|||
| import { useMarkFailedRun } from '../../../api'; | |||
| import ConfirmDialog from '../ConfirmDialog'; | |||
| import { getMetaValue } from '../../../../utils'; | |||
| import { getMetaValue } from '../../../utils'; | |||
There was a problem hiding this comment.
In a later PR I will update more js/jsx files to typescript so we can remove more relative paths. I was having issues getting relative paths for js and ts to play nicely in our existing webpack configuration.
jedcunningham
approved these changes
Jul 13, 2022
| @@ -73,7 +73,7 @@ const config = { | |||
| task: `${JS_DIR}/task.js`, | |||
| taskInstances: `${JS_DIR}/task_instances.js`, | |||
| tiLog: `${JS_DIR}/ti_log.js`, | |||
| grid: [`${JS_DIR}/grid/index.jsx`], | |||
| grid: `${JS_DIR}/dag/index.tsx`, | |||
There was a problem hiding this comment.
This key should stay as grid?
There was a problem hiding this comment.
since we still have dag.js, I figured yes.
ryanahamilton
approved these changes
Jul 13, 2022
ephraimbuddy
added
the
type:misc/internal
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We are going to reactify more of the UI.
inside of
js/dagis code relevant to just the grid view split between the grid itself and the details panelcontext,components,theme,apiwill all be shared between however many react pages we create.^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.