Skip to content

Commit 1189b2a

Browse files
gedinakovagedinakova
authored
Merge branch 'vnext' into dmdimitrov/query-builder-sql-sample
2 parents b847a9d + 78f8159 commit 1189b2a

File tree

17 files changed

+165
-53
lines changed

17 files changed

+165
-53
lines changed

‎azure-devops/app-cd.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ steps:
8585
findRegex: angular-demos
8686
npmBuildCommand: 'run build-ci'
8787
repositoryfy: true
88+
repositoryfyCommand: 'repositoryfyAngularDemos'

‎azure-devops/app-lob-cd.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ steps:
8585
findRegex: angular-demos
8686
npmBuildCommand: 'run build-ci:app-lob'
8787
repositoryfy: true
88+
repositoryfyCommand: 'repositoryfyAngularDemosLob'

‎azure-devops/templates/cd-template.yml

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ parameters:
2222
- name: repositoryfy
2323
type: boolean
2424
default: false
25+
- name: repositoryfyCommand
26+
type: string
27+
default: ''
2528

2629
steps:
2730
# - task: CmdLine@2
@@ -137,47 +140,77 @@ steps:
137140

138141
- task: Npm@1
139142
displayName: Staging - Repositorify Angular Demos and LOB Demos
140-
condition: and(eq(variables['Build.SourceBranchName'], 'vNext'), eq(variables['repositoryfy'], 'true'))
143+
condition: and(eq(variables['Build.SourceBranchName'], 'vNext'), eq(${{ parameters.repositoryfy }}, 'true'))
141144
inputs:
142145
command: custom
143146
workingDir: ${{ parameters.workingDir }}
144147
verbose: false
145-
customCommand: run repositoryfyAngularDemosLob
148+
customCommand: run ${{ parameters.repositoryfyCommand }}
146149

147150
- task: Npm@1
148151
displayName: Production - Repositorify Angular Demos
149-
condition: and(eq(variables['Build.SourceBranchName'], 'master'), contains(variables['build.reason'], 'CI'), eq(variables['repositoryfy'], 'true'))
152+
condition: and(eq(variables['Build.SourceBranchName'], 'master'), contains(variables['build.reason'], 'CI'), eq(${{ parameters.repositoryfy }}, 'true'))
150153
inputs:
151154
command: custom
152155
workingDir: ${{ parameters.workingDir }}
153156
verbose: false
154-
customCommand: run repositoryfyAngularDemosLob:prod
157+
customCommand: run ${{ parameters.repositoryfyCommand }}:prod
155158

156159
- task: CmdLine@2
157160
displayName: Stage changes
158-
condition: eq(variables['repositoryfy'], 'true')
161+
condition: eq(${{ parameters.repositoryfy }}, 'true')
159162
inputs:
160163
script: git add .
161164
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
162165

166+
- task: CmdLine@2
167+
displayName: 'TODO REMOVE Git Changes'
168+
condition: eq(${{ parameters.repositoryfy }}, 'true')
169+
inputs:
170+
script: |
171+
echo "Checking for changes"
172+
git status --porcelain
173+
echo "Changes detected:"
174+
git status --porcelain | wc -l
175+
echo "Working Dir"
176+
echo "${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}"
177+
echo "Working Dir Linux"
178+
echo "Current Directory: $(pwd)"
179+
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
180+
163181
- task: CmdLine@2
164182
displayName: 'Check if there are any changes to be committed'
165-
condition: eq(variables['repositoryfy'], 'true')
183+
condition: eq(${{ parameters.repositoryfy }}, 'true')
166184
inputs:
167185
script: |
168186
# Check for changes
169187
changeCount=$(git status --porcelain | wc -l)
188+
echo $changeCount
170189
if [ "$changeCount" -eq 0 ]; then
171190
echo "##vso[task.logissue type=warning]No changes to commit."
172191
exit 0
173192
else
174-
echo "##vso[task.setvariable variable=changesDetected;isOutput=true]true"
193+
echo "Changes detected."
194+
echo "##vso[task.setvariable variable=changesDetected;]true"
195+
echo "changes detected is now $changesDetected"
196+
echo "changes detected is now $(changesDetected)"
175197
fi
176198
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
177199

200+
- task: CmdLine@2
201+
displayName: TODO REMOVE Commit changes WITH BOOLEAN CHECK
202+
condition: and(eq(variables['changesDetected'], true), eq(${{ parameters.repositoryfy }}, 'true'))
203+
inputs:
204+
script: |
205+
git config user.name "tfsbuild"
206+
git config user.email "[email protected]"
207+
git add .
208+
git commit -m "Automated repository update"
209+
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
210+
178211
- task: CmdLine@2
179212
displayName: Commit changes
180-
condition: and(eq(variables['changesDetected'], 'true'), eq(variables['repositoryfy'], 'true'))
213+
condition: and(eq(variables['changesDetected'], 'true'), eq(${{ parameters.repositoryfy }}, 'true'))
181214
inputs:
182215
script: |
183216
git config user.name "tfsbuild"
@@ -188,7 +221,7 @@ steps:
188221

