Merge pull request #18 from icstechsales/development

License updates and date field default date fix

.gitignore

@@ -22,4 +22,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 src/old
-yarn.lock
+yarn.lock
+package-lock.json

LICENSE

@@ -0,0 +1,13 @@
+Copyright (c) IBM Corp.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

NOTICE

@@ -0,0 +1,10 @@
+This application includes code originally developed by IBM Corporation and makes use of of a number of open source libraries/frameworks/icons/fonts:
+
+- The MIT licensed Office UI Fabric React components: https://github.com/OfficeDev/office-ui-fabric-react/blob/master/LICENSE.  
+    - The fonts and icons not covered under the MIT license are not used.
+    - Some components in the application are derived from components usage examples found in the https://github.com/OfficeDev/office-ui-fabric-react repository.
+
+- The free Fontawesome library is used for icons: https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt
+
+- The Google Roboto font is used: https://github.com/google/roboto/blob/master/LICENSE
+

package.json

@@ -1,14 +1,14 @@
 {
   "name": "dql-explorer",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "author": "Dimitri Prosper <[email protected]>",
   "contributors": [
     {
       "name": "Scott Good",
       "email": "[email protected]"
     }
   ],
-  "license": "IBM Internal Use Only until fate determined",
+  "license": "Apache-2.0",
   "description": "DQL Explorer PoC for IBM Think 2019",
   "private": true,
   "dependencies": {
@@ -49,6 +49,6 @@
     "not ie <= 11",
     "not op_mini all"
   ],
-  "proxy": "http://domino.yourdomain.com",
-  "homepage": "http://domino.yourdomain.com/dqlexplorer.nsf"
+  "proxy": "http://myorg3.ibmcollabcloud.com",
+  "homepage": "http://myorg3.ibmcollabcloud.com/dqlexplorer.nsf"
 }

src/App.js

@@ -1,7 +1,17 @@
 /**
- * @author Dimitri Prosper <[email protected]>, <[email protected]>, https://dprosper.github.io
- * @author Scott Good <[email protected]>, https://scott-good.github.io/
- * @todo see inline TODO comments
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import React, { Component } from 'react';
@@ -29,7 +39,7 @@ import {
   faDownload, faSortAlphaDown, faSortAlphaUp, faSortAmountDown, faUser, faPlusCircle
  } from '@fortawesome/free-solid-svg-icons';
 
-import { people } from './components/querybuilder/PeoplePickerData';
+import { people } from './components/querybuilder/PeoplePicker';
 
 library.add(faSave, faUser, faPlusCircle, faCalendar, faCheck, faDownload, faSortAlphaDown, faSortAlphaUp, faSortAmountDown, faTimes, faHashtag, faBold, faTrashAlt, faShareSquare, faDatabase, faFolder, faTasks, faGripHorizontal, faGlobe, faUsers, faTable, faFile, faChevronDown, faChevronUp, faChevronRight, faChevronLeft, faArrowDown, faArrowUp, faArrowLeft, faArrowRight, faTag)
 
@@ -544,6 +554,7 @@ Scott Good https://scott-good.github.io/
 
   addTerm = index => {
     let children = this.state.query.children;
+
     const term = {
       id: `term~${uuidv4()}`,
       identifier: "",
@@ -670,12 +681,18 @@ Scott Good https://scott-good.github.io/
 
   onTermChange = (index, attribute, data) => {
     const newValue = typeof data === "object" ? data.key : data;
-
     let children = this.state.query.children;
     let term = this._getObject(children, `term~${index}`);
 
     term[attribute] = newValue;
 
+    if (data.data.type === 'date') {
+      const date = new Date();
+      const dateString = date.getFullYear() + "-" + ('0' + (date.getMonth() + 1)).slice(-2) + "-" + ('0' + date.getDate()).slice(-2);
+      term.dateValue=date;
+      term.value=dateString;
+    }
+
     this.setState(
       update(this.state, {
         query: { children: { $set: children } },
@@ -714,6 +731,7 @@ Scott Good https://scott-good.github.io/
       entryToUpdate[attribute]=newValue;
       entryToUpdate.dateValue=data;
 
+      console.log(entryToUpdate)
       this.setState(
         update(this.state, {
           query: { children: { $set: children } },

src/components/DatabasesList.js

@@ -1,9 +1,17 @@
 /**
- * @file Component to read and display the list of databases on a server
- * @author Dimitri Prosper (IBM) <[email protected]>
- * @author Dimitri Prosper (Personal) <[email protected]>
- * @contributor Scott Good (IBM) <[email protected]>
- * @todo see inline TODO comments
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import React from "react";

src/components/Error.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from "react";
 
 const ErrorMessage = ({errorMsg, errorNum}) => {

src/components/Main.js

@@ -1,7 +1,17 @@
 /**
- * @author Dimitri Prosper <[email protected]>, <[email protected]>, https://dprosper.github.io
- * @author Scott Good <[email protected]>, https://scott-good.github.io/
- * @todo see inline TODO comments
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import React from 'react';

src/components/MainHeader.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from "react";
 import { CommandBar } from "office-ui-fabric-react/lib/CommandBar";
 

src/components/Results.js

@@ -1,9 +1,17 @@
 /**
- * @file Component to display the query results
- * @author Dimitri Prosper (IBM) <[email protected]>
- * @author Dimitri Prosper (Personal) <[email protected]>
- * @contributor Scott Good (IBM) <[email protected]>
- * @todo see inline TODO comments
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import React from 'react';

src/components/SavedQueries.js

@@ -1,9 +1,17 @@
 /**
- * @file Component to read and display the saved queries on the server
- * @author Dimitri Prosper (IBM) <[email protected]>
- * @author Dimitri Prosper (Personal) <[email protected]>
- * @contributor Scott Good (IBM) <[email protected]>
- * @todo see inline TODO comments
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import React from 'react';

src/components/querybuilder/ActivityPanel.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { Panel, PanelType } from "office-ui-fabric-react/lib/Panel";
 import * as React from "react";
 import withApp from "../../withApp";

src/components/querybuilder/AdvancedOptions.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from 'react';
 import { Dropdown } from 'office-ui-fabric-react/lib/Dropdown';
 

src/components/querybuilder/CodeBlock.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from "react";
 import hljs from "highlight.js";
 import javascript from "highlight.js/lib/languages/javascript";

src/components/querybuilder/DateTextNumber.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from "react";
 import { IconButton } from "office-ui-fabric-react/lib/Button";
 

src/components/querybuilder/Group.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from "react";
 
 import withApp from '../../withApp';

src/components/querybuilder/NamePicker.js

@@ -1,3 +1,19 @@
+/**
+ * Copyright (c) IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import React from 'react';
 
 import { BaseComponent } from 'office-ui-fabric-react/lib/Utilities';