-
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #723 from jhipster/jdl-data-types-part-1
feat: Support JDL data types in list, view, delete entity flows
- Loading branch information
Showing
10 changed files
with
344 additions
and
92 deletions.
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
Binary file added
BIN
+5.3 KB
generators/client/templates/svelte/cypress/fixtures/integration-test.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions
27
generators/client/templates/svelte/src/main/webapp/app/lib/page/BinaryRecord.svelte.ejs
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,27 @@ | ||
| <script> | ||
| import { byteSize, openFile } from '$lib/utils/data-util' | ||
| export let field | ||
| export let name | ||
| export let fieldType = 'blob' | ||
| export let fieldContentType | ||
| </script> | ||
|
|
||
| {#if field} | ||
| <div | ||
| class="cursor-pointer text-primary-500 inline-block" | ||
| on:click|preventDefault="{openFile(field, fieldContentType)}" | ||
| > | ||
| {#if fieldType === 'image'} | ||
| <img | ||
| src="{'data:' + fieldContentType + ';base64,' + field}" | ||
| class="max-h-8" | ||
| alt="{name}" | ||
| /> | ||
| {:else} | ||
| View | ||
| {/if} | ||
| </div> | ||
| <span class="text-sm">{fieldContentType}</span>, | ||
| <span class="text-sm whitespace-nowrap"> {byteSize(field)}</span> | ||
| {/if} |
42 changes: 42 additions & 0 deletions
42
generators/client/templates/svelte/src/main/webapp/app/lib/utils/data-util.js.ejs
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,42 @@ | ||
| export function byteSize(base64String) { | ||
| return formatAsBytes(size(base64String)) | ||
| } | ||
|
|
||
| export function openFile(data, contentType) { | ||
| const byteCharacters = atob(data) | ||
| const byteNumbers = new Array(byteCharacters.length) | ||
| for (let i = 0; i < byteCharacters.length; i++) { | ||
| byteNumbers[i] = byteCharacters.charCodeAt(i) | ||
| } | ||
| const byteArray = new Uint8Array(byteNumbers) | ||
| const blob = new Blob([byteArray], { | ||
| type: contentType, | ||
| }) | ||
| const fileURL = window.URL.createObjectURL(blob) | ||
| const win = window.open(fileURL) | ||
| win.onload = function () { | ||
| URL.revokeObjectURL(fileURL) | ||
| } | ||
| } | ||
|
|
||
| function endsWith(suffix, str) { | ||
| return str.includes(suffix, str.length - suffix.length) | ||
| } | ||
|
|
||
| function paddingSize(value) { | ||
| if (endsWith('==', value)) { | ||
| return 2 | ||
| } | ||
| if (endsWith('=', value)) { | ||
| return 1 | ||
| } | ||
| return 0 | ||
| } | ||
|
|
||
| function size(value) { | ||
| return (value.length / 4) * 3 - paddingSize(value) | ||
| } | ||
|
|
||
| function formatAsBytes(size) { | ||
| return size.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ' ') + ' bytes' | ||
| } |
33 changes: 30 additions & 3 deletions
33
generators/client/templates/svelte/src/main/webapp/app/lib/utils/date.js.ejs
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 |
|---|---|---|
| @@ -1,9 +1,36 @@ | ||
| import { format, formatDistanceToNow } from 'date-fns' | ||
| import { | ||
| format, | ||
| formatDistanceToNow, | ||
| formatDuration, | ||
| intervalToDuration, | ||
| } from 'date-fns' | ||
|
|
||
| export function formatDate(dateToFormat) { | ||
| return dateToFormat ? format(new Date(Date.parse(dateToFormat)), 'MM/dd/yyyy HH:mm') : '-' | ||
| return dateToFormat | ||
| ? format(new Date(Date.parse(dateToFormat)), 'MM/dd/yyyy HH:mm') | ||
| : '-' | ||
| } | ||
|
|
||
| export function formatDistance(dateToFormat) { | ||
| return dateToFormat ? formatDistanceToNow(new Date(Date.parse(dateToFormat)), {addSuffix: true}) : '-' | ||
| return dateToFormat | ||
| ? formatDistanceToNow(new Date(Date.parse(dateToFormat)), { | ||
| addSuffix: true, | ||
| }) | ||
| : '-' | ||
| } | ||
|
|
||
| export function formatDurationType(durationToFormat) { | ||
| if (durationToFormat) { | ||
| let valueInSeconds = durationToFormat.substring( | ||
| durationToFormat.indexOf('.') + 1, | ||
| durationToFormat.length - 1 | ||
| ) | ||
| return valueInSeconds | ||
| ? formatDuration( | ||
| intervalToDuration({ start: 0, end: valueInSeconds * 1000 }) | ||
| ) | ||
| : '-' | ||
| } else { | ||
| return '-' | ||
| } | ||
| } |
85 changes: 58 additions & 27 deletions
85
...ity-client/templates/svelte/cypress/integration/entities/entity/entity-delete.spec.js.ejs
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
Oops, something went wrong.