189222
- task: CmdLine@2
190223
displayName: Push changes
191-
condition: and(eq(variables['changesDetected'], 'true'), eq(variables['repositoryfy'], 'true'))
224+
condition: and(eq(variables['changesDetected'], 'true'), eq(${{ parameters.repositoryfy }}, 'true'))
192225
inputs:
193226
script: git push
194227
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}

‎gulpfile.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ gulp.task("generate-live-editing", async () => {
3030
}
3131
}
3232
:
33-
(argv.appCrm ?
33+
(argv.appCrm ?
3434
{
3535
platform: 'angular',
3636
projectDir: "./projects/app-crm",
@@ -213,16 +213,18 @@ const processApp = (projectPath, dest, directoriesToExclude) => {
213213
const paths = sampleFile.path.replace("./", "").split("/");
214214
let tempPath = "";
215215
paths.forEach(p => {
216-
tempPath += p + "/";
216+
tempPath += p;
217217
if (p.indexOf(".") !== -1 && p !== codesandboxConfigFolder) {
218218
fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
219-
} else
219+
} else {
220220
if (p === 'Dockerfile') {
221221
fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
222222
} else if (!fs.existsSync(sampleAppPath + "/" + tempPath)) {
223223
fs.mkdirSync(sampleAppPath + "/" + tempPath)
224224
}
225-
})
225+
}
226+
tempPath += "/";
227+
});
226228
});
227229
i++;
228230
console.log(`Processing ${fileName}.json with SCSS styling`);

‎igniteui-live-editing-samples

‎package-lock.json

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
"bootstrap": "5.3.3",
6666
"file-saver": "^2.0.2",
6767
"hammerjs": "^2.0.8",
68-
"igniteui-angular": "^19.1.0-rc.0",
68+
"igniteui-angular": "^19.1.1",
6969
"igniteui-angular-charts": "^19.0.0",
7070
"igniteui-angular-core": "^19.0.0",
71-
"igniteui-angular-extras": "^19.0.3",
72-
"igniteui-angular-i18n": "^19.0.10",
71+
"igniteui-angular-extras": "^19.1.2",
72+
"igniteui-angular-i18n": "^19.1.0",
7373
"igniteui-dockmanager": "^1.16.0",
7474
"igniteui-live-editing": "^3.0.0",
7575
"igniteui-webcomponents": "^5.2.3",
@@ -83,8 +83,8 @@
8383
},
8484
"overrides": {
8585
"igniteui-angular-extras": {
86-
"igniteui-angular": "^19.1.0-rc.0",
87-
"@infragistics/igniteui-angular": "^19.1.0-rc.0",
86+
"igniteui-angular": "^19.1.0",
87+
"@infragistics/igniteui-angular": "^19.1.1",
8888
"igniteui-angular-charts": "^19.0.0",
8989
"igniteui-angular-core": "^19.0.0",
9090
"@angular/core": "^19.0.0",

‎projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<igc-dockmanager #dock class="light-theme dock-m-position" [layout]="docLayout">
22
<div slot="grid" igxOverlayOutlet style="height: 100%">
33
<igx-grid #grid columnSelection="multiple" [moving]="true" igxChartIntegration igxConditionalFormatting igxContextMenu
4-
[chartData]="chartData" primaryKey="id" [data]="data" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
4+
primaryKey="id" [data]="data" [allowFiltering]="true" [filterMode]="'excelStyleFilter'">
55
<igx-column [sortable]="true" [disablePinning]="true" [disableHiding]="true" field="id" [hidden]="true"></igx-column>
66
<igx-column [sortable]="true" [disablePinning]="true" [disableHiding]="true" field="category" [width]="'110px'"></igx-column>
77
<igx-column [sortable]="true" [disablePinning]="true" [disableHiding]="true" field="type" [filterable]="false" [width]="'130px'"></igx-column>
@@ -111,7 +111,7 @@
111111
<div
112112
(click)="createChart(chart)"
113113
title="{{chart}}"
114-
[ngClass]="{'disabled': allCharts.indexOf(chart) === -1, 'selected': chart | hastDuplicateLayouts: dock.layout: selectedCharts}"
114+
[ngClass]="{'disabled': availableCharts.indexOf(chart) === -1, 'selected': chart | hastDuplicateLayouts: dock.layout: selectedCharts}"
115115
style="width: 60px; margin-right: 20px; cursor: pointer; position: relative;">
116116
<img src="assets/images/svg/charts/{{chart}}.svg" />
117117
@if (selectedCharts[chart]) {
@@ -133,3 +133,6 @@
133133
}
134134
</igc-dockmanager>
135135

136+
<ng-template #template>
137+
<span>Incompatible data</span>
138+
</ng-template>

0 commit comments

Comments
 (0)