From 2fd58e6b1cb7aaf47469c1931f9660ceb13a12a9 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 9 Sep 2021 08:00:42 -0400 Subject: [PATCH 1/2] Add bracketSameLine configuration --- client/prettier.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/prettier.config.js b/client/prettier.config.js index 5fb801d1631..df792433737 100644 --- a/client/prettier.config.js +++ b/client/prettier.config.js @@ -1,4 +1,5 @@ module.exports = { tabWidth: 4, - printWidth: 120 + printWidth: 120, + bracketSameLine: true }; From 5396bb15fe8cfcf2e89d46c1d061c49b60e2f0b1 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 23 Nov 2021 20:52:13 -0500 Subject: [PATCH 2/2] Rerun prettier, handling dangling brackets --- client/src/components/Annotation.vue | 6 +- client/src/components/Citation/Citations.vue | 9 +- client/src/components/ClickToEdit.vue | 6 +- .../Collections/ListCollectionCreator.vue | 12 +- .../Collections/PairCollectionCreator.vue | 9 +- .../PairedListCollectionCreator.vue | 45 +++---- .../Collections/common/ClickToEdit.vue | 3 +- .../Collections/common/CollectionCreator.vue | 15 +-- .../Collections/common/CollectionEditView.vue | 3 +- .../Collections/common/DatabaseEditTab.vue | 6 +- .../common/SuitableConvertersTab.vue | 6 +- client/src/components/Common/DelayedInput.vue | 6 +- client/src/components/Common/SlugInput.vue | 3 +- .../src/components/DataDialog/DataDialog.vue | 9 +- .../Dataset/DatasetIndex/DatasetIndex.vue | 3 +- client/src/components/Dataset/DatasetName.vue | 9 +- .../DatasetInformation/DatasetAttributes.vue | 3 +- .../DatasetInformation/DatasetError.vue | 15 +-- .../DatasetSourceTransform.vue | 3 +- .../src/components/Details/DatasetDetails.vue | 12 +- .../components/FilesDialog/FilesDialog.vue | 9 +- .../Form/Elements/FormDirectory.vue | 6 +- client/src/components/Form/FormCard.vue | 3 +- client/src/components/Form/FormDisplay.vue | 3 +- client/src/components/Form/FormElement.vue | 3 +- client/src/components/Form/FormInputs.vue | 15 +-- client/src/components/GalaxyLoader.vue | 3 +- .../src/components/History/ContentFilters.vue | 9 +- .../History/ContentItem/Dataset/Dataset.vue | 3 +- .../ContentItem/Dataset/DatasetMenu.vue | 36 ++--- .../History/ContentItem/Dataset/DatasetUI.vue | 24 ++-- .../DatasetCollection/DatasetCollection.vue | 3 +- .../ContentItem/DatasetCollection/DscMenu.vue | 6 +- .../ContentItem/DatasetCollection/DscUI.vue | 18 +-- .../DatasetCollectionContents.vue | 6 +- .../DatasetCollectionUIWrapper.vue | 3 +- .../GenericContentItem/DatasetUIWrapper.vue | 3 +- .../History/ContentItem/Subdataset.vue | 3 +- .../components/History/ContentOperations.vue | 33 ++--- .../History/CurrentCollection/Details.vue | 6 +- .../History/CurrentCollection/Panel.vue | 12 +- .../History/CurrentCollection/TopNav.vue | 6 +- .../History/CurrentHistoryPanel.vue | 3 +- client/src/components/History/EditorMenu.vue | 12 +- .../src/components/History/HistoriesMenu.vue | 9 +- client/src/components/History/History.vue | 18 +-- .../src/components/History/HistoryDetails.vue | 9 +- .../components/History/HistoryDropdown.vue | 3 +- client/src/components/History/HistoryMenu.vue | 9 +- .../src/components/History/HistoryPanel.vue | 6 +- .../components/History/HistorySelector.vue | 3 +- .../History/HistorySelectorModal.vue | 3 +- client/src/components/History/Scroller.vue | 6 +- client/src/components/History/StatusIcon.vue | 3 +- .../components/HistoryExport/ExportLink.vue | 6 +- .../src/components/HistoryExport/ToLink.vue | 3 +- .../components/HistoryExport/ToRemoteFile.vue | 6 +- client/src/components/HistoryImport.vue | 6 +- client/src/components/HistoryView.vue | 3 +- client/src/components/IconButton.vue | 3 +- .../InteractiveTools/InteractiveTools.vue | 6 +- .../src/components/JobInformation/CodeRow.vue | 3 +- .../JobInformation/JobInformation.vue | 6 +- .../JobStates/CollectionJobStates.vue | 3 +- .../components/Libraries/LibrariesList.vue | 33 ++--- .../components/Libraries/LibraryEditField.vue | 3 +- .../Libraries/LibraryFolder/LibraryFolder.vue | 63 +++------ .../LibraryFolderDatasetPermissions.vue | 15 +-- .../LibraryFolderPermissions.vue | 12 +- .../Libraries/LibraryFolder/SearchField.vue | 3 +- .../LibraryFolder/TopToolbar/FolderTopBar.vue | 36 ++--- .../LibraryPermissions/LibraryPermissions.vue | 12 +- .../PermissionsInputField.vue | 3 +- .../CollectionDisplay.vue | 6 +- .../Elements/HistoryDatasetDisplay.vue | 21 +-- .../Markdown/Elements/HistoryDatasetLink.vue | 3 +- .../Elements/Workflow/WorkflowDisplay.vue | 6 +- client/src/components/Markdown/Markdown.vue | 18 +-- .../components/Markdown/MarkdownDialog.vue | 21 +-- .../components/Markdown/MarkdownEditor.vue | 6 +- .../components/Markdown/MarkdownSelector.vue | 3 +- .../components/Markdown/MarkdownToolBox.vue | 12 +- .../Markdown/MarkdownVisualization.vue | 6 +- client/src/components/Masthead/Masthead.vue | 3 +- .../src/components/Masthead/MastheadItem.vue | 9 +- .../NewUserWelcome/NewUserWelcome.vue | 3 +- .../NewUserWelcome/components/Subtopics.vue | 3 +- .../NewUserWelcome/components/Topics.vue | 3 +- .../src/components/PageEditor/PageEditor.vue | 3 +- .../components/PageEditor/PageEditorHtml.vue | 6 +- .../PageEditor/PageEditorMarkdown.vue | 9 +- .../Panels/Buttons/FavoritesButton.vue | 3 +- .../Panels/Buttons/PanelViewButton.vue | 12 +- .../Panels/Buttons/PanelViewMenuItem.vue | 3 +- client/src/components/Panels/Common/Tool.vue | 6 +- .../Panels/Common/ToolPanelLabel.vue | 3 +- .../components/Panels/Common/ToolSection.vue | 9 +- .../Panels/ProviderAwareToolBox.vue | 6 +- .../Panels/ProviderAwareToolBoxWorkflow.vue | 6 +- client/src/components/Panels/SidePanel.vue | 3 +- client/src/components/Panels/ToolBox.vue | 9 +- .../src/components/Panels/ToolBoxWorkflow.vue | 18 +-- client/src/components/PluginList.vue | 9 +- .../components/RuleBuilder/ColumnSelector.vue | 3 +- .../RuleBuilder/RegularExpressionInput.vue | 3 +- .../RuleBuilder/SavedRulesSelector.vue | 3 +- .../src/components/RuleCollectionBuilder.vue | 126 ++++++------------ client/src/components/RulesDisplay.vue | 6 +- .../components/SchemaOrg/CreatorEditor.vue | 3 +- .../components/SchemaOrg/OrganizationForm.vue | 6 +- .../SchemaOrg/OrganizationViewer.vue | 6 +- .../src/components/SchemaOrg/PersonForm.vue | 6 +- .../src/components/SchemaOrg/PersonViewer.vue | 6 +- .../SelectionDialog/BasicSelectionDialog.vue | 6 +- .../SelectionDialog/DataDialogTable.vue | 12 +- .../DatasetCollectionDialog.vue | 6 +- .../SelectionDialog/SelectionDialog.vue | 3 +- client/src/components/Sharing/Sharing.vue | 27 ++-- client/src/components/Tags/StatelessTags.vue | 6 +- client/src/components/Tags/Tags.vue | 3 +- client/src/components/Tool/ToolCard.vue | 15 +-- client/src/components/Tool/ToolFooter.vue | 12 +- client/src/components/Tool/ToolForm.vue | 21 +-- .../components/Tool/ToolSourceMenuItem.vue | 3 +- client/src/components/ToolsView/ToolsView.vue | 9 +- client/src/components/Toolshed/Index.vue | 3 +- .../Toolshed/InstalledList/Index.vue | 3 +- .../Toolshed/InstalledList/Monitor.vue | 6 +- .../Toolshed/RepositoryDetails/Index.vue | 6 +- .../InstallationSettings.vue | 6 +- .../Toolshed/SearchList/Categories.vue | 3 +- .../components/Toolshed/SearchList/Index.vue | 9 +- .../Toolshed/SearchList/ServerSelection.vue | 3 +- client/src/components/Upload/Collection.vue | 27 ++-- client/src/components/Upload/Composite.vue | 6 +- client/src/components/Upload/Default.vue | 24 ++-- client/src/components/Upload/RulesInput.vue | 9 +- client/src/components/Upload/UploadButton.vue | 6 +- client/src/components/Upload/UploadModal.vue | 6 +- .../components/Upload/UploadModalContent.vue | 3 +- .../components/User/CloudAuth/CloudAuth.vue | 15 +-- .../User/CloudAuth/CloudAuthItem.vue | 12 +- .../User/CloudAuth/CredentialConfig.vue | 6 +- .../User/CloudAuth/CredentialForm.vue | 15 +-- client/src/components/User/CustomBuilds.vue | 21 +-- .../ExternalIdentities/ExternalIdentities.vue | 9 +- .../User/ExternalIdentities/ExternalLogin.vue | 6 +- .../src/components/User/RecentInvocations.vue | 3 +- .../src/components/User/UserPreferences.vue | 6 +- .../components/Workflow/Editor/Attributes.vue | 3 +- .../Workflow/Editor/Forms/FormDefault.vue | 15 +-- .../Workflow/Editor/Forms/FormOutput.vue | 27 ++-- .../Workflow/Editor/Forms/FormOutputLabel.vue | 3 +- .../Workflow/Editor/Forms/FormSection.vue | 9 +- .../Workflow/Editor/Forms/FormTool.vue | 12 +- .../src/components/Workflow/Editor/Index.vue | 33 ++--- .../src/components/Workflow/Editor/Lint.vue | 21 +-- .../Workflow/Editor/LintSection.vue | 3 +- .../Workflow/Editor/MessagesModal.vue | 3 +- .../src/components/Workflow/Editor/Node.vue | 21 +-- .../components/Workflow/Editor/NodeOutput.vue | 3 +- .../components/Workflow/Editor/Options.vue | 15 +-- .../Workflow/Editor/ZoomControl.vue | 9 +- .../src/components/Workflow/Invocations.vue | 15 +-- .../components/Workflow/Run/WorkflowRun.vue | 6 +- .../Workflow/Run/WorkflowRunDefaultStep.vue | 3 +- .../Workflow/Run/WorkflowRunForm.vue | 12 +- .../Workflow/Run/WorkflowRunSuccess.vue | 3 +- .../Workflow/Run/WorkflowRunToolStep.vue | 3 +- client/src/components/Workflow/TrsImport.vue | 3 +- client/src/components/Workflow/TrsSearch.vue | 3 +- .../Workflow/TrsServerSelection.vue | 3 +- client/src/components/Workflow/TrsTool.vue | 3 +- .../components/Workflow/WorkflowDropdown.vue | 3 +- .../src/components/Workflow/WorkflowList.vue | 12 +- .../WorkflowInvocationDetails.vue | 6 +- .../WorkflowInvocationState.vue | 21 +-- .../WorkflowInvocationStep.vue | 26 ++-- .../components/admin/ActiveInvocations.vue | 3 +- client/src/components/admin/BaseList.vue | 6 +- .../admin/DataManager/DataManager.vue | 12 +- .../admin/DataManager/DataManagerJob.vue | 9 +- .../admin/DataManager/DataManagerJobs.vue | 12 +- .../admin/DataManager/DataManagerTable.vue | 6 +- client/src/components/admin/DataTables.vue | 3 +- client/src/components/admin/DataTypes.vue | 3 +- .../admin/Dependencies/ContainerIndex.vue | 18 +-- .../ContainerResolutionDetails.vue | 3 +- .../admin/Dependencies/ResolutionDetails.vue | 3 +- .../admin/Dependencies/ResolutionIndex.vue | 12 +- .../admin/Dependencies/UnusedIndex.vue | 3 +- .../components/admin/DisplayApplications.vue | 3 +- client/src/components/admin/Jobs.vue | 21 +-- client/src/components/admin/ResetMetadata.vue | 3 +- client/src/components/login/Index.vue | 3 +- client/src/components/login/Register.vue | 3 +- 196 files changed, 622 insertions(+), 1240 deletions(-) diff --git a/client/src/components/Annotation.vue b/client/src/components/Annotation.vue index 4cde03e7d99..5c4ccef7a23 100644 --- a/client/src/components/Annotation.vue +++ b/client/src/components/Annotation.vue @@ -7,8 +7,7 @@ v-b-tooltip.hover="{ boundary: 'viewport', placement: tooltipPlacement }" :title="'Edit annotation...' | localize" :placeholder="'Edit annotation...' | localize" - v-slot="{ toggleEdit, placeholder, stateValidator }" - > + v-slot="{ toggleEdit, placeholder, stateValidator }"> + :state="stateValidator(inputScope.value, annotation)"> diff --git a/client/src/components/Citation/Citations.vue b/client/src/components/Citation/Citations.vue index b65406d7736..26dac5deb21 100644 --- a/client/src/components/Citation/Citations.vue +++ b/client/src/components/Citation/Citations.vue @@ -26,8 +26,7 @@ :citation="citation" :output-format="outputFormat" v-for="(citation, index) in citations" - :key="index" - /> + :key="index" />
@@ -38,16 +37,14 @@ @show="$emit('show')" @shown="$emit('shown')" @hide="$emit('hide')" - @hidden="$emit('hidden')" - > + @hidden="$emit('hidden')"> + :key="index" />
diff --git a/client/src/components/ClickToEdit.vue b/client/src/components/ClickToEdit.vue index af92b9b9566..71a4d0d9bd5 100644 --- a/client/src/components/ClickToEdit.vue +++ b/client/src/components/ClickToEdit.vue @@ -11,8 +11,7 @@ :toggleEdit="toggleEdit" :editing="editing" :placeholder="placeholder" - :stateValidator="stateValidator" - > + :stateValidator="stateValidator"> diff --git a/client/src/components/Collections/ListCollectionCreator.vue b/client/src/components/Collections/ListCollectionCreator.vue index fb0116508d4..2f9acfc8c3e 100644 --- a/client/src/components/Collections/ListCollectionCreator.vue +++ b/client/src/components/Collections/ListCollectionCreator.vue @@ -65,8 +65,7 @@ :oncancel="oncancel" :hide-source-items="hideSourceItems" @onUpdateHideSourceItems="onUpdateHideSourceItems" - @clicked-create="clickedCreate" - > + @clicked-create="clickedCreate"> diff --git a/client/src/components/Collections/PairCollectionCreator.vue b/client/src/components/Collections/PairCollectionCreator.vue index fd3727dd36d..eb3517d4393 100644 --- a/client/src/components/Collections/PairCollectionCreator.vue +++ b/client/src/components/Collections/PairCollectionCreator.vue @@ -82,8 +82,7 @@ @onUpdateHideSourceItems="onUpdateHideSourceItems" @clicked-create="clickedCreate" @remove-extensions-toggle="removeExtensionsToggle" - :suggested-name="initialSuggestedName" - > + :suggested-name="initialSuggestedName">