Skip to content

Commit e85a577

Browse files
7Remy7Remy
authored
Release - beta24 (main)
1 parent 6ba78e8 commit e85a577

File tree

102 files changed

+1974
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1974
-261
lines changed

‎.github/workflows/build_develop.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
uses: docker/build-push-action@v4
3535
with:
3636
context: .
37-
platforms: linux/amd64, linux/arm64/v8
37+
platforms: linux/amd64
3838
push: true
3939
no-cache: true
40-
file: docker/DOCKERFILES/build/core.dev.Dockerfile
40+
file: docker/DOCKERFILES/build/core.Dockerfile
4141
labels:
4242
LEAV Engine
4343
Core
@@ -66,7 +66,7 @@ jobs:
6666
uses: docker/build-push-action@v3
6767
with:
6868
context: .
69-
platforms: linux/amd64, linux/arm64/v8
69+
platforms: linux/amd64
7070
push: true
7171
target: runner-preview-generator
7272
file: docker/DOCKERFILES/build/generic.Dockerfile
@@ -100,7 +100,7 @@ jobs:
100100
uses: docker/build-push-action@v3
101101
with:
102102
context: .
103-
platforms: linux/amd64, linux/arm64/v8
103+
platforms: linux/amd64
104104
push: true
105105
target: runner
106106
file: docker/DOCKERFILES/build/generic.Dockerfile
@@ -134,7 +134,7 @@ jobs:
134134
uses: docker/build-push-action@v3
135135
with:
136136
context: .
137-
platforms: linux/amd64, linux/arm64/v8
137+
platforms: linux/amd64
138138
push: true
139139
target: runner
140140
file: docker/DOCKERFILES/build/generic.Dockerfile
@@ -168,7 +168,7 @@ jobs:
168168
uses: docker/build-push-action@v3
169169
with:
170170
context: .
171-
platforms: linux/amd64, linux/arm64/v8
171+
platforms: linux/amd64
172172
push: true
173173
target: runner
174174
file: docker/DOCKERFILES/build/generic.Dockerfile

