Merge branch 'nrobakova/fix-tests-2975-master' of https://github.com/…

…IgniteUI/igniteui-angular into nrobakova/fix-tests-2975-master
IgniteUI · Nov 21, 2018 · 269eef3 · 269eef3
2 parents d48915f + ce24e89
commit 269eef3
Show file tree

Hide file tree

Showing 13 changed files with 423 additions and 68 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,20 +1,20 @@
 Closes #  
 
 ### Additional information (check all that apply):
- - [] Bug fix
- - [] New functionality
- - [] Documentation
- - [] Demos
- - [] CI/CD
+ - [ ] Bug fix
+ - [ ] New functionality
+ - [ ] Documentation
+ - [ ] Demos
+ - [ ] CI/CD
 
 ### Checklist:
- - [] All relevant tags have been applied to this PR
- - [] This PR includes unit tests covering all the new code
- - [] This PR includes API docs for newly added methods/properties
- - [] This PR includes `feature/README.MD` updates for the feature docs
- - [] This PR includes general feature table updates in the root `README.MD`
- - [] This PR includes `CHANGELOG.MD` updates for newly added functionality
- - [] This PR contains breaking changes
- - [] This PR includes `ng update` migrations for the breaking changes
- - [] This PR includes behavioral changes and the feature specification has been updated with them
+ - [ ] All relevant tags have been applied to this PR
+ - [ ] This PR includes unit tests covering all the new code
+ - [ ] This PR includes API docs for newly added methods/properties
+ - [ ] This PR includes `feature/README.MD` updates for the feature docs
+ - [ ] This PR includes general feature table updates in the root `README.MD`
+ - [ ] This PR includes `CHANGELOG.MD` updates for newly added functionality
+ - [ ] This PR contains breaking changes
+ - [ ] This PR includes `ng update` migrations for the breaking changes
+ - [ ] This PR includes behavioral changes and the feature specification has been updated with them
 
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -2,22 +2,30 @@
 
 # Current Milestone
 
