Skip to content

Commit 529c597

Browse files
codyllordcodyllord
committed
Resolve merge conflicts with develop branch
- Merged Excel service storage_service_id functionality with develop branch updates - Resolved conflicts in dist/index.html (chose develop branch build files) - Resolved conflicts in df-service-details.component.ts (preserved Excel functionality while integrating service type flag updates) - Updated runtime file references to match develop branch - Maintained Excel service functionality for storage service selection
2 parents 1916538 + 28cdc85 commit 529c597

11 files changed

Lines changed: 225 additions & 37 deletions

‎dist/1326.9e5d3c0d4b2d6a47.js‎

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

‎dist/assets/ace-builds/mode-python3.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<body class="mat-typography">
1010
<df-root></df-root>
1111
<script type="text/javascript" src="https://assets.calendly.com/assets/external/widget.js"></script>
12-
<script src="runtime.5e561c4bf155dc3c.js" type="module"></script><script src="polyfills.def0190516b19e6b.js" type="module"></script><script src="main.c4980922ee47fee4.js" type="module"></script></body>
12+
<script src="runtime.1adb24c16ff25b9a.js" type="module"></script><script src="polyfills.def0190516b19e6b.js" type="module"></script><script src="main.1b31dd8117704925.js" type="module"></script></body>
1313
</html>

‎dist/main.1b31dd8117704925.js‎

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

‎dist/main.c4980922ee47fee4.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/runtime.1adb24c16ff25b9a.js‎

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

‎dist/runtime.5e561c4bf155dc3c.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/app/adf-services/df-service-details/df-service-details.component.html‎

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,18 +701,88 @@ <h4 class="text-center" style="color: black !important">
701701
</mat-accordion>
702702
</ng-container>
703703

704-
<!-- Script Service Configuration (unchanged) -->
704+
<!-- Script Service Configuration -->
705705
<ng-container *ngIf="this.isScriptService">
706+
<!-- Script Content - Always visible -->
706707
<ng-container *ngIf="getConfigControl('storageServiceId')">
707708
<df-script-editor
708709
[isScript]="this.isScriptService"
709710
[type]="getControl('type')"
710711
[storageServiceId]="getConfigControl('storageServiceId')"
711712
[storagePath]="getConfigControl('storagePath')"
712-
[content]="getConfigControl('serviceDefinition')"
713+
[content]="getConfigControl('content')"
713714
[cache]="serviceData ? serviceData.name : ''"
714715
class="full-width"></df-script-editor>
715716
</ng-container>
717+
718+
<!-- Advanced Options Section for Script Services -->
719+
<mat-accordion class="full-width">
720+
<mat-expansion-panel [expanded]="false">
721+
<mat-expansion-panel-header>
722+
Advanced Options
723+
</mat-expansion-panel-header>
724+
<div class="details-section">
725+
<!-- OpenAPI Service Definition Section -->
726+
<mat-button-toggle-group
727+
aria-label="Service Definition Type"
728+
[(ngModel)]="serviceDefinitionType"
729+
[ngModelOptions]="{ standalone: true }"
730+
(change)="
731+
onServiceDefinitionTypeChange(serviceDefinitionType)
732+
">
733+
<mat-button-toggle value="0">JSON</mat-button-toggle>
734+
<mat-button-toggle value="1">YAML</mat-button-toggle>
735+
</mat-button-toggle-group>
736+
<mat-label class="full-width"
737+
>OpenAPI Service Definition (Optional)</mat-label
738+
>
739+
740+
<df-ace-editor
741+
class="full-width"
742+
[formControl]="getServiceDocByServiceIdControl('content')"
743+
[mode]="serviceDefinitionMode">
744+
</df-ace-editor>
745+
746+
<!-- Other configuration fields if any -->
747+
<ng-container *ngFor="let item of viewSchema">
748+
<ng-container *ngIf="item.name !== 'content'">
749+
<df-dynamic-field
750+
*ngIf="
751+
[
752+
'integer',
753+
'password',
754+
'string',
755+
'text',
756+
'picklist',
757+
'multi_picklist',
758+
'boolean',
759+
'file_certificate',
760+
'file_certificate_api'
761+
].includes(item.type)
762+
"
763+
color="primary"
764+
[schema]="item"
765+
[formControl]="getConfigControl(item.name)"
766+
[class.dynamic-width]="
767+
['file_certificate', 'file_certificate_api'].indexOf(
768+
item.type
769+
) === -1
770+
"
771+
[class.full-width]="
772+
['file_certificate', 'file_certificate_api'].indexOf(
773+
item.type
774+
) !== -1
775+
"></df-dynamic-field>
776+
<df-array-field
777+
*ngIf="item.type === 'array' || item.type === 'object'"
778+
[schema]="item"
779+
[formControl]="getConfigControl(item.name)"
780+
class="full-width"></df-array-field>
781+
</ng-container>
782+
</ng-container>
783+
</div>
784+
</mat-expansion-panel>
785+
</mat-accordion>
716786
</ng-container>
717787

718788
<!-- Other Service Types (unchanged) -->

0 commit comments

Comments
 (0)