Skip to content
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

Flutter upgrade #515

Merged
merged 36 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a34ffd2
kubernetes Ogrre Visualization
Jan 5, 2024
aa38876
kubernetes json modification in API
Jan 16, 2024
1538120
kubernetes vizualisation:file
Jan 16, 2024
72ff5e3
add python script for sos-report
Feb 23, 2024
8568a13
delete ogree-kube
Feb 28, 2024
4181633
modif delete and schema
Mar 1, 2024
444a3ac
delete fake dockerfile
Mar 1, 2024
5baac3e
feat(app) live demo improvements
helderbetiol May 7, 2024
7aa334b
feat(app) add unity webview
helderbetiol May 10, 2024
983c4cb
Merge branch 'feat337-kubernetes-visualization' into feat458-live-demo
helderbetiol May 10, 2024
ab06ce5
fix(api) remove prints
helderbetiol May 10, 2024
214dbcb
feat(api) add applications
helderbetiol May 14, 2024
ab79251
feat(app) add demo alert page
helderbetiol May 14, 2024
686dd98
Merge branch 'main' into feat458-live-demo
helderbetiol May 14, 2024
32f272c
feat(app) point to unity server
helderbetiol May 14, 2024
3199637
fix(api) get and delete for app
helderbetiol May 15, 2024
769653f
fix(app) minor UI adjustments
helderbetiol May 15, 2024
43bc0d6
fix(app) unable to modify bool obj value
helderbetiol May 15, 2024
b69168d
feat(app) add download unity
helderbetiol May 15, 2024
9ecb5cb
fix(app) minor UI adjustments
helderbetiol May 20, 2024
480bd48
Merge branch 'main' into release-demo/1.0
helderbetiol Jun 20, 2024
38ce20b
fix(api,app) merge issues
helderbetiol Jun 20, 2024
4341d9d
feat(app) add virtual_config to popup
helderbetiol Jun 20, 2024
0602d65
fix(app,api) minor fixes
helderbetiol Jun 21, 2024
a4a8811
feat(app) dedicated modify for vconfig
helderbetiol Jun 21, 2024
14dbea7
fix(app) show unity
helderbetiol Jun 21, 2024
f152da3
chore(app) upgrade flutter version
helderbetiol Sep 5, 2024
41c3d9f
Merge branch 'main' into release-demo/1.0
helderbetiol Sep 5, 2024
dbf60e6
Merge branch 'chore511-flutter-upgrade' into release-demo/1.0
helderbetiol Sep 5, 2024
8bb88f8
fix(app) upgrade version
helderbetiol Sep 5, 2024
3bdc2a0
fix(api) delete old file
helderbetiol Sep 5, 2024
b752f7e
fix(api) bug fix
helderbetiol Sep 12, 2024
9b274f1
fix(app) tenant mode ui fix
helderbetiol Sep 12, 2024
0960d53
fix(app) adjust after demo merge
helderbetiol Sep 12, 2024
fad6941
fix(app) dart fix
helderbetiol Sep 12, 2024
fabd6c2
fix(app) minor issues fixed
helderbetiol Sep 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build/APP/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
- uses: actions/[email protected]
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.16.9'
flutter-version: '3.24.1'
channel: 'stable'

- name: Set up
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build/windows/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.16.9'
flutter-version: '3.24.1'
channel: 'stable'

- name: Windows flutter build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.16.9'
flutter-version: '3.24.1'
channel: 'stable'

- name: Set up
Expand Down
15 changes: 10 additions & 5 deletions API/models/impact.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package models

import (
"fmt"
u "p3/utils"
"reflect"
"strings"
Expand All @@ -17,6 +16,10 @@ type ImpactFilters struct {
}

func GetImpact(id string, userRoles map[string]Role, filters ImpactFilters) (map[string]any, *u.Error) {
directChildren := map[string]any{}
indirectChildren := map[string]any{}
clusterRelations := map[string][]string{} // map of clusterId and list of objIds linked to that cluster

// Get target object for impact analysis
target, err := GetObjectById(id, u.HIERARCHYOBJS_ENT, u.RequestFilters{}, userRoles)
if err != nil {
Expand All @@ -28,12 +31,13 @@ func GetImpact(id string, userRoles map[string]Role, filters ImpactFilters) (map
if err != nil {
return nil, err
}
fmt.Println(filters)

// Find relations
directChildren := map[string]any{}
indirectChildren := map[string]any{}
clusterRelations := map[string][]string{}
// Cluster associated to this target
if targetAttrs, ok := target["attributes"].(map[string]any); ok {
setClusterRelation(id, targetAttrs, clusterRelations)
}
// Direct/indirect children and associated clusters
targetLevel := strings.Count(id, ".")
for childId, childData := range allChildren {
childAttrs := childData.(map[string]any)["attributes"].(map[string]any)
Expand All @@ -44,6 +48,7 @@ func GetImpact(id string, userRoles map[string]Role, filters ImpactFilters) (map
setClusterRelation(childId, childAttrs, clusterRelations)
continue
}
// indirect child
setIndirectChildren(filters, childData.(map[string]any), childAttrs, indirectChildren, clusterRelations)
}

Expand Down
2 changes: 1 addition & 1 deletion APP/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-m
RUN apt-get clean

# Download Flutter SDK from Github repo
RUN git clone --depth 1 --branch 3.16.9 https://github.com/flutter/flutter.git /usr/local/flutter
RUN git clone --depth 1 --branch 3.24.1 https://github.com/flutter/flutter.git /usr/local/flutter

# Set flutter environment path
ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}"
Expand Down
Loading
Loading