Issue/7385 presets custom presets edit #7401

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

Draft

novikov82 wants to merge 56 commits into master from issue/7385-Presets--custom-presets-edit

e2e/presets.spec.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,4 @@
  
    import { urlPresets, test, expect, showPresets, doDragDrop } from "./helper";

    import { urlPresets, test, expect, showPresets, doDragDrop, showCreatorSettings } from "./helper";

    const title = "Presets";

    async function getRowsInputValues(matrix: any) {

    @@ -7,17 +7,27 @@ async function getRowsInputValues(matrix: any) {
  
      );

      return values;

    }

    async function getTextsBySelector(selector: string, page: any) {

      return (await page.locator(selector).filter({ visible: true }).allTextContents()).map(t => t.trim());

    }

    async function getTabsTexts(page: any) {

      return (await page.locator(".svc-tabbed-menu-item").filter({ visible: true }).allTextContents()).map(t => t.trim());

      return await getTextsBySelector(".svc-tabbed-menu-item", page);

    }

    async function getToolboxTexts(page: any) {

      return (await page.locator(".svc-toolbox__item-title").filter({ visible: true }).allTextContents()).map(t => t.trim());

      return await getTextsBySelector(".svc-toolbox__item-title", page);

    }

    async function getPropertiesTexts(page: any) {

      return (await page.locator(".spg-checkbox__caption .sv-string-viewer, .spg-question__title .sv-string-viewer").filter({ visible: true }).allTextContents()).map(t => t.trim());

      return await getTextsBySelector(".spg-checkbox__caption .sv-string-viewer, .spg-question__title .sv-string-viewer", page);

    }

    async function getMenuTexts(page: any) {

      return await getTextsBySelector(".sps-list__item:not(.sps-list__item--disabled)", page);

    }

    async function getDropdownTexts(page: any) {

      return await getTextsBySelector(".svc-list__item", page);

    }

    test.describe(title, () => {

    @@ -414,4 +424,43 @@ test.describe(title, () => {
  
        expect(await getPropertiesTexts(page)).toEqual(["Pages"]);

      });

      test("Hide default preset", async ({ page }) => {

        await page.locator(".sps-navigation-bar-item").filter({ hasText: "Expert" }).click();

        expect(await getMenuTexts(page)).toEqual(["Basic", "Advanced", "Expert", "Edit Presets list..."]);

        await page.locator(".sps-list__container").filter({ visible: true }).getByText("Edit presets list...").click();

        await page.locator(".spg-action-button").nth(1).click();

        await page.getByRole("button", { name: "Save" }).click();

        await page.locator(".sps-navigation-bar-item").filter({ hasText: "Expert" }).click();

        expect(await getMenuTexts(page)).toEqual(["Basic", "Expert", "Edit Presets list..."]);

        await page.locator(".sps-navigation-bar-item").filter({ hasText: "Quit" }).click();

        await showCreatorSettings(page);

        await page.getByText("Expert").click();

        expect(await getDropdownTexts(page)).toEqual(["Basic", "Expert"]);

      });

      test("Add custom preset", async ({ page }) => {

        await page.locator(".sps-navigation-bar-item").filter({ hasText: "Expert" }).click();

        expect(await getMenuTexts(page)).toEqual(["Basic", "Advanced", "Expert", "Edit Presets list..."]);

        await page.locator(".sps-list__container").filter({ visible: true }).getByText("Edit presets list...").click();

        await page.getByText("Add new preset...").click();

        await page.getByRole("textbox", { name: "presetName" }).fill("MyPreset");

        await page.getByRole("button", { name: "Add" }).nth(1).click();

        const items = page.locator(".sv-popup__container table").nth(0);

        expect(await getRowsInputValues(items)).toEqual(["Basic", "Advanced", "Expert", "MyPreset"]);

        await page.getByRole("button", { name: "Save" }).click();

        await page.locator(".sps-navigation-bar-item").filter({ hasText: "Expert" }).click();

        expect(await getMenuTexts(page)).toEqual(["Basic", "Advanced", "Expert", "MyPreset", "Edit Presets list..."]);

        await page.locator(".sps-navigation-bar-item").filter({ hasText: "Quit" }).click();

        await showCreatorSettings(page);

        await page.getByText("Expert").click();

        expect(await getDropdownTexts(page)).toEqual(["Basic", "Advanced", "Expert", "MyPreset"]);

      });

    });

packages/survey-creator-angular/example/angular-ui/src/app/test/default.component.ts

-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     import { Component, NgZone, OnInit, ViewEncapsulation } from "@angular/core";
     import { SurveyCreatorModel } from "survey-creator-core";
     import * as SurveyCreatorCore from "survey-creator-core";
+    import * as SurveyCreatorUIPreset from "survey-creator-core/ui-presets";
     import * as Survey from "survey-core";
     import SurveyThemes from "survey-core/themes";
     import SurveyCreatorTestTheme from "survey-creator-core/themes/test";
@@ Expand Down Expand Up / @@ -37,6 +38,7 @@ export class TestDefaultComponent implements OnInit { @@
         (<any>window).creator = this.creator;
         (<any>window).Survey = Survey;
         (<any>window).SurveyCreatorCore = SurveyCreatorCore;
+        (<any>window).SurveyCreatorUIPreset = SurveyCreatorUIPreset;
       }
       protected getSlk(): boolean { return true; }
       protected createCreator(): void {
@@ Expand Down @@

packages/survey-creator-angular/ui-preset-editor/src/presets.component.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,10 @@ @@
         </ng-template>
       </div>
       <div class="svc-tab-designer svc-tab-designer--presets">
-        <sv-action-bar [model]="navigationBar" [handleClick]="false"></sv-action-bar>
-        <ng-template [component]="{ name: 'survey', data: {model: survey} }">
-        </ng-template>
+        <sv-scroll>
+          <sv-action-bar [model]="navigationBar" [handleClick]="false"></sv-action-bar>
+          <ng-template [component]="{ name: 'survey', data: {model: survey} }">
+          </ng-template>
+        </sv-scroll>
       </div>
     </ng-template>

packages/survey-creator-core/src/components/tabs/designer-plugin.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -190,7 +190,7 @@ export class TabDesignerPlugin implements ICreatorPlugin { @@
           const presetPropertyGridViewModel = this.createSettingsPropertyGridViewModel("preset", creatorPresetsModelPropertyGridDefinition, creator);
           presetPropertyGridViewModel.onNewSurveyCreatedCallback = (survey) => {
             const presetChooser = survey.getQuestionByName("presetName") as QuestionDropdownModel;
-            if (!!presetChooser) {
+            if (!!presetChooser && presetChooser.choices.length === 0) {
               presetChooser.choices = PredefinedCreatorPresets.map(preset => ({ value: preset, text: getLocString("preset.names." + preset) }));
             }
           };
@@ Expand Down @@

packages/survey-creator-core/src/ui-preset-editor/localization/english.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -200,7 +200,13 @@ export const enStrings = { @@
         presetsTab: "Presets",
         creatorPresets: "Creator Presets",
         save: "Save",
+        add: "Add",
+        discard: "Discard",
+        saveAs: "Save as...",
+        saveAsTitle: "Save current preset as...",
         quit: "Quit",
+        quitConfirmation: "Exit to Survey Creator? You will loose all unsaved changes",
+        quitConfirmationOk: "Exit",
         file: "File",
         import: "Import",
         export: "Export",
@@ Expand All / @@ -210,11 +216,20 @@ export const enStrings = { @@
         resetConfirmation: "Do you really want to reset the settings?",
         resetConfirmationOk: "Yes, reset the settings",
+        saved: "Saved",
+        unsaved: "Unsaved changes",
         resetToDefaults: "Reset {0}",
         defaultSettings: "Default Settings",
         basic: "Basic",
         advanced: "Advanced",
         expert: "Expert",
+        editPresetsList: "Edit Presets list...",
+        editPresetsListTitle: "Edit Presets list",
+        addNewPreset: "Add new preset...",
+        addNewPresetTitle: "Add new preset",
+        confirmDeleteCustomPreset: "Delete preset? You will not be able to restore it",
+        savedPresets: "Saved presets",
         license: "<a href='https://surveyjs.io/' target='_blank'>UI Preset Editor</a> is available only with a PRO license. To use it in your application, please <a href='https://surveyjs.io/manage#renewals-and-upgrades' target='_blank'>upgrade your license</a>.",
         license2: "Your maintenance subscription expired on {date}. You may continue using all <a href='https://surveyjs.io/stay-updated/release-notes' target='_blank'>versions released up to that date</a>. To remove this banner in the latest version, please <a href='https://surveyjs.io/manage#license-manager' target='_blank'>renew your subscription</a> and <a href='https://surveyjs.io/remove-alert-banner' target='_blank'>set up a new license key</a>. Please note <a href='https://surveyjs.io/' target='_blank'>UI Preset Editor</a> is available to all users with an active PRO license.",
         licenseCreator: "To use the Survey Creator plugin in your application, a <a href='https://surveyjs.io/licensing' target='_blank'>developer license</a> is required. If you have an active license, please <a href='https://surveyjs.io/remove-alert-banner' target='_blank'>set up your license key</a> and ensure you're using the <a href='https://surveyjs.io/stay-updated/release-notes' target='_blank'>latest version</a>. Please note <a href='https://surveyjs.io/' target='_blank'>UI Preset Editor</a> is included only in the PRO license tier.",
@@ Expand Down @@

packages/survey-creator-core/src/ui-preset-editor/presets-editable-properties.ts

-Original file line number
+Diff line change
@@ Expand Up @@
           model.setValue(this.nameCategories, categories);
           const items = this.getCurrentlyHiddenItems(categories);
           model.setValue(this.nameMatrix, items);
-          this.propertyGridSetObj(this.currentProperties.getObj());
+          if (this.pageName == model.currentPage.name)this.propertyGridSetObj(this.currentProperties.getObj());
         }
       }
       private getCurrentlyHiddenItems(categories: any) {
@@ Expand Down @@

packages/survey-creator-core/src/ui-preset-editor/presets-editable-toolbox.ts

-Original file line number
+Diff line change
@@ Expand Up @@
         };
       }
       private isCategoriesSame(categories: any, toolboxCategories: any): boolean {
-        if (categories.length !== toolboxCategories.length) return false;
+        if (categories.length !== toolboxCategories?.length) return false;
         for (let i = 0; i < categories.length; i++) {
           if (categories[i].category !== toolboxCategories[i].category) return false;
           //if (categories[i].title !== toolboxCategories[i].title) return false;
@@ Expand Down @@

packages/survey-creator-core/src/ui-preset-editor/presets-editor.ts

-Original file line number
+Diff line change
@@ Expand Up @@
         model.completeText = getLocString("presets.editor.completeText");
         model.pagePrevText = getLocString("presets.editor.pagePrevText");
         model.enterKeyAction = "loseFocus";
+        model.fitToContainer = false;
         editablePresets.forEach(item => item.notifyCallback = (message: string) => this.notify(message));
         if (!this.defaultJsonValue) {
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue/7385 presets custom presets edit #7401

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Issue/7385 presets custom presets edit #7401

Are you sure you want to change the base?

Uh oh!

Issue/7385 presets custom presets edit #7401

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!