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

1008 misc misc fixes #1584

Merged
merged 3 commits into from
Jan 17, 2023
Merged

1008 misc misc fixes #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5e3117
added aria-labels and setup User Edit pop-up to be able to be read by…
nicholas-goodwin Jan 17, 2023
de1246f
Merge branch 'master' into 1008-Misc-Misc-fixes
nicholas-goodwin Jan 17, 2023
07b2b37
version bump
nicholas-goodwin Jan 17, 2023
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
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/access_group_live_view/edit_access_group_live_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ defmodule AndiWeb.AccessGroupLiveView.EditAccessGroupLiveView do
<div class="btn-group__standard">
<button type="submit" id="save-button" name="save-button" phx-click="access-group-form_save" class="btn btn--primary btn--large save-edit">Save</button>
<button type="button" class="btn btn--secondary btn--large cancel-edit" phx-click="cancel-edit">Discard Changes</button>
<button id="access-group-delete-button" class="btn btn--right btn--danger btn--delete" phx-click="prompt-access-group-delete" type="button">
<button aria-label="Delete" id="access-group-delete-button" class="btn btn--right btn--danger btn--delete" phx-click="prompt-access-group-delete" type="button">
<span class="delete-icon material-icons">delete</span>
Delete
</button>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/access_group_live_view/manage_datasets_modal.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule AndiWeb.AccessGroupLiveView.ManageDatasetsModal do
<div class="modal-form-container search-modal" x-trap="<%= @visibility === "visible" %>">
<div class="search-index__header">
<h1 class="search-index__title">Dataset Search</h1>
<button type="button" class="btn btn--transparent material-icons search-index__exit" phx-click="cancel-manage-datasets">close</button>
<button aria-label="Search Dataset Modal Close" type="button" class="btn btn--transparent material-icons search-index__exit" phx-click="cancel-manage-datasets">close</button>
</div>

<hr class="search-modal-divider">
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/access_group_live_view/manage_users_modal.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule AndiWeb.AccessGroupLiveView.ManageUsersModal do
<div class="modal-form-container search-modal" x-trap="<%= @visibility === "visible" %>">
<div class="search-index__header">
<h1 class="search-index__title">User Search</h1>
<button type="button" class="btn btn--transparent material-icons search-index__exit" phx-click="cancel-manage-users">close</button>
<button aria-label="Search User Modal Close" type="button" class="btn btn--transparent material-icons search-index__exit" phx-click="cancel-manage-users">close</button>
</div>

<hr class="search-modal-divider">
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/dataset_live_view/data_dictionary_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ defmodule AndiWeb.EditLiveView.DataDictionaryForm do
</div>
<div class="component-title full-width">
<h2 class="component-title-text component-title-text--<%= @visibility %> ">Data Dictionary</h2>
<button type="button" class="btn btn--right btn--transparent component-title-button">
<button aria-label="Data Dictionary <%= action %>" type="button" class="btn btn--right btn--transparent component-title-button">
<div class="component-title-action">
<div class="component-title-action-text--<%= @visibility %>"><%= action %></div>
<div class="component-title-icon--<%= @visibility %>"></div>
Expand Down
8 changes: 4 additions & 4 deletions apps/andi/lib/andi_web/live/dataset_live_view/edit_live_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,15 +361,15 @@ defmodule AndiWeb.EditLiveView do

defp render_review_buttons(:submitted) do
~E"""
<button id="delete-dataset-button" name="delete-dataset-button" class="btn btn--large btn--right btn--review btn--danger btn--delete" phx-click="dataset-delete" type="button">
<button aria-label="Delete" id="delete-dataset-button" name="delete-dataset-button" class="btn btn--large btn--right btn--review btn--danger btn--delete" phx-click="dataset-delete" type="button">
<span class="delete-icon material-icons">delete</span>
Delete
</button>
<button id="reject-button" name="reject-button" class="btn btn--review" type="button" phx-click="reject-dataset">
<button aria-label="Reject" id="reject-button" name="reject-button" class="btn btn--review" type="button" phx-click="reject-dataset">
<span class="reject-icon material-icons">clear</span>
REJECT
</button>
<button id="approve-button" name="approve-button" class="btn btn--review" type="button" phx-click="approve-for-publish">
<button aria-label="Approve" id="approve-button" name="approve-button" class="btn btn--review" type="button" phx-click="approve-for-publish">
<span class="approve-icon material-icons">check</span>
APPROVE & PUBLISH
</button>
Expand All @@ -378,7 +378,7 @@ defmodule AndiWeb.EditLiveView do

defp render_review_buttons(_) do
~E"""
<button id="delete-dataset-button" name="delete-dataset-button" class="btn btn--right btn--large btn--review btn--danger btn--delete" phx-click="dataset-delete" type="button">
<button aria-label="Delete" id="delete-dataset-button" name="delete-dataset-button" class="btn btn--right btn--large btn--review btn--danger btn--delete" phx-click="dataset-delete" type="button">
<span class="delete-icon material-icons">delete</span>
Delete
</button>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/dataset_live_view/metadata_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ defmodule AndiWeb.EditLiveView.MetadataForm do

