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

Jump to bottom

Related Resources refactor and External Link scope #327

Merged
merged 16 commits into from
Sep 26, 2023
Merged

Related Resources refactor and External Link scope #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
922a2d1
Unscope RelatedResource from Sidebar
jeffdaley Sep 6, 2023
2cc4945
Improvements to Link-scoped modal
jeffdaley Sep 7, 2023
05240f2
Refactor Edit modal
jeffdaley Sep 7, 2023
590a581
Add submit function to strict "Add" form
jeffdaley Sep 7, 2023
d61825a
Move types to shared component
jeffdaley Sep 7, 2023
e5d57e3
Improve validation
jeffdaley Sep 7, 2023
4fce99f
Remove `pauseTest`
jeffdaley Sep 7, 2023
e30efd9
Remove redundant test
jeffdaley Sep 7, 2023
75f08be
Remove empty state; Tests and fixes
jeffdaley Sep 7, 2023
9306c39
Refactor Add/Edit modal
jeffdaley Sep 7, 2023
dedf7e8
Test selector cleanup
jeffdaley Sep 7, 2023
e8558fc
Cleanup
jeffdaley Sep 7, 2023
23c2078
Remove comment
jeffdaley Sep 7, 2023
925d7ed
Improve animation
jeffdaley Sep 8, 2023
d2b3399
Merge branch 'main' into jeffdaley/related-resources
jeffdaley Sep 26, 2023
f399aca
Remove unnecessary comment
jeffdaley Sep 26, 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
1 change: 0 additions & 1 deletion web/app/components/document/sidebar.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@
@documentIsDraft={{this.isDraft}}
@productArea={{@document.product}}
@objectID={{@document.objectID}}
@allowAddingExternalLinks={{true}}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now the default setting.

@headerTitle="Related resources"
@modalHeaderTitle="Add related resource"
@modalInputPlaceholder="Search docs or paste a URL..."
Expand Down
115 changes: 56 additions & 59 deletions web/app/components/document/sidebar/related-resources.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,58 @@
<Document::Sidebar::SectionHeader
{{did-insert (perform this.loadRelatedResources)}}
@title={{@headerTitle}}
@titleTooltipText={{this.titleTooltipText}}
@badgeText="New"
@buttonIsHidden={{this.sectionHeaderButtonIsHidden}}
@buttonAction={{this.showAddResourceModal}}
/>

{{#if this.loadRelatedResources.isRunning}}
<div class="h-[26px] pt-1.5">
<FlightIcon data-test-related-resources-list-loading-icon @name="loading" />
</div>
{{else if this.loadingHasFailed}}
<div class="h-16">
<div class="failed-to-load-text">
Failed to load
</div>
<Hds::Button
data-test-related-resources-error-button
@color="secondary"
@size="small"
@text="Retry"
@icon="reload"
{{on "click" (perform this.loadRelatedResources)}}
<RelatedResources
@items={{this.relatedResources}}
@isLoading={{this.loadRelatedResources.isRunning}}
@loadingHasFailed={{this.loadingHasFailed}}
@modalHeaderTitle={{@modalHeaderTitle}}
@modalInputPlaceholder={{@modalInputPlaceholder}}
@addResource={{this.addResource}}
@documentObjectID={{@objectID}}
>
<:header as |rr|>
<Document::Sidebar::SectionHeader
{{did-insert (perform this.loadRelatedResources)}}
@title={{@headerTitle}}
@titleTooltipText={{this.titleTooltipText}}
@badgeText="New"
@buttonIsHidden={{this.sectionHeaderButtonIsHidden}}
@buttonAction={{rr.showModal}}
/>
</div>
{{else}}
<Document::Sidebar::RelatedResources::List
@items={{this.relatedResources}}
@itemLimit={{@itemLimit}}
>
<:resource as |r|>
<Document::Sidebar::RelatedResources::ListItem
@resource={{r}}
@removeResource={{this.removeResource}}
@editResource={{this.editResource}}
@editingIsDisabled={{@editingIsDisabled}}
</:header>
<:list-loading>
<div class="h-[26px] pt-1.5">
<FlightIcon
data-test-related-resources-list-loading-icon
@name="loading"
/>
</div>
</:list-loading>
<:list as |rr|>
<Document::Sidebar::RelatedResources::List
@items={{rr.items}}
@itemLimit={{@itemLimit}}
>
<:resource as |r|>
<Document::Sidebar::RelatedResources::ListItem
@resource={{r}}
@removeResource={{this.removeResource}}
@editResource={{this.editResource}}
@editingIsDisabled={{@editingIsDisabled}}
/>
</:resource>
</Document::Sidebar::RelatedResources::List>
</:list>
<:list-error>
<div class="h-16">
<div class="failed-to-load-text">
Failed to load
</div>
<Hds::Button
data-test-related-resources-error-button
@color="secondary"
@size="small"
@text="Retry"
@icon="reload"
{{on "click" (perform this.loadRelatedResources)}}
/>
</:resource>
</Document::Sidebar::RelatedResources::List>
{{/if}}

{{#if this.addResourceModalIsShown}}
<Document::Sidebar::RelatedResources::Add
@headerTitle={{@modalHeaderTitle}}
@inputPlaceholder={{@modalInputPlaceholder}}
@onClose={{this.hideAddResourceModal}}
@addResource={{this.addResource}}
@algoliaResults={{this.algoliaResults}}
@objectID={{@objectID}}
@relatedDocuments={{this.relatedDocuments}}
@relatedLinks={{this.relatedLinks}}
@allowAddingExternalLinks={{@allowAddingExternalLinks}}
@search={{perform this.search}}
@getObject={{perform this.getObject}}
@resetAlgoliaResults={{this.resetAlgoliaResults}}
@searchErrorIsShown={{this.searchErrorIsShown}}
@searchIsRunning={{this.search.isRunning}}
/>
{{/if}}
</div>
</:list-error>
</RelatedResources>
Loading