Skip to content
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

FOUR-13446 Implement Pages Fixes #1550

Merged
merged 94 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
3905464
Add Storybook
caleeli Feb 14, 2024
f30aa24
Document color-select component
caleeli Feb 14, 2024
ff339c5
CI Storybook
caleeli Feb 14, 2024
11aace2
Reduce bootstrap
caleeli Feb 15, 2024
015275e
Simplify bootstrap
caleeli Feb 15, 2024
cd94e33
Merge pull request #1536 from ProcessMaker/FOUR-13446-storybook
caleeli Feb 19, 2024
f9f6e22
feat: add sortable filter ui
Feb 19, 2024
a5ab811
feat: add sortable list ui
Feb 19, 2024
3afbd4a
feat: add d&d event to sortable component
Feb 19, 2024
5d7a814
Merge remote-tracking branch 'origin/next' into feature/FOUR-13446
caleeli Feb 20, 2024
f5d600b
Implements tabs bar
caleeli Feb 20, 2024
3b91aba
TabsBar stories
caleeli Feb 20, 2024
133f3bf
Add testid for tabs
caleeli Feb 20, 2024
805e094
Adjust default properties and style
caleeli Feb 20, 2024
66ede09
Use tabs bar in screen builder
caleeli Feb 20, 2024
bf1d5a5
Check default size of container
caleeli Feb 20, 2024
8fb0de2
Fix Validation of page name
caleeli Feb 20, 2024
c4ae2ff
Check proper position of tabs content
caleeli Feb 20, 2024
84e245a
Rename story tab
caleeli Feb 20, 2024
b04b6e1
FOUR-13447: Page Dropdown
Feb 20, 2024
9ddde54
add component
Feb 20, 2024
e9cd270
add platform btn style
Feb 20, 2024
0dec5b2
Use `data-test` identifiers for tests
caleeli Feb 20, 2024
20a51df
Merge pull request #1539 from ProcessMaker/feature/FOUR-13448
caleeli Feb 20, 2024
ee1603a
feat: sort by order attr
Feb 20, 2024
153126a
solve merge conflicts
Feb 20, 2024
872ccdf
Merge branch 'feature/FOUR-13446' into feature/FOUR-13921
Feb 20, 2024
993300f
add story book
Feb 20, 2024
b10b674
Add selectors for testing
caleeli Feb 20, 2024
6e70cb6
Create storybook for Sortable component
caleeli Feb 20, 2024
4c68532
fix cypress test
Feb 20, 2024
b88948e
fix story book test
Feb 21, 2024
730e9ac
Change CBs to events
caleeli Feb 21, 2024
dfc2e69
Merge pull request #1540 from ProcessMaker/feature/FOUR-13447_B
caleeli Feb 21, 2024
9a09d39
feat: improve drag and drop
Feb 21, 2024
1ba61af
feat: filter pages
Feb 21, 2024
562ca91
feat: add scroll to pages list
Feb 21, 2024
5c29b59
Merge branch 'feature/FOUR-13446' into feature/FOUR-13921
Feb 21, 2024
5006324
feat: open pages from dropdown
Feb 21, 2024
e53dc6d
add b-form-input for edirt mode
Feb 21, 2024
2fa5d14
disable edit mode on drag start
Feb 21, 2024
da66433
Implement delete page
caleeli Feb 21, 2024
dc7e12b
add textbox blur ever
Feb 21, 2024
ac4853d
fix to open all pages modal
Feb 21, 2024
67b4800
remove unused data
Feb 21, 2024
d41cbe7
enable plus opening add page modal
Feb 21, 2024
e0fb842
Merge remote-tracking branch 'origin/feature/FOUR-13921' into feature…
Feb 21, 2024
e898841
Add new toolbar
caleeli Feb 21, 2024
896c231
add autofocus
Feb 21, 2024
95cd643
feat: add order attr on create page
Feb 21, 2024
d710f9e
update screen toolbar
Feb 21, 2024
aac7504
Merge remote-tracking branch 'origin/feature/FOUR-13921' into feature…
Feb 21, 2024
4d18623
add undo/redo
Feb 21, 2024
2f98cfd
Change button to confirm
caleeli Feb 21, 2024
a0610d3
Add missing property to test
caleeli Feb 21, 2024
3ec8000
Reindex page index when deleted
caleeli Feb 21, 2024
509e993
Merge pull request #1543 from ProcessMaker/feature/FOUR-13921
caleeli Feb 22, 2024
e211b47
Remove alert, covering screen causing some tests to fail
caleeli Feb 22, 2024
ab73667
Fix some style details
caleeli Feb 22, 2024
e40531f
Remove default old toolbar
caleeli Feb 22, 2024
d78e9f2
Update src/components/TabsBar.vue
caleeli Feb 22, 2024
86114c8
Simplify code
caleeli Feb 22, 2024
8052925
Fix home page
caleeli Feb 22, 2024
4e8aa7c
Test no open tabs
caleeli Feb 22, 2024
85fcb70
Fix issue when there is no open pages
caleeli Feb 22, 2024
c423e73
Fix selector function
caleeli Feb 22, 2024
9771830
Merge pull request #1542 from ProcessMaker/feature/FOUR-13450
caleeli Feb 22, 2024
bd4f586
FOUR-14220: The size and color of the dropdown button must be adjusted
Feb 23, 2024
a5b9714
fix: remove order from sortable list
Feb 23, 2024
60290d3
fix: show navigate button
Feb 26, 2024
5adee92
fix: page tabs stories
Feb 26, 2024
6a225b7
FOUR-14227: Design in modal to edit pages is not the same with mockup
Feb 26, 2024
d5d5f66
replace p for span
Feb 27, 2024
15550e2
adjust font-size
Feb 27, 2024
96a3c2a
adjust font-size to 15
Feb 27, 2024
3eab500
remove some empty lines
Feb 27, 2024
2db7999
Merge pull request #1548 from ProcessMaker/bugfix/FOUR-14227
caleeli Feb 27, 2024
646d667
Merge pull request #1547 from ProcessMaker/bugfix/FOUR-14221
caleeli Feb 27, 2024
b77ab99
Merge pull request #1545 from ProcessMaker/bugfix/FOUR-14224
caleeli Feb 27, 2024
9bde89c
Merge pull request #1544 from ProcessMaker/bugfix/FOUR-14220
caleeli Feb 27, 2024
fa32c08
Update boot time
caleeli Feb 27, 2024
e25e6fe
fix: allow sort pages on importing screen
Feb 27, 2024
f177d4e
Open new page
caleeli Feb 27, 2024
69cc9ce
Add data-cy for page selector
caleeli Feb 27, 2024
4667dab
Update page selector in tests
caleeli Feb 27, 2024
1efc46d
Merge branch 'feature/FOUR-13446' into bugfix/FOUR-14225
Feb 27, 2024
86c37ed
Fix order by `.order` instead of `index`
caleeli Feb 27, 2024
73e76be
Merge pull request #1551 from ProcessMaker/bugfix/FOUR-14225
caleeli Feb 27, 2024
5418d7f
Fix undo/redo
caleeli Feb 27, 2024
150deb8
Remove unused references
caleeli Feb 27, 2024
e7cc754
Fix design of page creation
caleeli Feb 27, 2024
8c42a80
Update currentPage before to save state
caleeli Feb 28, 2024
f8d33a8
test: update pages dropdown e2e
Feb 28, 2024
df297ef
Merge pull request #1549 from ProcessMaker/bugfix/FOUR-14230
caleeli Feb 28, 2024
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
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module.exports = {
extends: [
"plugin:vue/recommended",
"airbnb-base",
"plugin:prettier/recommended"
"plugin:prettier/recommended",
"plugin:storybook/recommended"
],

parserOptions: {
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Storybook
on:
pull_request:
types: [opened, reopened, synchronize, edited]
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
cache: 'npm'
- name: Install dependencies
run: npm install

- name: Get installed Playwright version
id: playwright-version
run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_ENV
- name: Cache playwright binaries
uses: actions/cache@v3
id: playwright-cache
with:
key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
path: |
~/.cache/ms-playwright
- name: Install Playwright Browsers
run: npx playwright install --with-deps chromium
if: steps.playwright-cache.outputs.cache-hit != 'true'

- name: Build Storybook
run: npm run build-storybook --quiet
- name: Serve Storybook and run tests
run: |
npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
"npx http-server storybook-static --port 6006 --silent" \
"npx wait-on tcp:6006 && npm run test-storybook --coverage"
18 changes: 18 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/** @type { import('@storybook/vue-vite').StorybookConfig } */
const config = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-docs",
"@storybook/addon-interactions"
],
framework: {
name: "@storybook/vue-vite",
options: {}
},
docs: {
autodocs: "tag"
}
};
export default config;
6 changes: 6 additions & 0 deletions .storybook/manager.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { addons } from '@storybook/manager-api';

addons.setConfig({
// Place the controls panel at the bottom of the canvas
panelPosition: 'bottom',
});
14 changes: 14 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/** @type { import('@storybook/vue').Preview } */
const preview = {
parameters: {
actions: { argTypesRegex: "^on[A-Z].*" },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i
}
}
}
};

export default preview;
Loading
Loading