<div class="component-title full-width">
<h2 class="component-title-text component-title-text--<%= @visibility %>">Enter Metadata</h2>
<button type="button" class="btn btn--right btn--transparent component-title-button">
<button aria-label="Metadata <%= action %>" type="button" class="btn btn--right btn--transparent component-title-button">
<div class="component-title-action">
<div class="component-title-action-text--<%= @visibility %>"><%= action %></div>
<div class="component-title-icon--<%= @visibility %>"></div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/ingestion_live_view/data_dictionary/data_dictionary_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ defmodule AndiWeb.IngestionLiveView.DataDictionaryForm do
</div>
<div class="component-title full-width">
<h2 class="component-title-text component-title-text--<%= @visibility %> ">Ingestion Schema</h2>
<button type="button" class="btn btn--right btn--transparent component-title-button">
<button aria-label="Ingestion Schema <%= action %>" type="button" class="btn btn--right btn--transparent component-title-button">
<div class="component-title-action">
<div class="component-title-action-text--<%= @visibility %>"><%= action %></div>
<div class="component-title-icon--<%= @visibility %>"></div>
Expand Down
8 changes: 4 additions & 4 deletions apps/andi/lib/andi_web/live/ingestion_live_view/edit_ingestion_live_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ defmodule AndiWeb.IngestionLiveView.EditIngestionLiveView do
<button id="save-button" name="save-button" class="btn btn--primary-outline btn--save btn--large" type="button" phx-click="save">Save Draft Ingestion</button>
<button type="button" class="btn btn--secondary btn--large btn--cancel" phx-click="cancel-edit">Discard Changes</button>

<button id="ingestion-delete-button" class="btn btn--large btn--right btn--danger btn--delete" phx-click="prompt-ingestion-delete" type="button">
<span class="delete-icon material-icons">delete</span>
Delete
</button>
<button aria-label="Delete" id="ingestion-delete-button" class="btn btn--large btn--right btn--danger btn--delete" phx-click="prompt-ingestion-delete" type="button">
<span class="delete-icon material-icons">delete</span>
Delete
</button>
</div>


Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/ingestion_live_view/extract_steps/extract_step_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ defmodule AndiWeb.IngestionLiveView.ExtractSteps.ExtractStepForm do
</div>
<div class="component-title full-width">
<h2 class="component-title-text component-title-text--<%= @visibility %> ">Configure Ingest Steps</h2>
<button type="button" class="btn btn--right btn--transparent component-title-button">
<button aria-label="Configure Ingest Steps <%= action %>" type="button" class="btn btn--right btn--transparent component-title-button">
<div class="component-title-action">
<div class="component-title-action-text--<%= @visibility %>"><%= action %></div>
<div class="component-title-icon--<%= @visibility %>"></div>
Expand Down
24 changes: 12 additions & 12 deletions apps/andi/lib/andi_web/live/ingestion_live_view/finalize/finalize_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ defmodule AndiWeb.IngestionLiveView.FinalizeForm do
</div>
<div class="component-title full-width">
<h2 class="component-title-text component-title-text--<%= @visibility %> ">Finalize</h2>
<button type="button" class="btn btn--right btn--transparent component-title-button">
<button aria-label="Finalize <%= action %>" type="button" class="btn btn--right btn--transparent component-title-button">
<div class="component-title-action">
<div class="component-title-action-text--<%= @visibility %>"><%= action %></div>
<div class="component-title-icon--<%= @visibility %>"></div>
Expand Down Expand Up @@ -99,11 +99,11 @@ defmodule AndiWeb.IngestionLiveView.FinalizeForm do
<h4>Quick Schedule</h4>

<div class="finalize-form__quick-schedule">
<button type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="hourly" >Hourly</button>
<button type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="daily">Daily</button>
<button type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="weekly">Weekly</button>
<button type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="monthly">Monthly</button>
<button type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="yearly">Yearly</button>
<button aria-label="Quick Schedule Hourly" type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="hourly" >Hourly</button>
<button aria-label="Quick Schedule Daily" type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="daily">Daily</button>
<button aria-label="Quick Schedule Weekly" type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="weekly">Weekly</button>
<button aria-label="Quick Schedule Monthly" type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="monthly">Monthly</button>
<button aria-label="Quick Schedule Yearly" type="button" class="finalize-form-cron-button" phx-click="quick_schedule" phx-value-schedule="yearly">Yearly</button>
</div>