‎.github/workflows/build_develop_arm64.yml

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
name: Build develop ARM64
2+
3+
on:
4+
workflow_dispatch:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: false
9+
10+
jobs:
11+
# Build core and deploy it to Docker Hub
12+
core:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Set version # Write version to package.json and manifest.json
17+
run: |
18+
echo "Setting version to \"develop (${{ github.sha }})\""
19+
find \( -name "package.json" -o -name "manifest.json" \) -not -path "*/node_modules/*" -not -path "*/__tests__/*" -type f -exec sh -c 'jq ".version = \"develop (${{ github.sha }})\"" {} > tmpfile && mv tmpfile {}' \;
20+
-
21+
name: Set up Docker Buildx
22+
uses: docker/setup-buildx-action@v2
23+
-
24+
name: Login to Docker Hub
25+
uses: docker/login-action@v2
26+
with:
27+
username: ${{ secrets.DOCKERHUB_USERNAME }}
28+
password: ${{ secrets.DOCKERHUB_TOKEN }}
29+
-
30+
name: Build image
31+
uses: docker/build-push-action@v4
32+
with:
33+
context: .
34+
platforms: linux/arm64/v8
35+
push: true
36+
no-cache: true
37+
file: docker/DOCKERFILES/build/core.dev.Dockerfile
38+
labels:
39+
LEAV Engine
40+
Core
41+
tags: "leavengine/core:develop"
42+
43+
# Build preview-generator and deploy it to Docker Hub
44+
preview-generator:
45+
runs-on: ubuntu-latest
46+
steps:
47+
- uses: actions/checkout@v4
48+
- name: Set version # Write version to package.json and manifest.json
49+
run: |
50+
echo "Setting version to \"develop (${{ github.sha }})\""
51+
find \( -name "package.json" -o -name "manifest.json" \) -not -path "*/node_modules/*" -not -path "*/__tests__/*" -type f -exec sh -c 'jq ".version = \"develop (${{ github.sha }})\"" {} > tmpfile && mv tmpfile {}' \;
52+
-
53+
name: Set up Docker Buildx
54+
uses: docker/setup-buildx-action@v2
55+
-
56+
name: Login to Docker Hub
57+
uses: docker/login-action@v2
58+
with:
59+
username: ${{ secrets.DOCKERHUB_USERNAME }}
60+
password: ${{ secrets.DOCKERHUB_TOKEN }}
61+
-
62+
name: Build image
63+
uses: docker/build-push-action@v3
64+
with:
65+
context: .
66+
platforms: linux/arm64/v8
67+
push: true
68+
target: runner-preview-generator
69+
file: docker/DOCKERFILES/build/generic.Dockerfile
70+
build-args: |
71+
"APP=preview-generator"
72+
labels:
73+
LEAV Engine
74+
Preview Generator
75+
tags: "leavengine/preview-generator:develop"
76+
77+
# Build automate-scan and deploy it to Docker Hub
78+
automate-scan:
79+
runs-on: ubuntu-latest
80+
steps:
81+
- uses: actions/checkout@v4
82+
- name: Set version # Write version to package.json and manifest.json
83+
run: |
84+
echo "Setting version to \"develop (${{ github.sha }})\""
85+
find \( -name "package.json" -o -name "manifest.json" \) -not -path "*/node_modules/*" -not -path "*/__tests__/*" -type f -exec sh -c 'jq ".version = \"develop (${{ github.sha }})\"" {} > tmpfile && mv tmpfile {}' \;
86+
-
87+
name: Set up Docker Buildx
88+
uses: docker/setup-buildx-action@v2
89+
-
90+
name: Login to Docker Hub
91+
uses: docker/login-action@v2
92+
with:
93+
username: ${{ secrets.DOCKERHUB_USERNAME }}
94+
password: ${{ secrets.DOCKERHUB_TOKEN }}
95+
-
96+
name: Build image
97+
uses: docker/build-push-action@v3
98+
with:
99+
context: .
100+
platforms: linux/arm64/v8
101+
push: true
102+
target: runner
103+
file: docker/DOCKERFILES/build/generic.Dockerfile
104+
build-args: |
105+
"APP=automate-scan"
106+
labels:
107+
LEAV Engine
108+
Automate Scan
109+
tags: "leavengine/automate-scan:develop"
110+
111+
# Build sync-scan and deploy it to Docker Hub
112+
sync-scan:
113+
runs-on: ubuntu-latest
114+
steps:
115+
- uses: actions/checkout@v4
116+
- name: Set version # Write version to package.json and manifest.json
117+
run: |
118+
echo "Setting version to \"develop (${{ github.sha }})\""
119+
find \( -name "package.json" -o -name "manifest.json" \) -not -path "*/node_modules/*" -not -path "*/__tests__/*" -type f -exec sh -c 'jq ".version = \"develop (${{ github.sha }})\"" {} > tmpfile && mv tmpfile {}' \;
120+
-
121+
name: Set up Docker Buildx
122+
uses: docker/setup-buildx-action@v2
123+
-
124+
name: Login to Docker Hub
125+
uses: docker/login-action@v2
126+
with:
127+
username: ${{ secrets.DOCKERHUB_USERNAME }}
128+
password: ${{ secrets.DOCKERHUB_TOKEN }}
129+
-
130+
name: Build image
131+
uses: docker/build-push-action@v3
132+
with:
133+
context: .
134+
platforms: linux/arm64/v8
135+
push: true
136+
target: runner
137+
file: docker/DOCKERFILES/build/generic.Dockerfile
138+
build-args: |
139+
"APP=sync-scan"
140+
labels:
141+
LEAV Engine
142+
Sync scan
143+
tags: "leavengine/sync-scan:develop"
144+
145+
# Build logs-collector and deploy it to Docker Hub
146+
logs-collector:
147+
runs-on: ubuntu-latest
148+
steps:
149+
- uses: actions/checkout@v4
150+
- name: Set version # Write version to package.json and manifest.json
151+
run: |
152+
echo "Setting version to \"develop (${{ github.sha }})\""
153+
find \( -name "package.json" -o -name "manifest.json" \) -not -path "*/node_modules/*" -not -path "*/__tests__/*" -type f -exec sh -c 'jq ".version = \"develop (${{ github.sha }})\"" {} > tmpfile && mv tmpfile {}' \;
154+
-
155+
name: Set up Docker Buildx
156+
uses: docker/setup-buildx-action@v2
157+
-
158+
name: Login to Docker Hub
159+
uses: docker/login-action@v2
160+
with:
161+
username: ${{ secrets.DOCKERHUB_USERNAME }}
162+
password: ${{ secrets.DOCKERHUB_TOKEN }}
163+
-
164+
name: Build image
165+
uses: docker/build-push-action@v3
166+
with:
167+
context: .
168+
platforms: linux/arm64/v8
169+
push: true
170+
target: runner
171+
file: docker/DOCKERFILES/build/generic.Dockerfile
172+
build-args: |
173+
"APP=logs-collector"
174+
labels:
175+
LEAV Engine
176+
Logs Collector
177+
tags: "leavengine/logs-collector:develop"

