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.

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

Use-folder-content-update #87

Merged
merged 16 commits into from
Jan 9, 2024
Merged

Conversation

anthonie-kramer
Copy link
Contributor

@anthonie-kramer anthonie-kramer commented Jan 4, 2024

  • updates the layout functions to use Program Requirements
  • pulls content catalog and config from the Program Requirement
  • removed some code duplication through shared methods in ContentManagement

These are already running in test mode here:
https://hypar.io/workflows/b4d06b1b-42d7-4718-9453-3f3af8910980?view=b09eebe9-9857-4fcf-92e4-e4173e928289


This change is Reviewable

Copy link
Member

@andrewheumann andrewheumann left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 7 files at r1, 55 of 55 files at r2, all commit messages.
Reviewable status: 1 change requests, 0 of 1 approvals obtained, 3 unresolved discussions (waiting on @anthonie-kramer)


LayoutFunctions/LayoutFunctionCommon/ContentManagement.cs line 73 at r2 (raw file):

        }

        public static SpaceConfiguration GetSpaceConfiguration(Dictionary<string, Model> inputModels, string configJsonPath, string programName)

as discussed — I think we should move the concrete ProgramRequirement.cs back out of LayoutFunctionCommonand make thisGetSpaceConfiguration`, to avoid deserialization issues w/ element types in external packages. I just don't feel like I trust the hacks to force those things to load.


LayoutFunctions/LayoutFunctionCommon/LayoutStrategies.cs line 186 at r2 (raw file):

            // ContentCatalogRetrieval.SetCatalogFilePath(catalogPath);
            // var configJson = configurationsPath != null ? File.ReadAllText(configurationsPath) : "{}";
            // var configs = JsonConvert.DeserializeObject<SpaceConfiguration>(configJson);

here and elsewhere, I think it's reasonable to just delete this code instead of leaving it here commented out.


LayoutFunctions/PhoneBoothLayout/6ddde416-c7e7-46cf-8fa0-8c5b1d268dd3.zip line 0 at r2 (raw file):
I think this file wasn't meant to be checked in — looks like an aborted build for publish?

Copy link
Member

@andrewheumann andrewheumann left a comment

Choose a reason for hiding this comment

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

Reviewed 53 of 53 files at r3, all commit messages.
Reviewable status: :shipit: complete! 1 of 1 approvals obtained, all discussions resolved

Copy link
Contributor Author

@anthonie-kramer anthonie-kramer left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 1 of 1 approvals obtained, all discussions resolved


LayoutFunctions/LayoutFunctionCommon/ContentManagement.cs line 73 at r2 (raw file):

Previously, andrewheumann (Andrew Heumann) wrote…

as discussed — I think we should move the concrete ProgramRequirement.cs back out of LayoutFunctionCommonand make thisGetSpaceConfiguration`, to avoid deserialization issues w/ element types in external packages. I just don't feel like I trust the hacks to force those things to load.

done.


LayoutFunctions/LayoutFunctionCommon/LayoutStrategies.cs line 186 at r2 (raw file):

Previously, andrewheumann (Andrew Heumann) wrote…

here and elsewhere, I think it's reasonable to just delete this code instead of leaving it here commented out.

done.


LayoutFunctions/PhoneBoothLayout/6ddde416-c7e7-46cf-8fa0-8c5b1d268dd3.zip line at r2 (raw file):

Previously, andrewheumann (Andrew Heumann) wrote…

I think this file wasn't meant to be checked in — looks like an aborted build for publish?

done.

@anthonie-kramer anthonie-kramer merged commit 63efe48 into master Jan 9, 2024
1 check passed
@anthonie-kramer anthonie-kramer deleted the use-folder-content-update branch January 9, 2024 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants