Skip to content

Commit 19453bc

Browse files
Utkarsh RahimUtkarsh Rahim
Utkarsh Rahim
authored and
Utkarsh Rahim
committed
Upto 15
2 parents 156169b + 99cead1 commit 19453bc

File tree

371 files changed

+17310
-4759
lines changed

Some content is hidden

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

371 files changed

+17310
-4759
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "data.stack-ui-author",
3-
"version": "2.6.0",
3+
"version": "2.6.3",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",
@@ -27,7 +27,7 @@
2727
"ag-grid-community": "^25.3.0",
2828
"deepmerge": "^4.2.2",
2929
"faker": "^4.1.0",
30-
"fuse.js": "^3.6.1",
30+
"fuse.js": "^6.6.2",
3131
"jsdiff": "^1.1.1",
3232
"lodash": "^4.17.21",
3333
"moment": "^2.29.4",

‎src/app/admin/admin.component.html

+19-50
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</button> -->
2323
</div>
2424
<div *ngIf="isSuperAdmin" (click)="loadAdminPage()"
25-
class="admin-settings bg-light rounded d-flex flex-column justify-content-center align-items-center mr-3 pt-1 hover"
25+
class="admin-settings d-flex flex-column justify-content-center align-items-center mr-3 pt-1 hover"
2626
ngbTooltip="Admin Panel" placement="bottom">
27-
<span class="dsi dsi-admin"></span>
27+
<span class="dsi dsi-agent font-22"></span>
2828
<!-- <odp-admin-console-icon size="28"></odp-admin-console-icon> -->
2929
</div>
3030
<!-- <div [@userProfileIcon]="showProfileOptions"
@@ -73,66 +73,35 @@
7373
<span class="app-version">v{{ version }}</span>
7474
</div>
7575
</div>
76-
<!-- <div [@userProfile] class="profile position-absolute bg-white border border-border" *ngIf="showProfileOptions"
77-
odpClickOutside [ignore]="['.profile-icon', '.fa-user']" (outside)="showProfileOptions = false">
78-
<div class="profile-container position-relative d-flex align-items-center h-100 w-100">
79-
<div
80-
class="user-icon d-flex align-items-center justify-content-center position-absolute rounded-circle bg-light border border-border">
81-
<span class="far fa-user fa-lg text-secondary"></span>
82-
</div>
83-
<div
84-
class="profile-thumbnail d-flex align-items-center justify-content-center rounded-circle bg-light border border-border mx-4">
85-
<span class="far fa-user fa-2x text-secondary"></span>
86-
</div>
87-
<div class="profile-data d-flex flex-column">
88-
<h4 class="profile-data-name font-weight-bold">{{ name }}</h4>
89-
<div class="profile-data-more d-flex align-items-center">
90-
<div class="text-secondary profile-data-more-item pr-3 username-holder text-truncate">
91-
{{ username }}
92-
</div>
93-
<div class="profile-data-more-item px-1" *ngIf="authType && authType === 'local'">
94-
<button type="button" class="btn btn-link btn-sm" (click)="toggleChangePassword = true">
95-
Change Password
96-
</button>
97-
</div>
98-
<div class="profile-data-more-item px-1">
99-
<button type="button" class="btn btn-link btn-sm" (click)="logout()" id="logout">
100-
Logout
101-
</button>
102-
</div>
103-
</div>
104-
</div>
105-
<small class="position-absolute text-border app-version">v{{ version }}</small>
106-
<small class="last-login text-muted">Last Login:
107-
{{
108-
lastLogin | dateFormat: 'DD-MMM-YYYY, hh:mm:ss A, z':'Etc/Zulu'
109-
}}</small>
110-
</div>
111-
</div> -->
112-
<!-- <div class="menu hover rounded-circle bg-light border border-border d-flex align-items-center justify-content-center"
113-
ngbTooltip="Switch App" placement="bottom" (click)="showAppOptions=!showAppOptions">
114-
<odp-app-switcher-icon color="aaa" size="28"></odp-app-switcher-icon>
115-
</div> -->
11676
</div>
11777
</div>
11878
<div class="d-flex align-items-center px-4 fw-600 font-22 py-3">
11979
Super Admin
12080
</div>
121-
<div class="d-flex align-items-center px-4 fw-400 item hover">
122-
<span #adminActive="routerLinkActive" routerLinkActive="active" routerLink="apps" class="text">
123-
Applications</span>
124-
<span class="d-flex align-items-center px-4 fw-400 item hover"
125-
*ngIf="isSuperAdmin">
81+
<div class="d-flex align-items-center px-4 fw-400 item hover">
82+
<span #adminActive="routerLinkActive" routerLinkActive="active" routerLink="apps" class="text">
83+
Applications
84+
</span>
85+
<span class="d-flex align-items-center px-4 fw-400 item hover" *ngIf="isSuperAdmin">
12686
<span routerLinkActive="active" routerLink="users" class="text">Users</span>
12787
</span>
128-
</div>
129-
<!-- <div #agentActive="routerLinkActive" class="d-flex align-items-center px-3 item hover" routerLinkActive="active"
88+
<span class="d-flex align-items-center px-4 fw-400 item hover" *ngIf="isSuperAdmin">
89+
<span routerLinkActive="active" routerLink="metadata/mapper" class="text">Mapper Formulas</span>
90+
</span>
91+
<span class="d-flex align-items-center px-4 fw-400 item hover" *ngIf="isSuperAdmin">
92+
<span routerLinkActive="active" routerLink="metadata/node" class="text">Plugins</span>
93+
</span>
94+
<span class="d-flex align-items-center px-4 fw-400 item hover" *ngIf="isSuperAdmin">
95+
<span routerLinkActive="active" routerLink="metadata/npm" class="text">NPM Libraries</span>
96+
</span>
97+
</div>
98+
<!-- <div #agentActive="routerLinkActive" class="d-flex align-items-center px-3 item hover" routerLinkActive="active"
13099
routerLink="integration">
131100
<span class="odp-flows"></span>
132101
<span class="text mt-1 ml-2">Integration</span>
133102
</div> -->
134103
<div class="d-flex w-100 h-100">
135-
<div class="d-flex flex-column body w-100">
104+
<div class="d-flex flex-column w-100">
136105
<router-outlet></router-outlet>
137106
</div>
138107
</div>

