chore: fix cherry-pick conflicts

[eschutho]

SUMMARY

Fixing some issues after conflicts in cherry-picking for 1.4.0

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TESTING INSTRUCTIONS

Test env should build and run correctly.

ADDITIONAL INFORMATION

• Has associated issue:
• Required feature flags:
• Changes UI
• Includes DB Migration (follow approval process in SIP-59)
  • Migration is atomic, supports rollback & is backwards-compatible
  • Confirm DB migration upgrade and downgrade tested
  • Runtime estimates and downtime expectations provided
• Introduces new feature or API
• Removes existing feature or API

[codecov]

Codecov Report

Merging #17260 (3bcf152) into 1.4 (5d43a59) will increase coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              1.4   #17260      +/-   ##
==========================================
+ Coverage   76.89%   76.93%   +0.04%     
==========================================
  Files        1030     1030              
  Lines       55085    55185     +100     
  Branches     7463     7497      +34     
==========================================
+ Hits        42356    42455      +99     
- Misses      12476    12479       +3     
+ Partials      253      251       -2     

Flag	Coverage Δ
hive	81.49% <ø> (ø)
javascript	70.86% <ø> (-0.07%)	⬇️
mysql	81.94% <ø> (ø)
postgres	81.95% <ø> (ø)
presto	81.82% <ø> (?)
python	82.46% <ø> (+0.15%)	⬆️
sqlite	81.63% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
superset-frontend/src/components/Select/Select.tsx	92.25% <ø> (-0.30%)	⬇️
...nativeFilters/FiltersConfigModal/Footer/Footer.tsx	90.90% <0.00%> (-9.10%)	⬇️
...nd/src/views/CRUD/data/dataset/AddDatasetModal.tsx	54.54% <0.00%> (-8.32%)	⬇️
...nd/src/components/ErrorMessage/BasicErrorAlert.tsx	95.23% <0.00%> (-4.77%)	⬇️
...et-frontend/src/components/TableSelector/index.tsx	74.52% <0.00%> (-3.03%)	⬇️
...onfigModal/FiltersConfigForm/FiltersConfigForm.tsx	71.60% <0.00%> (-2.23%)	⬇️
...erset-frontend/src/datasource/DatasourceEditor.jsx	72.10% <0.00%> (-1.75%)	⬇️
superset-frontend/src/reduxUtils.ts	69.76% <0.00%> (-1.67%)	⬇️
...rontend/src/components/ErrorMessage/ErrorAlert.tsx	92.59% <0.00%> (-1.53%)	⬇️
...-frontend/src/datasource/ChangeDatasourceModal.tsx	86.36% <0.00%> (-1.14%)	⬇️
... and 31 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d43a59...3bcf152. Read the comment docs.