-## Milestone 5 (by November 30th, 2018)
-
-1. Hierarchical Grid POC (Proof of concept) [issue](https://github.com/IgniteUI/igniteui-angular/issues/827)
-2. **[Done]**Tree Grid [issue](https://github.com/IgniteUI/igniteui-angular/issues/2530)
-3. Implement number-of-records-based rendering for igxGrid [issue](https://github.com/IgniteUI/igniteui-angular/issues/2384)
-4. Advanced Filtering Dialog
-5. **[Done]**Quick Per-column Search in the igxGrid [issue](https://github.com/IgniteUI/igniteui-angular/issues/542)
-6. **[Done]**Expandable Panel [issue](https://github.com/IgniteUI/igniteui-angular/issues/307)
-7. **[Done]**Conditional Cell Styling capability [issue](https://github.com/IgniteUI/igniteui-angular/issues/1079)
-8. **[Done]**Typography Updates 
-9. **[Done]**Tooltip [issue](https://github.com/IgniteUI/igniteui-angular/issues/1710)
-10. **[Removed]** Vertical Tabs - material doesn't define vertical tabs 
-11. **[Done]** Row Editing with transactions (Batch editing) [issue](https://github.com/IgniteUI/igniteui-angular/issues/566)
-12. **[Done]** Adding Disabled Dates and Special Dates options in igxCalander [issue](https://github.com/IgniteUI/igniteui-angular/issues/1980)
-13. **[Done]** Drag and Drop Directive
-14. Banner Component [issue](https://github.com/IgniteUI/igniteui-angular/issues/2672)
+## Milestone 5 (14.12.2018)
+
+1. TreeGrid summaries
+2. Grid GroupBy summaries
+3. Inline date and time pickers (with drop down/toggle)
+4. Banner Component [issue](https://github.com/IgniteUI/igniteui-angular/issues/2672)
+5. Toolbar Templatable and NavBar Templatable 
+
+## Milestone 6 (28.02.2019)
+
+1. Hierarchical Grid [issue](https://github.com/IgniteUI/igniteui-angular/issues/827)   
+2. igxGrid rendering strategies (like record-based rendering) [issue](https://github.com/IgniteUI/igniteui-angular/issues/2384)  
+3. Auto-complete (inline editable)
+4. Advanced Filtering  
+5. Multi-cell Selection 
+
+
+## Further Down the line
+
+1. Excel-style filter
+2. Row-pinning
+3. Column Groups expand/collapse, with column grouping templates
+4. Visual Cell merging 
+
 
 # Previous Milestones
 
@@ -36,9 +44,9 @@
 ## Milestone 2 (due April 25th, 2018)
 
 1. **[DONE]** Expanding Ignite UI CLI views and templates with Ignite UI for Angular 
-    1. [DONE] Adding component views like App Host, Tabbar, List
-    2. [DONE] Updating the default project look
-    3. [DONE] Move the project navigation inside an App Host   
+    1. **[DONE]** Adding component views like App Host, Tabbar, List
+    2. **[DONE]** Updating the default project look
+    3. **[DONE]** Move the project navigation inside an App Host   
 2. **[DONE]** Product Theming 
 3. **[DONE]** Column Resizing 
 4. **[DONE]** Column pinning
@@ -67,6 +75,15 @@
 9. **[DONE]** Design: Release Updated Design System (Sketch UI kits, UI patterns, screens, documentation)
 10. **[DONE]** Design: Data dense theme for data grid 
 
+## Milestone 4 (November 30th, 2018)
 
-# Postponed
-1. Collapsible Column Groups with state templating (collapsed state column can be templated)
+1. **[Done]** Tree Grid [issue](https://github.com/IgniteUI/igniteui-angular/issues/2530)
+2. **[Done]** Quick Per-column Search in the igxGrid [issue](https://github.com/IgniteUI/igniteui-angular/issues/542)
+3. **[Done]** Expandable Panel [issue](https://github.com/IgniteUI/igniteui-angular/issues/307)
+4. **[Done]** Conditional Cell Styling capability [issue](https://github.com/IgniteUI/igniteui-angular/issues/1079)
+5. **[Done]** igxTypography for theming
+6. **[Done]** Tooltip [issue](https://github.com/IgniteUI/igniteui-angular/issues/1710)
+7. **[Removed]** Vertical Tabs - material doesn't define vertical tabs 
+8. **[Done]** Row Editing with transactions (Batch editing) [issue](https://github.com/IgniteUI/igniteui-angular/issues/566)
+9. **[Done]** Adding Disabled Dates and Special Dates options in igxCalander [issue](https://github.com/IgniteUI/igniteui-angular/issues/1980)
+10. **[Done]** Drag and Drop Directive
diff --git a/projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts b/projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts
@@ -4,7 +4,7 @@ import { EmptyTree } from '@angular-devkit/schematics';
 import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import * as fs from 'fs';
 import * as path from 'path';
-import { ClassChanges, BindingChanges, SelectorChanges } from './schema';
+import { ClassChanges, BindingChanges, SelectorChanges, ThemePropertyChanges } from './schema';
 import { UpdateChanges } from './UpdateChanges';
 
 describe('UpdateChanges', () => {
@@ -15,6 +15,7 @@ describe('UpdateChanges', () => {
         public getClassChanges() { return this.classChanges; }
         public getOutputChanges() { return this.outputChanges; }
         public getInputChanges() { return this.inputChanges; }
+        public getThemePropChanges() { return this.themePropsChanges; }
     }
 
     beforeEach(() => {
@@ -356,7 +357,7 @@ describe('UpdateChanges', () => {
         appTree.create('test1.component.html', fileContent1);
 
         const update = new UnitUpdateChanges(__dirname, appTree);
-        update.addCondition('igxIcon_is_material_name', () => { return true; });
+        update.addCondition('igxIcon_is_material_name', () => true);
 
         expect(fs.existsSync).toHaveBeenCalledWith(jsonPath);
         expect(fs.readFileSync).toHaveBeenCalledWith(jsonPath, 'utf-8');
@@ -374,4 +375,76 @@ describe('UpdateChanges', () => {
 
         done();
     });
+
+    it('should replace/remove inputs', done => {
+        const themePropsJson: ThemePropertyChanges = {
+            changes: [
+                {
+                    name: '$replace-me', replaceWith: '$replaced',
+                    owner: 'igx-theme-func'
+                },
+                {
+                    name: '$remove-me', remove: true,
+                    owner: 'igx-theme-func'
+                },
+                {
+                    name: '$old-prop', remove: true,
+                    owner: 'igx-comp-theme'
+                }
+            ]
+        };
+        const jsonPath = path.join(__dirname, 'changes', 'theme-props.json');
+        spyOn(fs, 'existsSync').and.callFake((filePath: string) => {
+            if (filePath === jsonPath) {
+                return true;
+            }
+            return false;
+        });
+        spyOn(fs, 'readFileSync').and.callFake(() => JSON.stringify(themePropsJson));
+
+        const fileContent =
+`$var: igx-theme-func(
+    $prop1: red,
+    $replace-me: 3,
+    $remove-me: 0px,
+    $prop2: 2
+);
+$var2: igx-comp-theme(
+    $replace-me: not,
+    $old-prop: func(val)
+);
+
+$var3: igx-comp-theme(
+    $replace-me: not,
+    $old-prop: func(val, 3, 4),
+    $prop3: 1
+);`;
+        appTree.create('styles.scss', fileContent);
+        appTree.create('src/app/app.component.sass', `igx-comp-theme($replace-me: not, $old-prop: 3, $prop3: 2);`);
+        appTree.create('test.component.sass', `igx-theme-func($replace-me: 10px, $old-prop: 3, $prop3: 2);`);
+
+        const update = new UnitUpdateChanges(__dirname, appTree);
+        expect(fs.existsSync).toHaveBeenCalledWith(jsonPath);
+        expect(fs.readFileSync).toHaveBeenCalledWith(jsonPath, 'utf-8');
+        expect(update.getThemePropChanges()).toEqual(themePropsJson);
+
+        update.applyChanges();
+        expect(appTree.readContent('styles.scss')).toEqual(
+`$var: igx-theme-func(
+    $prop1: red,
+    $replaced: 3,
+    $prop2: 2
+);
+$var2: igx-comp-theme(
+    $replace-me: not
+);
+
+$var3: igx-comp-theme(
+    $replace-me: not,
+    $prop3: 1
+);`);
+        expect(appTree.readContent('src/app/app.component.sass')).toEqual(`igx-comp-theme($replace-me: not, $prop3: 2);`);
+        expect(appTree.readContent('test.component.sass')).toEqual(`igx-theme-func($replaced: 10px, $old-prop: 3, $prop3: 2);`);
+        done();
+    });
 });