Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
38cdab8
DP-312 Create new adf-Wizard and tried to link the view to index.html
alex-504 May 12, 2021
94ed1c8
DP-312 Module added to app.js, pathing added to main.js to exclude na…
tomonorman May 14, 2021
20bc716
Button added to link to API Wizard
tomonorman May 14, 2021
2c3e79b
DP-312 Form, and logic to call the service creation backend created -…
tomonorman May 14, 2021
80aa9fe
DP-312 Cookie logic added so user will be redirected to either wizard…
tomonorman May 14, 2021
16aad5b
DP-312 Fixed issue where Wizard would not work unless you went to the…
tomonorman May 14, 2021
20687f8
DP-312, loading icon added, form will only load after backend has fin…
tomonorman May 17, 2021
66efe3f
DP-312 Refactored form into its own directive, logic added to show/hi…
tomonorman May 17, 2021
5708dba
DP-312 Load new view after service creation directing user to API Docs
tomonorman May 17, 2021
8b7708f
DP-312 Added helpers to form inputs, text layout changes
tomonorman May 17, 2021
6807d98
DP-312 ng-if error fixed
tomonorman May 17, 2021
2eb7796
DP-312 Pathing logic between wizard and home removed
tomonorman May 19, 2021
3dec161
DP-312 Wizard moved to modal loading in the homepage
tomonorman May 19, 2021
2b249e2
DP-312 Removed all logic for pathing to /wizard, modal is now self co…
tomonorman May 19, 2021
5a6deba
DP-312 Api Wizard button moved to sidebar
tomonorman May 19, 2021
ab5d7f1
DP-312 Modal refactored into directive, bugfix where screen locks aft…
tomonorman May 25, 2021
f6c49bb
DP-312 Function and variable refactoring, open modal functionality added
tomonorman May 27, 2021
81464fb
DP-312 API Wizard
yaroslavmo May 27, 2021
8026811
DP-312 API Wizard
yaroslavmo May 28, 2021
7168a07
DP-312 API Wizard
yaroslavmo May 28, 2021
9c3de7e
DP-312
tomonorman Aug 19, 2021
f28aa8b
DP-379 ETL Tab
tomonorman Aug 26, 2021
c407fdd
ETL endpoint updated
tomonorman Sep 13, 2021
d302a6c
DP-420 Revise Api-Wizard
tomonorman Oct 15, 2021
6989f5c
DP-312 Api Wizard curl example url fix
tomonorman Nov 16, 2021
9b006c8
4.11.1 release
tomonorman Jun 7, 2022
f3bbc53
DP-501 hide and disable password and email reset for integrate io users
tomonorman Jun 15, 2022
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
4 changes: 2 additions & 2 deletions app/admin_components/adf-admins/views/df-admin-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- Admin Email -->
<div class="form-group">
<label>{{ (loginAttribute==='username')? 'Email' : 'Email (Required for login)'}}</label>
<input id="admins_details_info_email" type="email" class="form-control" data-ng-model="admin.record.email" placeholder="Email"/>
<input id="admins_details_info_email" type="email" class="form-control" data-ng-model="admin.record.email" placeholder="Email" data-ng-disabled="admin.record.integrateio_id"/>
</div>

<!-- Admin First Name -->
Expand Down Expand Up @@ -81,7 +81,7 @@
</div>

<!-- Admin Password -->
<div class="form-group">
<div class="form-group" data-ng-hide="admin.record.integrateio_id">
<df-set-user-password></df-set-user-password>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,9 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource'])
},