<div class="finalize-form__help-link">
Expand All @@ -113,27 +113,27 @@ defmodule AndiWeb.IngestionLiveView.FinalizeForm do
<div class="finalize-form__schedule-input">
<div class="finalize-form__schedule-input-field">
<label for="finalize-form-schedule-input__second">Second</label>
<input id="finalize-form-schedule-input__second" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="second" value="<%= @crontab_list[:second] %>" />
<input aria-label="Cron Schedule Second" id="finalize-form-schedule-input__second" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="second" value="<%= @crontab_list[:second] %>" />
</div>
<div class="finalize-form__schedule-input-field">
<label for="finalize-form-schedule-input__minute">Minute</label>
<input id="finalize-form-schedule-input__minute" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="minute" value="<%= @crontab_list[:minute] %>" />
<input aria-label="Cron Schedule Minute" id="finalize-form-schedule-input__minute" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="minute" value="<%= @crontab_list[:minute] %>" />
</div>
<div class="finalize-form__schedule-input-field">
<label for="finalize-form-schedule-input__hour">Hour</label>
<input id="finalize-form-schedule-input__hour" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="hour" value="<%= @crontab_list[:hour] %>" />
<input aria-label="Cron Schedule Hour" id="finalize-form-schedule-input__hour" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="hour" value="<%= @crontab_list[:hour] %>" />
</div>
<div class="finalize-form__schedule-input-field">
<label for="finalize-form-schedule-input__day">Day</label>
<input id="finalize-form-schedule-input__day" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="day" value="<%= @crontab_list[:day] %>" />
<input aria-label="Cron Schedule Day" id="finalize-form-schedule-input__day" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="day" value="<%= @crontab_list[:day] %>" />
</div>
<div class="finalize-form__schedule-input-field">
<label for="finalize-form-schedule-input__month">Month</label>
<input id="finalize-form-schedule-input__month" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="month" value="<%= @crontab_list[:month] %>" />
<input aria-label="Cron Schedule Month" id="finalize-form-schedule-input__month" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="month" value="<%= @crontab_list[:month] %>" />
</div>
<div class="finalize-form__schedule-input-field">
<label for="finalize-form-schedule-input__week">Week</label>
<input id="finalize-form-schedule-input__week" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="week" value="<%= @crontab_list[:week] %>" />
<input aria-label="Cron Schedule Week" id="finalize-form-schedule-input__week" class="finalize-form-schedule-input__field" phx-keyup="set_schedule" phx-value-input-field="week" value="<%= @crontab_list[:week] %>" />
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/ingestion_live_view/metadata/select_dataset_modal.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defmodule AndiWeb.IngestionLiveView.SelectDatasetModal do
<div class="modal-form-container search-modal" x-trap="<%= @visibility === "visible" %>">
<div class="search-index__header">
<h2 class="search-index__title">Dataset Search</h2>
<button id="close-select-dataset-modal" type="button" class="btn btn--transparent material-icons search-index__exit" phx-click="cancel-dataset-search" phx-target="<%= @myself %>" >close</span>
<button aria-label="Search Dataset Modal Close" id="close-select-dataset-modal" type="button" class="btn btn--transparent material-icons search-index__exit" phx-click="cancel-dataset-search" phx-target="<%= @myself %>" >close</span>
</div>

<hr class="search-modal-divider">
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/ingestion_live_view/transformations/transformations_step.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ defmodule AndiWeb.IngestionLiveView.Transformations.TransformationsStep do
</div>
<div class="component-title full-width">
<h2 class="component-title-text component-title-text--<%= @visibility %> ">Transformations</h2>
<button type="button" class="btn btn--right btn--transparent component-title-button">
<button aria-label="Transformations <%= action %>" type="button" class="btn btn--right btn--transparent component-title-button">
<div class="component-title-action">
<div class="component-title-action-text--<%= @visibility %>"><%= action %></div>
<div class="component-title-icon--<%= @visibility %>"></div>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/shared_components/confirm_delete_modal.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ defmodule AndiWeb.ConfirmDeleteModal do
<br>
<div class="button-container">
<button id="confirm-cancel-button" type="button" class="btn btn--cancel" phx-click="delete-canceled">Cancel</button>
<button id="confirm-delete-button" type="button" class="btn btn--danger btn--delete" phx-click="delete-confirmed" phx-value-id=<%= @id %>>
<button aria-label="Delete" id="confirm-delete-button" type="button" class="btn btn--danger btn--delete" phx-click="delete-confirmed" phx-value-id=<%= @id %>>
<span class="delete-icon material-icons">delete</span>
Delete
</button>
Expand Down
2 changes: 1 addition & 1 deletion apps/andi/lib/andi_web/live/user_live_view/edit_user_live_view.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ defmodule AndiWeb.UserLiveView.EditUserLiveView do
<div id="edit-page-snackbar" phx-hook="showSnackbar">
<div style="display: none;"><%= @click_id %></div>
<%= if @success do %>
<div id="snackbar" class="success-message"><%= @success_message %></div>
<p id="snackbar" class="success-message" tabindex="0"><%= @success_message %></p>
<% end %>
</div>

Expand Down
2 changes: 1 addition & 1 deletion apps/andi/mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Andi.MixProject do
def project do
[
app: :andi,
version: "2.5.41",
version: "2.5.42",
build_path: "../../_build",
config_path: "../../config/config.exs",
deps_path: "../../deps",
Expand Down