-
Notifications
You must be signed in to change notification settings - Fork 25
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
Feat (remote assets): handle asset pack containing asset overrides #2408
Open
jfmcquade
wants to merge
16
commits into
master
Choose a base branch
from
feat/remote-assets
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
d346c6c
test: add asset overrides to remote asset test cases
jfmcquade 57419de
wip: handle asset overrides in remote assets
jfmcquade a13840a
Merge branch 'master' into feat/remote-assets
jfmcquade 8f97e82
chore: code tidy
jfmcquade cc91657
chore: code tidy
jfmcquade b4720ef
chore: code tidy
jfmcquade da135b2
Merge branch 'master' into feat/remote-assets
jfmcquade 2146b3b
test: update remote-asset service tests
jfmcquade d0ffbc8
chore: handle override assets on web platform
jfmcquade c3e7134
chore: handle overrides on native devices
jfmcquade 1787876
Merge branch 'master' into feat/remote-assets
jfmcquade b0fa959
Merge branch 'master' into feat/remote-assets
esmeetewinkel 025c53a
Merge branch 'master' into feat/remote-assets
chrismclarke 5fdf023
chore: code tidying
chrismclarke c81991d
fix: test
chrismclarke 0737092
fix: tests
chrismclarke File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
// TODO - can likely refactor to here instead and refactor other imports | ||
import type { IContentsEntry } from "shared"; | ||
|
||
/** Extend to include fields for front-end features */ | ||
interface IAssetContentsEntry extends IContentsEntry { | ||
/** | ||
* Stores one of the following: | ||
* 1. For core assets: Specific path to file when not the same as relativePath, e.g. asset overrides | ||
* 2. For remote assets, on native devices: The path to the local file in native storage | ||
* 3. For remote assets, on web: The public URL for the remotely hosted file (in supabase storage) | ||
* */ | ||
filePath?: string; | ||
} | ||
|
||
export type IAssetContentsEntryMinimal = Omit<IAssetContentsEntry, "relativePath" | "modifiedTime">; | ||
|
||
export interface IAssetOverrideProps { | ||
themeName: string; | ||
languageCode: string; | ||
} | ||
|
||
export interface IAssetEntry extends IAssetContentsEntryMinimal { | ||
/** id field is required to convert asset contents to and from data_list format */ | ||
id?: string; | ||
/** Used to indicate that the asset pack contains only overrides for the associated file, not the default asset file */ | ||
overridesOnly?: boolean; | ||
overrides?: { | ||
[themeName: IAssetOverrideProps["themeName"]]: { | ||
[languageCode: IAssetOverrideProps["languageCode"]]: IAssetContentsEntryMinimal; | ||
}; | ||
}; | ||
} | ||
export type IAssetEntryHashmap = { [assetPath: string]: IAssetEntry }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ | |
.popup-container { | ||
height: var(--safe-area-height); | ||
} | ||
.close-button { | ||
.close-button { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure why this is cropping up now, but reverting it and committing isn't possible as the linter removes the whitespace again when I attempt a commit (so the would-be commit is empty) |
||
top: 10px; | ||
right: 10px; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved from lower down to group with other relevant definitions