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

Refactor publication list page to extend virtual page #813

Merged
merged 8 commits into from
Jan 6, 2023
Merged

Refactor publication list page to extend virtual page #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70f5aa1
PublicationListPage extends VirtualPage instead of BladePage
caendesilva Jan 6, 2023
1121656
Deprecate method for the child class
caendesilva Jan 6, 2023
1d535c0
Merge branch 'publications-feature' into refactor-publication-list-pa…
caendesilva Jan 6, 2023
1a76530
Construct the view parameter
caendesilva Jan 6, 2023
00f508f
Remove getSourcePath override
caendesilva Jan 6, 2023
f851ba7
Remove path information from list page
caendesilva Jan 6, 2023
e7963a4
Remove unnecessary property overrides matching parent
caendesilva Jan 6, 2023
95b9463
Expect source path to be index instead of schema.json
caendesilva Jan 6, 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
16 changes: 3 additions & 13 deletions packages/framework/src/Framework/Features/Publications/Models/PublicationListPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,25 @@
namespace Hyde\Framework\Features\Publications\Models;

use Hyde\Framework\Actions\PublicationPageCompiler;
use Hyde\Pages\BladePage;
use Hyde\Pages\Contracts\DynamicPage;
use Hyde\Pages\VirtualPage;

/**
* @see \Hyde\Pages\PublicationPage
* @see \Hyde\Framework\Testing\Feature\PublicationListPageTest
*/
class PublicationListPage extends BladePage implements DynamicPage
class PublicationListPage extends VirtualPage
{
public static string $sourceDirectory = '__publications';
public static string $outputDirectory = '';
public static string $fileExtension = 'json';

public PublicationType $type;

public function __construct(PublicationType $type)
{
$this->type = $type;

parent::__construct("{$type->getDirectory()}/index");
parent::__construct("{$type->getDirectory()}/index", view: $type->listTemplate);
}

public function compile(): string
{
return PublicationPageCompiler::call($this);
}

public function getSourcePath(): string
{
return $this->type->getDirectory().'/schema.json';
}
}
2 changes: 1 addition & 1 deletion packages/framework/tests/Feature/PageCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public function test_listing_pages_for_publications_are_discovered()

$this->assertInstanceOf(
PublicationListPage::class,
PageCollection::boot(Hyde::getInstance())->getPage('publication/schema.json')
PageCollection::boot(Hyde::getInstance())->getPage('publication/index')
);

File::deleteDirectory(Hyde::path('publication'));
Expand Down
2 changes: 1 addition & 1 deletion packages/framework/tests/Feature/PublicationListPageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function test_source_path_mappings()
$this->assertSame('test-publication/index', $page->getIdentifier());
$this->assertSame('test-publication/index', $page->getRouteKey());
$this->assertSame('test-publication/index.html', $page->getOutputPath());
$this->assertSame('test-publication/schema.json', $page->getSourcePath());
$this->assertSame('test-publication/index', $page->getSourcePath());

File::deleteDirectory(Hyde::path('test-publication'));
}
Expand Down