‎.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Build image
2323
uses: docker/build-push-action@v3
2424
with:
25-
platforms: linux/amd64, linux/arm64/v8
25+
platforms: linux/amd64
2626
push: true
2727
file: docker/DOCKERFILES/build/core.Dockerfile
2828
labels:
@@ -48,7 +48,7 @@ jobs:
4848
name: Build image
4949
uses: docker/build-push-action@v3
5050
with:
51-
platforms: linux/amd64, linux/arm64/v8
51+
platforms: linux/amd64
5252
push: true
5353
target: runner-preview-generator
5454
file: docker/DOCKERFILES/build/generic.Dockerfile
@@ -77,7 +77,7 @@ jobs:
7777
name: Build image
7878
uses: docker/build-push-action@v3
7979
with:
80-
platforms: linux/amd64, linux/arm64/v8
80+
platforms: linux/amd64
8181
push: true
8282
target: runner
8383
file: docker/DOCKERFILES/build/generic.Dockerfile
@@ -106,7 +106,7 @@ jobs:
106106
name: Build image
107107
uses: docker/build-push-action@v3
108108
with:
109-
platforms: linux/amd64, linux/arm64/v8
109+
platforms: linux/amd64
110110
push: true
111111
target: runner
112112
file: docker/DOCKERFILES/build/generic.Dockerfile
@@ -135,7 +135,7 @@ jobs:
135135
name: Build image
136136
uses: docker/build-push-action@v3
137137
with:
138-
platforms: linux/amd64, linux/arm64/v8
138+
platforms: linux/amd64
139139
push: true
140140
target: runner
141141
file: docker/DOCKERFILES/build/generic.Dockerfile