‎src/app/admin/admin.component.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ export class AdminComponent implements OnInit, OnDestroy {
191191
select: 'name app',
192192
filter: {},
193193
};
194-
if (environment.production) {
195-
self.commonService.connectSocket();
196-
}
194+
// if (environment.production) {
195+
// self.commonService.connectSocket();
196+
// }
197197
}
198198

199199
loadApps() {
@@ -252,10 +252,10 @@ export class AdminComponent implements OnInit, OnDestroy {
252252
const self = this;
253253
self.showProfileOptions = false;
254254
self.commonService.app = app;
255-
if (environment.production) {
256-
self.commonService.disconnectSocket();
257-
self.commonService.connectSocket();
258-
}
255+
// if (environment.production) {
256+
// self.commonService.disconnectSocket();
257+
// self.commonService.connectSocket();
258+
// }
259259
self.router.navigate(['/app', app._id]);
260260
}
261261

‎src/app/admin/admin.module.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ import { UserListCellRendererModule } from '../utils/user-list-cell-renderer/use
4141
import { TimezonePickerModule } from '../utils/timezone-picker/timezone-picker.module';
4242
import { AgGridSharedFloatingFilterModule } from '../utils/ag-grid-shared-floating-filter/ag-grid-shared-floating-filter.module';
4343
import { DateFormatModule } from '../utils/date-format/date-format.module';
44+
import { MetadataComponent } from './metadata/metadata.component';
45+
import { MapperFormulasComponent } from './metadata/mapper-formulas/mapper-formulas.component';
46+
import { CodeEditorModule } from '../utils/code-editor/code-editor.module';
47+
import { CustomNodeComponent } from './metadata/custom-node/custom-node.component';
48+
import { NpmLibrariesComponent } from './metadata/npm-libraries/npm-libraries.component';
4449

4550
@NgModule({
4651
imports: [
@@ -79,6 +84,7 @@ import { DateFormatModule } from '../utils/date-format/date-format.module';
7984
AgGridSharedFloatingFilterModule,
8085
DateFormatModule,
8186
ClickOutsideModule,
87+
CodeEditorModule
8288
],
8389
exports: [AppListComponent],
8490
declarations: [
@@ -92,6 +98,10 @@ import { DateFormatModule } from '../utils/date-format/date-format.module';
9298
UserGroupsComponent,
9399
UserBulkUploadComponent,
94100
AgentsComponent,
101+
MetadataComponent,
102+
MapperFormulasComponent,
103+
CustomNodeComponent,
104+
NpmLibrariesComponent
95105
],
96106
})
97-
export class AdminModule {}
107+
export class AdminModule { }

‎src/app/admin/admin.routing.ts

+13-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import { AppListComponent } from 'src/app/admin/app-list/app-list.component';
55
import { UserListComponent } from 'src/app/admin/user-list/user-list.component';
66
import { AppManageComponent } from 'src/app/admin/app-manage/app-manage.component';
77
import { AgentsComponent } from './agents/agents.component';
8+
import { MetadataComponent } from './metadata/metadata.component';
9+
import { MapperFormulasComponent } from './metadata/mapper-formulas/mapper-formulas.component';
10+
import { CustomNodeComponent } from './metadata/custom-node/custom-node.component';
11+
import { NpmLibrariesComponent } from './metadata/npm-libraries/npm-libraries.component';
812

913
const routes: Routes = [
1014
{
@@ -17,11 +21,19 @@ const routes: Routes = [
1721
{ path: 'users', component: UserListComponent },
1822
{ path: 'agents', component: AgentsComponent },
1923
{ path: 'integration', component: AgentsComponent },
24+
{
25+
path: 'metadata', component: MetadataComponent, children: [
26+
{ path: '', pathMatch: 'full', redirectTo: 'mapper' },
27+
{ path: 'mapper', component: MapperFormulasComponent },
28+
{ path: 'node', component: CustomNodeComponent },
29+
{ path: 'npm', component: NpmLibrariesComponent },
30+
]
31+
},
2032
],
2133
},
2234
];
2335
@NgModule({
2436
imports: [RouterModule.forChild(routes)],
2537
exports: [RouterModule],
2638
})
27-
export class AdminRoutingModule {}
39+
export class AdminRoutingModule { }

‎src/app/admin/app-list/app-list.component.html

+18-20
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@
2424
<span class="text">New</span>
2525
</button> -->
2626
<div class="d-flex align-items-center">
27-
<odp-search-box (enteredText)="searchTerm=$event" (reset)="searchTerm=''" [selectOnEnter]="true" (enteredPressed)="enterToSelect($event)"></odp-search-box>
28-
<button class="add-new btn btn-primary ml-3 d-flex align-items-center"
29-
(click)="newApp()" *ngIf="isSuperadmin">
27+
<odp-search-box (enteredText)="searchTerm=$event" (reset)="searchTerm=''" [selectOnEnter]="true"
28+
(enteredPressed)="enterToSelect($event)" [open]="true"></odp-search-box>
29+
<button class="add-new btn btn-primary ml-3 d-flex align-items-center" (click)="newApp()" *ngIf="isSuperadmin">
3030
<span class="dsi dsi-plus mr-2"></span>
3131
<span class="text">New</span>
3232
</button>
3333
</div>
3434
</div>
3535
<!-- <div class="apps-container d-flex flex-wrap"> -->
36-
<!-- <div class="app-card add d-flex flex-column m-3 px-4 py-3">
36+
<!-- <div class="app-card add d-flex flex-column m-3 px-4 py-3">
3737
<div class="app-thumbnail d-flex align-items-center justify-content-center border hover ml-2" (click)="newApp()">
3838
<div class="rounded-circle d-flex align-items-center justify-content-center bg-light">
3939
<span class="dsi dsi-plus fa-lg text-secondary"></span>
4040
</div>
4141
</div>
4242
<div class="app-name text-center mt-2 text-primary hover" (click)="newApp()">New app</div>
4343
</div> -->
44-
<!-- <ng-container *ngIf="!appList || appList.length == 0">
44+
<!-- <ng-container *ngIf="!appList || appList.length == 0">
4545
<odp-loading-placeholder width="48" height="48" *ngFor="let app of dummyRows" class="mt-5 mx-5">
4646
</odp-loading-placeholder>
4747
</ng-container>
4848
<ng-container *ngFor="let app of appList | filterApp: searchTerm; let appIndex = index"> -->
49-
<!-- <div class="app-card d-flex flex-column mt-4 mx-3 rounded position-relative"
49+
<!-- <div class="app-card d-flex flex-column mt-4 mx-3 rounded position-relative"
5050
(click)="appOptions[appIndex] = true">
5151
<div class="settings-wrapper d-flex flex-column align-items-center px-4 pt-2 position-relative">
5252
<div class="app-thumbnail d-flex align-items-center justify-content-center bg-light hover"
@@ -66,7 +66,7 @@
6666
</div>
6767
</div>
6868
</div> -->
69-
<!-- </ng-container>
69+
<!-- </ng-container>
7070
</div> -->
7171
<div class="d-flex flex-column w-100 h-100 position-relative">
7272
<div class="card-container">
@@ -99,28 +99,26 @@
9999
</ng-container>
100100
<ng-container *ngIf="!records || records.length == 0">
101101
<div class="list-group-item">
102-
<p class="m-0">No Application Found, <button type="button" class="btn btn-link px-1 py-0"
103-
(click)="newApp()">Click Here</button> to create a new App
104-
<span *ngIf="searchTerm">:&nbsp;<span class="fw-500">{{searchTerm}}</span></span>
105-
</p>
102+
<p class="m-0">No Application Found, <button type="button" class="btn btn-link px-1 py-0"
103+
(click)="newApp()">Click Here</button> to create a new App
104+
<span *ngIf="searchTerm">:&nbsp;<span class="fw-500">{{searchTerm}}</span></span>
105+
</p>
106106
</div>
107107
</ng-container>
108108
<ng-container *ngFor="let app of records | filterApp: searchTerm; let appIndex = index">
109109
<div class="list-group-item d-flex align-items-center justify-content-start" (dblclick)="useApp(app._id)">
110110
<div class="item-name fw-500 d-flex align-items-center">
111-
<span class="mr-2 pl-1 text-dark hover app-name" [ngbTooltip]="app._id"
111+
<span class="mr-2 pl-1 text-dark hover app-name" [ngbTooltip]="app._id"
112112
placement="right">{{app._id}}</span>
113113
</div>
114114
<div class="item-actions d-flex align-items-center justify-content-end">
115-
<div (click)="useApp(app._id)" >
116-
<span class="dsi dsi-view mr-1"></span>
117-
<span class="fw-600 font-13 hover mr-3"
118-
>View</span>
115+
<div class="d-flex align-items-center" (click)="useApp(app._id)">
116+
<span class="dsi dsi-view mr-2"></span>
117+
<span class="fw-600 font-13 hover mr-3">View</span>
119118
</div>
120-
<div (click)="$event.stopPropagation();deleteApp(app, appIndex)">
121-
<span class="fas fa-trash mr-1 text-danger"></span>
122-
<span class="fw-600 font-13 hover mr-3 text-danger"
123-
>Delete</span>
119+
<div class="d-flex align-items-center" (click)="$event.stopPropagation();deleteApp(app, appIndex)">
120+
<span class="dsi dsi-trash mr-2 text-danger"></span>
121+
<span class="fw-600 font-13 hover mr-3 text-danger">Delete</span>
124122
</div>
125123
<!-- <span
126124
class="dsi dsi-more-vertical hover mr-3 ignore-outside"

0 commit comments

Comments
 (0)