// save data to server and update app obj
saveApiData: function (api, options) {
saveApiData: function (api, options, force) {

if (dfApplicationObj.apis.hasOwnProperty(api)) {
if (dfApplicationObj.apis.hasOwnProperty(api) || !!force) {

return _saveApiData(api, options);
}
Expand Down
35 changes: 35 additions & 0 deletions app/admin_components/adf-etl/dreamfactory-etl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use strict';

angular.module('dfETL', ['ngRoute'])
.constant('MOD_PACKAGE_MANAGER_ROUTER_PATH', '/etl')
.constant('MOD_PACKAGE_MANAGER_ASSET_PATH', 'admin_components/adf-etl/')
.config(['$routeProvider', 'MOD_PACKAGE_MANAGER_ROUTER_PATH', 'MOD_PACKAGE_MANAGER_ASSET_PATH',
function ($routeProvider, MOD_PACKAGE_MANAGER_ROUTER_PATH, MOD_PACKAGE_MANAGER_ASSET_PATH) {
$routeProvider
.when(MOD_PACKAGE_MANAGER_ROUTER_PATH, {
templateUrl: MOD_PACKAGE_MANAGER_ASSET_PATH + 'views/main.html',
controller: 'ETLCtrl',
});
}])

.run([function () {

}])

.controller('ETLCtrl', ['UserDataService', '$http', function (UserDataService, $http) {

// When the user comes to this page, we will make an api call to updates.dreamfactory.com
// with their email address. This is only for the hosted environment.

var data = {
email: UserDataService.getCurrentUser().email,
};

var req = {
method: 'POST',
url: 'https://dashboard.dreamfactory.com/api/etl',
data: JSON.stringify(data)
};

$http(req).then();
}])
9 changes: 9 additions & 0 deletions app/admin_components/adf-etl/views/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="df-paywall">

<h1>Coming Soon!</h1>

<h4 style="text-align: justify;">We're currently working on an exciting new ETL feature, and would love to learn more about your ETL challenges to help us shape the feature capabilities. Contact us at <span><a href="mailto:code@dreamfactory.com">code@dreamfactory.com</a></span> to setup a 30 minute call.</h4>

<h3>In return for your time we'll send you a box of DreamFactory swag!</h3>
</div>

17 changes: 14 additions & 3 deletions app/admin_components/adf-home/dreamfactory-home.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'use strict';


angular.module('dfHome', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp'])
angular.module('dfHome', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'ngCookies'])

.constant('MOD_HOME_ROUTER_PATH', '/home')
.constant('MOD_HOME_ASSET_PATH', 'admin_components/adf-home/')
Expand All @@ -41,8 +41,8 @@ angular.module('dfHome', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp'])

}])

.controller('HomeCtrl', ['$q', '$scope', '$sce', 'dfApplicationData', 'SystemConfigDataService',
function($q, $scope, $sce, dfApplicationData, SystemConfigDataService){
.controller('HomeCtrl', ['$q', '$scope', '$sce', 'dfApplicationData', 'SystemConfigDataService','$cookies',
function($q, $scope, $sce, dfApplicationData, SystemConfigDataService, $cookies){

$scope.trustUrl = function (url) {
return $sce.trustAsResourceUrl(url);
Expand Down Expand Up @@ -100,4 +100,15 @@ angular.module('dfHome', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp'])
link.label = link.name;
}
});

var removeWizardCookie = function() {
$cookies.remove("Wizard");
}

// Although by removing the Wizard Cookie, the modal should open on button click
// we will also manually fire up the modal to double check it is truly being opened
$scope.openWizardModal = function() {
removeWizardCookie();
$('#wizardModal').modal('show');
}
}])
13 changes: 12 additions & 1 deletion app/admin_components/adf-home/views/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,25 @@

<div class="col-md-2 df-sidebar-nav">
<df-sidebar-nav></df-sidebar-nav>
<hr>
<p>Need a hand? Create an API for your MySQL or SQL Server Database right now!</p>
<div class="form-controls">
<button type="button" class="btn btn-primary btn-block" data-target="#wizardModal" ng-click="openWizardModal()"><i class="fa fa-magic" aria-hidden="true"></i> Api Wizard</button>
</div>
</div>
<div class="col-md-10 df-section" data-ng-class="df-section-all-round" df-fs-height>

<div data-ng-repeat="link in links" data-ng-if="activeView.name === link.name" style="height: 100%">
<div style="height:100%">
<!--<iframe ng-src="{{ trustUrl(link.href) }}" data-ng-if="link.href" style="padding-bottom: 75px; height: 100%; width: 100%; border: 0px"></iframe>-->

<ng-include src="link.template"></ng-include>

<div ng-controller="WizardCtrl">
<div ng-if="!hasWizardCookie()">
<df-wizard-loading></df-wizard-loading>
<df-wizard-create-service ng-if="!dataLoading"><df-wizard-create-service>
</div>
</div>
</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion app/admin_components/adf-profile/dreamfactory-profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ angular.module('dfProfile', ['ngRoute', 'dfUtility', 'dfUserManagement', 'dfAppl
}).then(
function (result) {
$scope.user = result.data;
if($scope.user.adldap || $scope.user.oauth_provider) {

if($scope.user.adldap || $scope.user.oauth_provider || $scope.user.integrateio_id) {
angular.element('#set-password-section').hide();
angular.element('#set-security-question-section').hide();
}

},
function (error) {
var messageOptions = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<div class="form-group">
<label>{{ (loginAttribute==='username')? 'Email' : 'Email (Required for login)'}}</label>
<input type="text" class="form-control" data-ng-model="user.email" placeholder="Enter email address." data-ng-required="true" data-ng-change="emailChange()">
<input type="text" class="form-control" data-ng-model="user.email" placeholder="Enter email address." data-ng-required="true" data-ng-change="emailChange()" data-ng-disabled="user.integrateio_id">
</div>
<div class="form-group" ng-if="requireCurrentPassword && !setPassword">
<label>Current Password (Required if Changing Email)</label>
Expand Down
4 changes: 2 additions & 2 deletions app/admin_components/adf-users/views/df-user-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!-- User Email -->
<div class="form-group">
<label>{{ (loginAttribute==='username')? 'Email' : 'Email (Required for login)'}}</label>
<input id="user_details_info_email" type="email" class="form-control" data-ng-model="user.record.email" placeholder="Email"/>
<input id="user_details_info_email" type="email" class="form-control" data-ng-model="user.record.email" placeholder="Email" data-ng-disabled="user.record.integrateio_id"/>
</div>

<!-- User First Name -->
Expand Down Expand Up @@ -73,7 +73,7 @@
</div>

<!-- User Password -->
<div class="form-group">
<div class="form-group" data-ng-hide="user.record.integrateio_id">
<df-set-user-password></df-set-user-password>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-right df-navbar-nav">

<ul class="nav navbar-nav navbar-right df-navbar-nav">
<df-nav-notification></df-nav-notification>

<li data-ng-repeat="link in links" data-ng-if="link.show == true && !link.subLinks" data-ng-class="activeLink === link.name ? 'active': ''">
Expand Down
Loading