‎apps/admin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "admin",
33
"description": "Administration",
4-
"version": "1.0.0-beta23",
4+
"version": "1.0.0-beta24",
55
"main": "src/index.tsx",
66
"dependencies": {
77
"@apollo/client": "3.8.1",

‎apps/admin/public/locales/en/translations.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@
150150
"validation_regex": "Validation Rule",
151151
"reverse_link": "Reverse link",
152152
"linked_attribute": "Linked attribute",
153+
"multi_link_display_option": "Displayed option of linked values",
154+
"multi_link_display_options": {
155+
"avatar": "Avatar",
156+
"tag": "Tag",
157+
"badge_qty": "Quantity badge"
158+
},
153159
"types": {
154160
"tree": "Tree",
155161
"advanced": "Advanced",
@@ -332,7 +338,8 @@
332338
"HORIZONTAL": "Horizontal"
333339
},
334340
"displayRecordIdentity": "Display information column",
335-
"useAttributeLabel": "Use attribute label"
341+
"useAttributeLabel": "Use attribute label",
342+
"tagDisplayMode": "Tag(s) display mode"
336343
},
337344
"rte": {
338345
"bold": "Bold",

‎apps/admin/public/locales/fr/translations.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@
150150
"validation_regex": "Règle de Validation",
151151
"reverse_link": "Lien inverse",
152152
"linked_attribute": "Attribut lié",
153+
"multi_link_display_option": "Option d’affichage des valeurs liées multiples",
154+
"multi_link_display_options": {
155+
"avatar": "Avatar",
156+
"tag": "Tag",
157+
"badge_qty": "Badge numérique"
158+
},
153159
"types": {
154160
"tree": "Arbre",
155161
"advanced": "Avancé",
@@ -332,7 +338,8 @@
332338
"HORIZONTAL": "Horizontale"
333339
},
334340
"displayRecordIdentity": "Afficher la colonne Informations",
335-
"useAttributeLabel": "Utiliser le libellé de l'attribut"
341+
"useAttributeLabel": "Utiliser le libellé de l'attribut",
342+
"tagDisplayMode": "Afficher sous forme de tag(s)"
336343
},
337344
"rte": {
338345
"bold": "Gras",

‎apps/admin/public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "admin",
33
"description": "Administration",
4-
"version": "1.0.0-beta23",
4+
"version": "1.0.0-beta24",
55
"icons": [
66
{
77
"src": "favicon-leav.svg",

‎apps/admin/src/__mocks__/attributes.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
GET_ATTRIBUTE_BY_ID_attributes_list_LinkAttribute,
88
GET_ATTRIBUTE_BY_ID_attributes_list_TreeAttribute
99
} from '../_gqlTypes/GET_ATTRIBUTE_BY_ID';
10-
import {AttributeFormat, AttributeType, ValueVersionMode} from '../_gqlTypes/globalTypes';
10+
import {AttributeFormat, AttributeType, MultiLinkDisplayOption, ValueVersionMode} from '../_gqlTypes/globalTypes';
1111

1212
const base: GET_ATTRIBUTE_BY_ID_attributes_list = {
1313
id: 'test_attribute',
@@ -32,7 +32,8 @@ const base: GET_ATTRIBUTE_BY_ID_attributes_list = {
3232
permissions_conf: null,
3333
versions_conf: {versionable: false, mode: ValueVersionMode.smart, profile: null},
3434
metadata_fields: null,
35-
libraries: null
35+
libraries: null,
36+
multi_link_display_option: MultiLinkDisplayOption.avatar
3637
};
3738

3839
export const mockAttrSimple = {...base, id: 'simple_attribute'};

‎apps/admin/src/_gqlTypes/AttributeDetails.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// @generated
77
// This file was automatically generated and should not be edited.
88

9-
import {AttributeType, AttributeFormat, PermissionsRelation, ValueVersionMode} from './globalTypes';
9+
import {AttributeType, AttributeFormat, PermissionsRelation, ValueVersionMode, MultiLinkDisplayOption} from './globalTypes';
1010

1111
// ====================================================
1212
// GraphQL fragment: AttributeDetails
@@ -75,6 +75,7 @@ export interface AttributeDetails_StandardAttribute {
7575
label: SystemTranslation | null;
7676
description: SystemTranslation | null;
7777
multiple_values: boolean;
78+
multi_link_display_option: MultiLinkDisplayOption | null;
7879
metadata_fields: AttributeDetails_StandardAttribute_metadata_fields[] | null;
7980
permissions_conf: AttributeDetails_StandardAttribute_permissions_conf | null;
8081
versions_conf: AttributeDetails_StandardAttribute_versions_conf | null;
@@ -149,6 +150,7 @@ export interface AttributeDetails_LinkAttribute {
149150
label: SystemTranslation | null;
150151
description: SystemTranslation | null;
151152
multiple_values: boolean;
153+
multi_link_display_option: MultiLinkDisplayOption | null;
152154
metadata_fields: AttributeDetails_LinkAttribute_metadata_fields[] | null;
153155
permissions_conf: AttributeDetails_LinkAttribute_permissions_conf | null;
154156
versions_conf: AttributeDetails_LinkAttribute_versions_conf | null;
@@ -224,6 +226,7 @@ export interface AttributeDetails_TreeAttribute {
224226
label: SystemTranslation | null;
225227
description: SystemTranslation | null;
226228
multiple_values: boolean;
229+
multi_link_display_option: MultiLinkDisplayOption | null;
227230
metadata_fields: AttributeDetails_TreeAttribute_metadata_fields[] | null;
228231
permissions_conf: AttributeDetails_TreeAttribute_permissions_conf | null;
229232
versions_conf: AttributeDetails_TreeAttribute_versions_conf | null;

0 commit comments

Comments
 (0)